Skip to content

Commit

Permalink
sort properly Go imports (#4071)
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Savintsev <[email protected]>
  • Loading branch information
dmitris authored Feb 19, 2025
1 parent b4be5f7 commit a0b20b7
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 35 deletions.
3 changes: 1 addition & 2 deletions cmd/cosign/cli/piv_tool.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ package cli
import (
"encoding/json"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/pivcli"
"github.com/spf13/cobra"
)

var pivToolForce bool
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/pkcs11_tool.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
package cli

import (
"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/pkcs11cli"
"github.com/spf13/cobra"
)

var pkcs11ToolForce bool
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/public_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ package cli
import (
"os"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/generate"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/publickey"
"github.com/spf13/cobra"
)

func PublicKey() *cobra.Command {
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ import (
"fmt"
"os"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/generate"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/sign"
"github.com/spf13/cobra"
)

func Sign() *cobra.Command {
Expand Down
6 changes: 2 additions & 4 deletions cmd/cosign/cli/tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ import (
"fmt"
"os"

v1 "github.com/google/go-containerregistry/pkg/v1"

"github.com/google/go-containerregistry/pkg/name"
"github.com/spf13/cobra"

v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
ociremote "github.com/sigstore/cosign/v2/pkg/oci/remote"
"github.com/spf13/cobra"
)

func Tree() *cobra.Command {
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/triangulate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ package cli
import (
"flag"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/triangulate"
"github.com/spf13/cobra"
)

func Triangulate() *cobra.Command {
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/trustedroot.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ package cli
import (
"context"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/trustedroot"
"github.com/spf13/cobra"
)

func TrustedRoot() *cobra.Command {
Expand Down
3 changes: 1 addition & 2 deletions cmd/cosign/cli/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ package cli
import (
"flag"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/upload"
"github.com/spf13/cobra"
)

func Upload() *cobra.Command {
Expand Down
4 changes: 1 addition & 3 deletions cmd/cosign/cli/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ import (
"fmt"

"github.com/google/go-containerregistry/pkg/name"

"github.com/spf13/cobra"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/cmd/cosign/cli/verify"
"github.com/sigstore/cosign/v2/internal/ui"
"github.com/spf13/cobra"
)

const ignoreTLogMessage = "Skipping tlog verification is an insecure practice that lacks of transparency and auditability verification for the %s."
Expand Down
3 changes: 1 addition & 2 deletions pkg/cosign/attestation/attestation.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ import (
"strings"
"time"

"github.com/in-toto/in-toto-golang/in_toto"
slsa02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
slsa1 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v1"

"github.com/in-toto/in-toto-golang/in_toto"
)

const (
Expand Down
1 change: 0 additions & 1 deletion pkg/cosign/cue/cue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package cue
import (
"fmt"
"os"

"testing"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/cosign/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
package cosign

import (
"errors"
"fmt"
"testing"

"errors"
)

func TestErrors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cosign/kubernetes/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package kubernetes
import (
"fmt"

utilversion "k8s.io/apimachinery/pkg/util/version"
"k8s.io/client-go/kubernetes"

utilversion "k8s.io/apimachinery/pkg/util/version"
// Initialize all known client auth plugins
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/rest"
Expand Down
3 changes: 1 addition & 2 deletions pkg/cosign/kubernetes/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ import (
"os"
"strings"

"github.com/sigstore/cosign/v2/pkg/cosign"
v1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"

"github.com/sigstore/cosign/v2/pkg/cosign"
)

const (
Expand Down
3 changes: 1 addition & 2 deletions pkg/cosign/kubernetes/secret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ import (
"reflect"
"testing"

"github.com/sigstore/cosign/v2/pkg/cosign"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"

"github.com/sigstore/cosign/v2/pkg/cosign"
)

func TestSecret(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions pkg/cosign/pivkey/pivkey.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ import (
"syscall"

"github.com/go-piv/piv-go/v2/piv"
"golang.org/x/term"

"github.com/sigstore/sigstore/pkg/signature"
"golang.org/x/term"
)

var (
Expand Down
3 changes: 1 addition & 2 deletions pkg/policy/attestation.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ import (
"fmt"

"github.com/in-toto/in-toto-golang/in_toto"
"github.com/sigstore/cosign/v2/pkg/oci"

"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
"github.com/sigstore/cosign/v2/pkg/cosign/attestation"
"github.com/sigstore/cosign/v2/pkg/oci"
)

// PayloadProvider is a subset of oci.Signature that only provides the
Expand Down

0 comments on commit a0b20b7

Please sign in to comment.