Merge pull request #791 from andypitcher/update-golangci-lint-version

Bump golangci-lint to v2

Author: andypitcher

.golangci.json

@@ -0,0 +1,19 @@
+version: "2"
+linters:
+  default: none
+  enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - gosec
+    - govet
+    - ineffassign
+    - misspell
+  exclusions:
+    rules:
+      - path: 'main.go'
+        text: 'G114: Use of net/http serve function that has no support for setting timeouts'
+formatters:
+  enable:
+    - gofmt
+    - goimports

.golangci.yaml

@@ -1,5 +1,5 @@
 # renovate: datasource=github-release-attachments depName=golangci/golangci-lint
-GOLANGCI_VERSION = v1.64.8
+GOLANGCI_VERSION = v2.0.2
 # renovate: datasource=github-release-attachments depName=k3d-io/k3d
 K3D_VERSION = v5.8.3
 

hack/make/deps.mk

@@ -243,6 +243,9 @@ func getValue(obj interface{}, name ...string) reflect.Value {
 }
 
 func getFieldValue(v reflect.Value, name ...string) reflect.Value {
+	if len(name) == 0 {
+		return reflect.Value{}
+	}
 	field := v.FieldByName(name[0])
 	if len(name) == 1 {
 		return field

pkg/condition/condition.go

@@ -37,7 +37,7 @@ func WriteCRD() error {
 		}
 
 		filename := fmt.Sprintf("./crds/%s.yaml", strings.ToLower(crd.Spec.Names.Kind))
-		err = os.WriteFile(filename, yamlBytes, 0o644)
+		err = os.WriteFile(filename, yamlBytes, 0o600)
 		if err != nil {
 			return err
 		}

pkg/crds/crd.go

@@ -69,8 +69,14 @@ func (c *Controller) handleJobs(ctx context.Context) error {
 			c.setClusterScanStatusDisplay(scan)
 
 			if scan.Spec.ScheduledScanConfig != nil && scan.Spec.ScheduledScanConfig.CronSchedule != "" {
-				c.rescheduleScan(scan)
-				c.purgeOldClusterScanReports(scan)
+				err := c.rescheduleScan(scan)
+				if err != nil {
+					return obj, fmt.Errorf("error rescheduling scan: %w", err)
+				}
+				err = c.purgeOldClusterScanReports(scan)
+				if err != nil {
+					return obj, fmt.Errorf("error purging old ClusterScanReports: %w", err)
+				}
 			}
 			err := c.deleteJob(jobs, obj, metav1.DeletePropagationBackground)
 			if err != nil {