chore: fix golangci-lint issues

Author: rxbn

.golangci.yml

@@ -1,34 +1,16 @@
 ---
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "api/*"
-      linters:
-        - lll
-    - path: "internal/*"
-      linters:
-        - dupl
-        - lll
 linters:
-  disable-all: true
+  default: none
   enable:
     - copyloopvar
     - dupl
     - errcheck
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -37,12 +19,34 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: comment-spacings
+  exclusions:
+    generated: lax
     rules:
-      - name: comment-spacings
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: internal/*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/controller/account_controller.go

@@ -111,7 +111,7 @@ func (r *AccountReconciler) reconcileAccount(ctx context.Context, account *cloud
 
 	cloudflareAPIToken := string(secret.Data["apiToken"])
 	if cloudflareAPIToken == "" {
-		intconditions.MarkFalse(account, errors.New("Secret has no key named \"apiToken\""))
+		intconditions.MarkFalse(account, errors.New("secret has no key named \"apiToken\""))
 		return ctrl.Result{RequeueAfter: r.RetryInterval}
 	}
 

internal/controller/dnsrecord_controller.go

@@ -129,7 +129,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	}
 
 	if len(zones.Items) == 0 {
-		intconditions.MarkFalse(dnsrecord, fmt.Errorf("Zone %q not found", zoneName))
+		intconditions.MarkFalse(dnsrecord, fmt.Errorf("zone %q not found", zoneName))
 		return ctrl.Result{}, nil
 	}
 
@@ -239,33 +239,31 @@ func (r *DNSRecordReconciler) reconcileDNSRecord(ctx context.Context, dnsrecord
 
 // compareDNSRecord compares the DNS record to the DNSRecord object
 func (r *DNSRecordReconciler) compareDNSRecord(dnsRecordSpec cloudflareoperatoriov1.DNSRecordSpec, existingRecord cloudflare.DNSRecord) bool {
-	var isEqual bool = true
-
 	if dnsRecordSpec.Name != existingRecord.Name {
-		isEqual = false
+		return false
 	}
 	if dnsRecordSpec.Type != existingRecord.Type {
-		isEqual = false
+		return false
 	}
 	if dnsRecordSpec.Type != "SRV" && dnsRecordSpec.Type != "LOC" && dnsRecordSpec.Type != "CAA" {
 		if dnsRecordSpec.Content != existingRecord.Content {
-			isEqual = false
+			return false
 		}
 	}
 	if dnsRecordSpec.TTL != existingRecord.TTL {
-		isEqual = false
+		return false
 	}
 	if *dnsRecordSpec.Proxied != *existingRecord.Proxied {
-		isEqual = false
+		return false
 	}
 	if !comparePriority(dnsRecordSpec.Priority, existingRecord.Priority) {
-		isEqual = false
+		return false
 	}
 	if !compareData(existingRecord.Data, dnsRecordSpec.Data) {
-		isEqual = false
+		return false
 	}
 
-	return isEqual
+	return true
 }
 
 // comparePriority compares the priority nil safe

internal/controller/ip_controller.go

@@ -136,7 +136,7 @@ func (r *IPReconciler) reconcileIP(ctx context.Context, ip *cloudflareoperatorio
 // handleStatic handles the static ip
 func (r *IPReconciler) handleStatic(ip *cloudflareoperatoriov1.IP) error {
 	if ip.Spec.Address == "" {
-		return errors.New("Address is required for static IPs")
+		return errors.New("address is required for static IPs")
 	}
 	if net.ParseIP(ip.Spec.Address) == nil {
 		return fmt.Errorf("IP address %q is not valid", ip.Spec.Address)

test/utils/utils.go

@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
+	. "github.com/onsi/ginkgo/v2" //nolint:revive,staticcheck
 )
 
 const (
@@ -103,7 +103,7 @@ func GetProjectDir() (string, error) {
 	if err != nil {
 		return wd, err
 	}
-	wd = strings.Replace(wd, "/test/e2e", "", -1)
+	wd = strings.ReplaceAll(wd, "/test/e2e", "")
 	return wd, nil
 }