Merge pull request #1513 from saschagrunert/gci

k8s-ci-robot · web-flow · commit 77f4a60b78df · 2024-07-23T02:52:36.000-07:00
Fix and enable `gci` linter
diff --git a/.golangci.yml b/.golangci.yml
@@ -20,6 +20,7 @@ linters:
     - exportloopref
     - fatcontext
     - forcetypeassert
+    - gci
     - gocheckcompilerdirectives
     - gochecksumtype
     - gocritic
@@ -80,7 +81,6 @@ linters:
     # - exhaustruct
     # - forbidigo
     # - funlen
-    # - gci
     # - ginkgolinter
     # - gochecknoglobals
     # - gochecknoinits
@@ -113,6 +113,11 @@ linters:
     # - wrapcheck
     # - wsl
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - localmodule
   staticcheck:
     checks: ["SA1019"]
   gocritic:
diff --git a/cmd/crictl/container.go b/cmd/crictl/container.go
@@ -30,14 +30,13 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/kubelet/pkg/types"
-
 	"github.com/docker/go-units"
 	godigest "github.com/opencontainers/go-digest"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"k8s.io/kubelet/pkg/types"
 )
 
 type containerByCreated []*pb.Container
diff --git a/cmd/crictl/container_test.go b/cmd/crictl/container_test.go
@@ -19,11 +19,10 @@ package main
 import (
 	"time"
 
-	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"k8s.io/kubelet/pkg/types"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"k8s.io/kubelet/pkg/types"
 )
 
 // fakeContainersWithCreatedAtDesc creates fake containers in the least recent order of the createdAt.
diff --git a/cmd/crictl/image_test.go b/cmd/crictl/image_test.go
@@ -17,10 +17,9 @@ limitations under the License.
 package main
 
 import (
-	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func fakeImage(id string, digest []string, tags []string) *pb.Image {
diff --git a/cmd/crictl/main.go b/cmd/crictl/main.go
@@ -32,7 +32,6 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
-
 	internalapi "k8s.io/cri-api/pkg/apis"
 	remote "k8s.io/cri-client/pkg"
 	"k8s.io/klog/v2"
diff --git a/cmd/crictl/sandbox.go b/cmd/crictl/sandbox.go
@@ -32,7 +32,6 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
-
 	errorUtils "k8s.io/apimachinery/pkg/util/errors"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
diff --git a/pkg/benchmark/container.go b/pkg/benchmark/container.go
@@ -22,13 +22,13 @@ import (
 	"path"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega/gmeasure"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	"github.com/onsi/gomega/gmeasure"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 const (
diff --git a/pkg/benchmark/image.go b/pkg/benchmark/image.go
@@ -23,13 +23,13 @@ import (
 	"runtime"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega/gmeasure"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	"github.com/onsi/gomega/gmeasure"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 const (
diff --git a/pkg/benchmark/pod.go b/pkg/benchmark/pod.go
@@ -22,14 +22,14 @@ import (
 	"path"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega/gmeasure"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	"github.com/onsi/gomega/gmeasure"
 )
 
 const (
diff --git a/pkg/benchmark/pod_container.go b/pkg/benchmark/pod_container.go
@@ -19,14 +19,14 @@ package benchmark
 import (
 	"context"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gmeasure"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gmeasure"
 )
 
 const (
diff --git a/pkg/framework/framework.go b/pkg/framework/framework.go
@@ -17,10 +17,9 @@ limitations under the License.
 package framework
 
 import (
-	internalapi "k8s.io/cri-api/pkg/apis"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	internalapi "k8s.io/cri-api/pkg/apis"
 )
 
 // Framework will keep a client for you.
diff --git a/pkg/framework/util.go b/pkg/framework/util.go
@@ -26,14 +26,14 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/google/uuid"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"gopkg.in/yaml.v3"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	remote "k8s.io/cri-client/pkg"
-	"sigs.k8s.io/cri-tools/pkg/common"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/common"
 )
 
 var (
diff --git a/pkg/validate/apparmor_linux.go b/pkg/validate/apparmor_linux.go
@@ -25,13 +25,13 @@ import (
 	"sync"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 const (
diff --git a/pkg/validate/consts.go b/pkg/validate/consts.go
@@ -20,6 +20,7 @@ import (
 	"runtime"
 
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
diff --git a/pkg/validate/container.go b/pkg/validate/container.go
@@ -20,19 +20,18 @@ import (
 	"bufio"
 	"context"
 	"errors"
-
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 // streamType is the type of the stream.
diff --git a/pkg/validate/container_linux.go b/pkg/validate/container_linux.go
@@ -23,13 +23,13 @@ import (
 	"path/filepath"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"golang.org/x/sys/unix"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 var _ = framework.KubeDescribe("Container Mount Propagation", func() {
diff --git a/pkg/validate/image.go b/pkg/validate/image.go
@@ -23,14 +23,14 @@ import (
 	"sort"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 var _ = framework.KubeDescribe("Image Manager", func() {
diff --git a/pkg/validate/multi_container_linux.go b/pkg/validate/multi_container_linux.go
@@ -18,18 +18,17 @@ package validate
 
 import (
 	"context"
-
 	"os"
 	"strings"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 const (
diff --git a/pkg/validate/networking.go b/pkg/validate/networking.go
@@ -23,13 +23,13 @@ import (
 	"strings"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 var _ = framework.KubeDescribe("Networking", func() {
diff --git a/pkg/validate/pod.go b/pkg/validate/pod.go
@@ -21,13 +21,13 @@ import (
 	"os"
 	"path/filepath"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 var _ = framework.KubeDescribe("PodSandbox", func() {
diff --git a/pkg/validate/pod_linux.go b/pkg/validate/pod_linux.go
@@ -21,13 +21,13 @@ import (
 	"strings"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 var _ = framework.KubeDescribe("PodSandbox", func() {
diff --git a/pkg/validate/runtime_info.go b/pkg/validate/runtime_info.go
@@ -19,12 +19,12 @@ package validate
 import (
 	"context"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 const (
diff --git a/pkg/validate/security_context_linux.go b/pkg/validate/security_context_linux.go
@@ -30,14 +30,14 @@ import (
 	"syscall"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"golang.org/x/sys/unix"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/framework"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 const (
diff --git a/pkg/validate/selinux_linux.go b/pkg/validate/selinux_linux.go
@@ -22,13 +22,13 @@ import (
 	"strings"
 	"time"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	selinux "github.com/opencontainers/selinux/go-selinux"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"sigs.k8s.io/cri-tools/pkg/framework"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 var _ = framework.KubeDescribe("SELinux", func() {
diff --git a/pkg/validate/streaming.go b/pkg/validate/streaming.go
diff --git a/pkg/validate/streaming_linux.go b/pkg/validate/streaming_linux.go
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"runtime"`
`21`	`21`
`22`	`22`	`runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"`
	`23`	`+`
`23`	`24`	`"sigs.k8s.io/cri-tools/pkg/framework"`
`24`	`25`	`)`
`25`	`26`