make golangci-lint config consistent across repos

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
operator-framework · Apr 25, 2024 · 00c819f · 00c819f
1 parent cc1abf4
commit 00c819f
Show file tree

Hide file tree

Showing 11 changed files with 217 additions and 28 deletions.
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -35,11 +35,11 @@ $(GINKGO): $(BINGO_DIR)/ginkgo.mod
 	@echo "(re)installing $(GOBIN)/ginkgo-v2.12.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.12.0 "github.com/onsi/ginkgo/v2/ginkgo"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.57.2
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.57.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.57.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 GORELEASER := $(GOBIN)/goreleaser-v1.16.2
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod

diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.20
+go 1.21
 
-require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint
+toolchain go1.22.2
+
+require github.com/golangci/golangci-lint v1.57.2 // cmd/golangci-lint
diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -14,7 +14,7 @@ CONTROLLER_GEN="${GOBIN}/controller-gen-v0.12.0"
 
 GINKGO="${GOBIN}/ginkgo-v2.12.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.53.3"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.57.2"
 
 GORELEASER="${GOBIN}/goreleaser-v1.16.2"
 

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,3 +1,18 @@
+########
+# NOTE
+#
+#  This file is duplicated in the following repos:
+#    - operator-framework/kubectl-operator
+#    - operator-framework/catalogd
+#    - operator-framework/operator-controller
+#    - operator-framework/rukpak
+#
+#  If you are making a change, please make it in ALL
+#  of the above repositories!
+#
+#  TODO: Find a way to have a shared golangci config.
+########
+
 run:
   # Default timeout is 1m, up to give more room
   timeout: 4m
@@ -7,16 +22,14 @@ linters:
   - asciicheck
   - bodyclose
   - errorlint
-  - ginkgolinter
+  - gci
   - gofmt
-  - goimports
   - gosec
   - importas
   - misspell
   - nestif
   - nonamedreturns
   - prealloc
-  - revive
   - stylecheck
   - tparallel
   - unconvert
@@ -25,6 +38,18 @@ linters:
   - whitespace
 
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - dot
+      - default
+      - prefix(github.com/operator-framework)
+
+      # TODO: change this to `localmodule` when golangci-lint
+      # is updated to 1.58+
+      - prefix(github.com/operator-framework/catalogd)
+    custom-order: true
+
   errorlint:
     errorf: false
 
@@ -42,10 +67,11 @@ linters-settings:
       alias: $1$2
     - pkg: sigs.k8s.io/controller-runtime
       alias: ctrl
-    - pkg: github.com/operator-framework/rukpak/api/v1alpha1
-      alias: rukpakv1alpha1
-  goimports:
-    local-prefixes: github.com/operator-framework/catalogd
+    - pkg: github.com/operator-framework/rukpak/api/v1alpha2
+      alias: rukpakv1alpha2
+    - pkg: github.com/blang/semver/v4
+      alias: bsemver
 
 output:
-  format: tab
+  formats:
+    - format: tab
diff --git a/api/core/v1alpha1/catalog_types_test.go b/api/core/v1alpha1/catalog_types_test.go
@@ -56,7 +56,7 @@ func TestPollIntervalCELValidationRules(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-			obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.spec)
+			obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.spec) //nolint:gosec
 			require.NoError(t, err)
 			errs := validator(obj, nil)
 			require.Equal(t, len(tc.wantErrs), len(errs))

diff --git 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
@@ -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
@@ -12,9 +12,11 @@ import (
 	"path/filepath"
 	"testing/fstest"
 
-	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 )
 

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"

diff --git a/test/e2e/unpack_test.go b/test/e2e/unpack_test.go
@@ -7,9 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/google/go-cmp/cmp"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"