From d2effd77e910c93d9aa904ccb57e2aad1410ff57 Mon Sep 17 00:00:00 2001 From: Tayler Geiger Date: Tue, 9 Apr 2024 16:17:03 -0500 Subject: [PATCH 1/2] Add gci linter for import grouping golangci-lint will now group imports in the following order: - standard library - 3rd party packages outside of our Github org - packages from our Github org - local imports from catalogd Signed-off-by: Tayler Geiger --- .golangci.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.golangci.yaml b/.golangci.yaml index 5360e545..226f7c96 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -7,6 +7,7 @@ linters: - asciicheck - bodyclose - errorlint + - gci - ginkgolinter - gofmt - goimports @@ -46,6 +47,15 @@ linters-settings: alias: rukpakv1alpha1 goimports: local-prefixes: github.com/operator-framework/catalogd + + gci: + sections: + - standard + - default + - prefix(github.com/operator-framework) + - prefix(github.com/operator-framework/catalogd) + custom-order: true output: - format: tab \ No newline at end of file + formats: + - format: tab \ No newline at end of file From ca8e8bc2c8b754bcdd6a9b2c23f3a3f546d787fb Mon Sep 17 00:00:00 2001 From: Tayler Geiger Date: Tue, 9 Apr 2024 16:17:59 -0500 Subject: [PATCH 2/2] Apply new gci import grouping Signed-off-by: Tayler Geiger --- cmd/manager/main.go | 15 ++++++--------- pkg/controllers/core/catalog_controller_test.go | 3 +-- pkg/storage/localdir_test.go | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index e4b8b08b..bde61488 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -25,22 +25,22 @@ import ( "path/filepath" "time" + "github.com/spf13/pflag" + "k8s.io/apimachinery/pkg/runtime" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. "k8s.io/client-go/metadata" _ "k8s.io/client-go/plugin/pkg/client/auth" - - "k8s.io/apimachinery/pkg/runtime" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/spf13/pflag" - + //+kubebuilder:scaffold:imports + "github.com/operator-framework/catalogd/api/core/v1alpha1" "github.com/operator-framework/catalogd/internal/garbagecollection" "github.com/operator-framework/catalogd/internal/source" "github.com/operator-framework/catalogd/internal/third_party/server" @@ -49,9 +49,6 @@ import ( "github.com/operator-framework/catalogd/pkg/features" catalogdmetrics "github.com/operator-framework/catalogd/pkg/metrics" "github.com/operator-framework/catalogd/pkg/storage" - - //+kubebuilder:scaffold:imports - "github.com/operator-framework/catalogd/api/core/v1alpha1" ) var ( diff --git a/pkg/controllers/core/catalog_controller_test.go b/pkg/controllers/core/catalog_controller_test.go index 1cefc66d..876a540c 100644 --- a/pkg/controllers/core/catalog_controller_test.go +++ b/pkg/controllers/core/catalog_controller_test.go @@ -10,12 +10,11 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" - "github.com/google/go-cmp/cmp/cmpopts" - catalogdv1alpha1 "github.com/operator-framework/catalogd/api/core/v1alpha1" "github.com/operator-framework/catalogd/internal/source" "github.com/operator-framework/catalogd/pkg/storage" diff --git a/pkg/storage/localdir_test.go b/pkg/storage/localdir_test.go index e258a961..0fb67c1d 100644 --- a/pkg/storage/localdir_test.go +++ b/pkg/storage/localdir_test.go @@ -15,6 +15,7 @@ import ( "github.com/google/go-cmp/cmp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/operator-framework/operator-registry/alpha/declcfg" )