Upgrade lint (#267)

* Update linter

Update to same version used by other OF repos.

Update config to match other OF repos.

Signed-off-by: Andy Goldstein <[email protected]>

* Run goimports

Signed-off-by: Andy Goldstein <[email protected]>

* Fix lint

Signed-off-by: Andy Goldstein <[email protected]>

---------

Signed-off-by: Andy Goldstein <[email protected]>

Author: ncdc

.bingo/Variables.mk

@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
 	@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.55.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.51.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.51.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.55.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.55.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 GORELEASER := $(GOBIN)/goreleaser-v1.20.0
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod

.bingo/golangci-lint.mod

@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.20
 
-require github.com/golangci/golangci-lint v1.51.2 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.55.2 // cmd/golangci-lint

.bingo/golangci-lint.sum

@@ -10,7 +10,7 @@ fi
 
 BINGO="${GOBIN}/bingo-v0.9.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.51.2"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.55.2"
 
 GORELEASER="${GOBIN}/goreleaser-v1.20.0"
 

.bingo/variables.env

@@ -1,17 +1,78 @@
 run:
-  timeout: 5m
+  # Default timeout is 1m, up to give more room
+  timeout: 4m
+
 linters:
-  disable-all: true
   enable:
-    - govet
-    - errcheck
-    - staticcheck
-    - unused
-    - gosimple
-    - structcheck
-    - varcheck
-    - ineffassign
-    - deadcode
-    - typecheck
-    - gofmt
-    - goconst
+  - asciicheck
+  - bodyclose
+  - errorlint
+  - ginkgolinter
+  - gofmt
+  - goimports
+  - gosec
+  - importas
+  - misspell
+  - nestif
+  - nonamedreturns
+  - prealloc
+  - revive
+  - stylecheck
+  - tparallel
+  - unconvert
+  - unparam
+  - unused
+  - whitespace
+
+linters-settings:
+  errorlint:
+    errorf: false
+
+  importas:
+    alias:
+    - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+      alias: metav1
+    - pkg: k8s.io/apimachinery/pkg/api/errors
+      alias: apierrors
+    - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+      alias: apiextensionsv1
+    - pkg: k8s.io/apimachinery/pkg/util/runtime
+      alias: utilruntime
+    - pkg: "^k8s\\.io/api/([^/]+)/(v[^/]+)$"
+      alias: $1$2
+    - pkg: sigs.k8s.io/controller-runtime
+      alias: ctrl
+
+  goimports:
+    local-prefixes: github.com/operator-framework/helm-operator-plugins
+
+  revive:
+    ignore-generated-header: false
+    severity: warning
+    confidence: 0.8
+    rules:
+    - name: blank-imports
+    - name: context-as-argument
+    - name: context-keys-type
+    - name: error-return
+    - name: error-strings
+    - name: error-naming
+    - name: exported
+    - name: increment-decrement
+    - name: var-naming
+    - name: var-declaration
+    - name: package-comments
+    - name: range
+    - name: receiver-naming
+    - name: time-naming
+    - name: unexported-return
+    - name: indent-error-flow
+    - name: errorf
+    - name: empty-block
+    - name: superfluous-else
+    - name: unused-parameter
+    - name: unreachable-code
+    - name: redefines-builtin-id
+
+output:
+  format: tab

.golangci.yml

@@ -52,5 +52,4 @@ func main() {
 
 	log.Infof("creating Hybrid Memcached Sample")
 	hybrid.GenerateMemcachedSamples(binaryPath, samplesPath)
-
 }

hack/generate/samples/generate_testdata.go

@@ -22,7 +22,9 @@ type SampleContext struct {
 }
 
 // NewSampleContext returns a SampleContext containing a new kubebuilder TestContext.
-func NewSampleContext(binary string, path string, env ...string) (s SampleContext, err error) {
+func NewSampleContext(binary string, path string, env ...string) (SampleContext, error) {
+	var s SampleContext
+	var err error
 	s.TestContext, err = testutils.NewPartialTestContext(binary, path, env...)
 	return s, err
 }

hack/generate/samples/internal/pkg/context.go

@@ -200,7 +200,6 @@ func run(cmd *cobra.Command, f *flags.Flags) {
 		log.Error(err, "Manager exited non-zero.")
 		os.Exit(1)
 	}
-
 }
 
 // exitIfUnsupported prints an error containing unsupported field names and exits

internal/cmd/helm-operator/run/cmd.go

@@ -117,7 +117,6 @@ func (f *Flags) AddTo(flagSet *pflag.FlagSet) {
 			" holding the leader lock (required if running locally with leader"+
 			" election enabled).",
 	)
-
 }
 
 // ToManagerOptions uses the flag set in f to configure options.

internal/flags/flag.go

@@ -44,8 +44,8 @@ var (
 func WaitForDeletion(ctx context.Context, cl client.Reader, o client.Object) error {
 	key := client.ObjectKeyFromObject(o)
 
-	return wait.PollUntilContextCancel(ctx, time.Millisecond*10, true, func(ctx context.Context) (done bool, err error) {
-		err = cl.Get(ctx, key, o)
+	return wait.PollUntilContextCancel(ctx, time.Millisecond*10, true, func(ctx context.Context) (bool, error) {
+		err := cl.Get(ctx, key, o)
 		if apierrors.IsNotFound(err) {
 			return true, nil
 		}