Merge pull request bottlerocket-os#832 from vigh-m/golangci-fix

Update golangci-lint

Author: vigh-m

.github/workflows/golangci-lint.yaml

@@ -19,12 +19,12 @@ jobs:
           go-version: 1.21
       - uses: actions/checkout@v4
       - name: lint-host-ctr
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         with:
           version: latest
           working-directory: sources/host-ctr
       - name: lint-ecs-gpu-init
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         with:
           version: latest
           working-directory: sources/ecs-gpu-init

.golangci.yaml

@@ -1,18 +1,30 @@
+version: "2"
 linters:
   enable:
-    - errcheck
-    - goimports
-    - ineffassign
     - misspell
     - revive
-    - staticcheck
     - unconvert
-    - unused
-    - govet
-
-run:
-  timeout: 3m
-issues:
-  exclude-dirs:
-    - vendor
-    - .gomodcache
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - vendor
+      - .gomodcache
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - vendor
+      - .gomodcache
+      - third_party$
+      - builtin$
+      - examples$

sources/ecs-gpu-init/cmd/ecs-gpu-init/main.go

@@ -23,7 +23,7 @@ func main() {
 // GenerateGPUInfoConfig generates the configuration used by the ECS agent
 func generateGPUInfoConfig() error {
 	if ret := nvml.Init(); ret != nvml.SUCCESS {
-		return fmt.Errorf("Failed to initialize NVML, got ret %v", ret)
+		return fmt.Errorf("failed to initialize NVML, got ret %v", ret)
 	}
 	defer func() {
 		ret := nvml.Shutdown()
@@ -34,7 +34,7 @@ func generateGPUInfoConfig() error {
 
 	version, ret := nvml.SystemGetDriverVersion()
 	if ret != nvml.SUCCESS {
-		return fmt.Errorf("Failed to get version, got ret %v", ret)
+		return fmt.Errorf("failed to get version, got ret %v", ret)
 	}
 	gpuIDs, err := getGPUDeviceIDs()
 	if err != nil {
@@ -48,7 +48,7 @@ func generateGPUInfoConfig() error {
 func getGPUDeviceIDs() ([]string, error) {
 	count, ret := nvml.DeviceGetCount()
 	if ret != nvml.SUCCESS {
-		return nil, fmt.Errorf("Failed to get device count, got ret %v", ret)
+		return nil, fmt.Errorf("failed to get device count, got ret %v", ret)
 	}
 	var (
 		gpuIDs []string
@@ -63,7 +63,7 @@ func getGPUDeviceIDs() ([]string, error) {
 		gpuIDs = append(gpuIDs, uuid)
 	}
 	if len(errors) > 0 {
-		return nil, fmt.Errorf("Found errors while initializing devices: %s", errors)
+		return nil, fmt.Errorf("found errors while initializing devices: %s", errors)
 	}
 	return gpuIDs, nil
 }
@@ -92,11 +92,11 @@ func writeGPUInfo(version string, gpuIDs []string) error {
 func getDeviceUUID(idx int) (string, error) {
 	d, ret := nvml.DeviceGetHandleByIndex(idx)
 	if ret != nvml.SUCCESS {
-		return "", fmt.Errorf("Failed to get device at index %d, got ret %v", idx, ret)
+		return "", fmt.Errorf("failed to get device at index %d, got ret %v", idx, ret)
 	}
 	uuid, ret := d.GetUUID()
 	if ret != nvml.SUCCESS {
-		return "", fmt.Errorf("Failed to get UUID for device at index %d, got ret %v", idx, ret)
+		return "", fmt.Errorf("failed to get UUID for device at index %d, got ret %v", idx, ret)
 	}
 
 	return uuid, nil

sources/host-ctr/cmd/host-ctr/main.go

@@ -509,7 +509,7 @@ func runCtr(containerdSocket string, namespace string, containerID string, sourc
 
 	// Return error if container exists with non-zero status
 	if code != 0 {
-		return fmt.Errorf("Container %s exited with non-zero status", containerID)
+		return fmt.Errorf("container %s exited with non-zero status", containerID)
 	}
 
 	return nil