chore(ci): upgrade golangci-lint (#2459)

Author: emosbaugh

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ jobs:
         run: |
           make vet
       - name: Lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           args: --build-tags containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper,exclude_graphdriver_overlay
 

.golangci.yml

@@ -1,48 +1,37 @@
-run:
-  timeout: 10m
-
-output:
-  # Make output more digestible with quickfix in vim/emacs/etc.
-  sort-results: true
-  print-issued-lines: false
-
+version: "2"
 linters:
-  # We'll track the golangci-lint default linters manually
-  # instead of letting them change without our control.
-  disable-all: true
+  default: none
   enable:
-    # golangci-lint defaults:
-    # - errcheck
-    - gosimple
     - govet
     - ineffassign
+    - nolintlint
     - staticcheck
-    # - unused
-
-    # Our own extras:
-    - gofmt
-    - nolintlint # lints nolint directives
-    # - revive
-
-linters-settings:
-  govet:
-    # These govet checks are disabled by default, but they're useful.
-    enable:
-    - nilness
-    - reflectvaluecompare
-    - sortslice
-    - unusedwrite
-  unused:
-    field-writes-are-uses: false
-    exported-fields-are-used: false
-    # parameters-are-used: false
-    local-variables-are-used: false
-
+  settings:
+    govet:
+      enable:
+        - nilness
+        - reflectvaluecompare
+        - sortslice
+        - unusedwrite
+    unused:
+      field-writes-are-uses: false
+      exported-fields-are-used: false
+      local-variables-are-used: false
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  # Print all issues reported by all linters.
   max-issues-per-linter: 0
   max-same-issues: 0
-
-  # Don't ignore some of the issues that golangci-lint considers okay.
-  # This includes documenting all exported entities.
-  exclude-use-default: false
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

api/integration/linux/install/infra_test.go

@@ -19,7 +19,6 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/integration"
 	"github.com/replicatedhq/embedded-cluster/api/integration/assets"
 	"github.com/replicatedhq/embedded-cluster/api/integration/auth"
-	"github.com/replicatedhq/embedded-cluster/api/internal/managers/linux/infra"
 	linuxinfra "github.com/replicatedhq/embedded-cluster/api/internal/managers/linux/infra"
 	"github.com/replicatedhq/embedded-cluster/api/internal/managers/linux/preflight"
 	linuxpreflightstore "github.com/replicatedhq/embedded-cluster/api/internal/store/linux/preflight"
@@ -686,10 +685,10 @@ func TestLinuxPostSetupInfra(t *testing.T) {
 		pfManager := preflight.NewHostPreflightManager(
 			preflight.WithHostPreflightStore(linuxpreflightstore.NewMemoryStore(linuxpreflightstore.WithHostPreflight(hpf))),
 		)
-		infraManager := infra.NewInfraManager(
-			infra.WithK0s(k0sMock),
-			infra.WithHostUtils(hostutilsMock),
-			infra.WithLicense(assets.LicenseData),
+		infraManager := linuxinfra.NewInfraManager(
+			linuxinfra.WithK0s(k0sMock),
+			linuxinfra.WithHostUtils(hostutilsMock),
+			linuxinfra.WithLicense(assets.LicenseData),
 		)
 
 		// Setup k0s mock expectations with failure

api/internal/handlers/kubernetes/kubernetes.go

@@ -60,6 +60,7 @@ func New(cfg types.APIConfig, opts ...Option) (*Handler, error) {
 			install.WithConfigValues(h.cfg.ConfigValues),
 			install.WithEndUserConfig(h.cfg.EndUserConfig),
 			install.WithPassword(h.cfg.Password),
+			//nolint:staticcheck // QF1008 this is very ambiguous, we should re-think the config struct
 			install.WithInstallation(h.cfg.KubernetesConfig.Installation),
 		)
 		if err != nil {

api/internal/managers/linux/infra/install.go

@@ -32,6 +32,7 @@ import (
 const K0sComponentName = "Runtime"
 
 func AlreadyInstalledError() error {
+	//nolint:staticcheck // ST1005 TODO: use a constant here and print a better error message
 	return fmt.Errorf(
 		"\nAn installation is detected on this machine.\nTo install, you must first remove the existing installation.\nYou can do this by running the following command:\n\n  sudo ./%s reset\n",
 		runtimeconfig.AppSlug(),

api/internal/statemachine/event_handler.go

@@ -60,6 +60,7 @@ func (eh *eventHandler) TriggerHandler(ctx context.Context, fromState, toState S
 		defer func() {
 			if r := recover(); r != nil {
 				// Capture panic but don't affect the transition
+				//nolint:staticcheck // ST1005 not sure why we need a newline here
 				err := fmt.Errorf("event handler panic from %s to %s: %v: %s\n", fromState, toState, r, debug.Stack())
 				done <- err
 			}

cmd/installer/cli/install.go

@@ -540,7 +540,7 @@ func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags, _ kuberne
 		return fmt.Errorf("failed to connect to kubernetes api server: %w", err)
 	}
 
-	flags.installConfig.kubernetesRESTClientGetter = flags.kubernetesEnvSettings.RESTClientGetter()
+	flags.kubernetesRESTClientGetter = flags.kubernetesEnvSettings.RESTClientGetter()
 
 	return nil
 }
@@ -665,7 +665,7 @@ func runManagerExperienceInstall(
 				AllowIgnoreHostPreflights: flags.ignoreHostPreflights,
 			},
 			KubernetesConfig: apitypes.KubernetesConfig{
-				RESTClientGetter: flags.installConfig.kubernetesRESTClientGetter,
+				RESTClientGetter: flags.kubernetesRESTClientGetter,
 				Installation:     ki,
 			},
 		},

cmd/installer/cli/logging.go

@@ -12,7 +12,6 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/versions"
 	"github.com/sirupsen/logrus"
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
@@ -127,7 +126,7 @@ func SetupLogging() {
 
 // setupCtrlLogging sets up the logging for the controller-runtime package to the writer specified.
 func setupCtrlLogging(w io.Writer) {
-	k8slogger := ctrlzap.New(func(o *zap.Options) {
+	k8slogger := ctrlzap.New(func(o *ctrlzap.Options) {
 		o.DestWriter = w
 	})
 	ctrllog.SetLogger(k8slogger)

cmd/installer/cli/restore.go

@@ -1396,7 +1396,8 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 		return fmt.Errorf("unable to wait for velero restore to complete: %w", err)
 	}
 
-	if drComponent == disasterRecoveryComponentAdminConsole {
+	switch drComponent {
+	case disasterRecoveryComponentAdminConsole:
 		// wait for admin console to be ready
 		kcli, err := kubeutils.KubeClient()
 		if err != nil {
@@ -1406,7 +1407,7 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 		if err := restoreWaitForAdminConsoleReady(ctx, kcli, constants.KotsadmNamespace, loading); err != nil {
 			return fmt.Errorf("unable to wait for admin console: %w", err)
 		}
-	} else if drComponent == disasterRecoveryComponentSeaweedFS {
+	case disasterRecoveryComponentSeaweedFS:
 		// wait for seaweedfs to be ready
 		kcli, err := kubeutils.KubeClient()
 		if err != nil {
@@ -1416,7 +1417,7 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 		if err := restoreWaitForSeaweedfsReady(ctx, kcli, constants.SeaweedFSNamespace, nil); err != nil {
 			return fmt.Errorf("unable to wait for seaweedfs to be ready: %w", err)
 		}
-	} else if drComponent == disasterRecoveryComponentRegistry {
+	case disasterRecoveryComponentRegistry:
 		// wait for registry to be ready
 		kcli, err := kubeutils.KubeClient()
 		if err != nil {
@@ -1426,7 +1427,7 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 		if err := kubeutils.WaitForDeployment(ctx, kcli, constants.RegistryNamespace, "registry", nil); err != nil {
 			return fmt.Errorf("unable to wait for registry to be ready: %w", err)
 		}
-	} else if drComponent == disasterRecoveryComponentECO {
+	case disasterRecoveryComponentECO:
 		// wait for embedded cluster operator to reconcile the installation
 		kcli, err := kubeutils.KubeClient()
 		if err != nil {

cmd/local-artifact-mirror/serve_test.go

@@ -135,7 +135,8 @@ func TestServeCmd(t *testing.T) {
 			url := "http://127.0.0.1:" + port + tc.filePath
 			resp, err := http.Get(url)
 
-			if tc.expectCode == http.StatusOK {
+			switch tc.expectCode {
+			case http.StatusOK:
 				require.NoError(t, err, "HTTP request should not fail")
 				defer resp.Body.Close()
 
@@ -144,7 +145,7 @@ func TestServeCmd(t *testing.T) {
 				body, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)
 				assert.Equal(t, tc.expectBody, string(body))
-			} else if tc.expectCode == http.StatusNotFound {
+			case http.StatusNotFound:
 				if err == nil {
 					defer resp.Body.Close()
 					assert.Equal(t, tc.expectCode, resp.StatusCode)