Update golangci-lint and Go version for lint workflow

Author: oscr

.github/workflows/golangci-lint.yml

@@ -7,6 +7,9 @@ on:
 # Remove all permissions from GITHUB_TOKEN except metadata.
 permissions: {}
 
+env:
+  GO_VERSION: 1.18.4
+
 jobs:
   golangci:
     name: lint
@@ -21,9 +24,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: ${{ env.GO_VERSION }}
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.44.0
+          version: v1.47.1
           working-directory: ${{matrix.working-directory}}

.golangci.yml

@@ -43,6 +43,28 @@ linters:
   - whitespace
 
 linters-settings:
+  revive:
+    rules:
+      - name: context-keys-type
+        disabled: true
+      - name: errorf
+        disabled: true
+      - name: time-naming
+        disabled: true
+      - name: unexported-return
+        disabled: true
+      - name: unhandled-error
+        disabled: true
+      - name: var-declaration
+        disabled: true
+      - name: modifies-value-receiver
+        disabled: true
+      - name: range-val-address
+        disabled: true
+      - name: string-of-int
+        disabled: true
+      - name: time-equal
+        disabled: true
   godot:
     #   declarations - for top level declaration comments (default);
     #   toplevel     - for top level comments;
@@ -138,13 +160,13 @@ linters-settings:
       - pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
         alias: infraexpv1
   nolintlint:
-    allow-unused: false
+    allow-unused: true # TODO(oscr) Set to false when revive linter is fully enabled again.
     allow-leading-space: false
     require-specific: true
   staticcheck:
-    go: "1.17"
+    go: "1.18"
   stylecheck:
-    go: "1.17"
+    go: "1.18"
   gosec:
     excludes:
     - G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -167,7 +189,7 @@ linters-settings:
     - whyNoLint
     - wrapperFunc
   unused:
-    go: "1.17"
+    go: "1.18"
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0

controllers/remote/cluster_cache_reconciler_test.go

@@ -45,7 +45,7 @@ func TestClusterCacheReconciler(t *testing.T) {
 
 		// createAndWatchCluster creates a new cluster and ensures the clusterCacheTracker has a clusterAccessor for it
 		createAndWatchCluster := func(clusterName string, testNamespace *corev1.Namespace, g *WithT) {
-			t.Log(fmt.Sprintf("Creating a cluster %q", clusterName))
+			t.Logf("Creating a cluster %q", clusterName)
 			testCluster := &clusterv1.Cluster{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      clusterName,
@@ -136,7 +136,7 @@ func TestClusterCacheReconciler(t *testing.T) {
 			defer teardown(t, g, testNamespace)
 
 			for _, clusterName := range []string{"cluster-1", "cluster-2", "cluster-3"} {
-				t.Log(fmt.Sprintf("Deleting cluster %q", clusterName))
+				t.Logf("Deleting cluster %q", clusterName)
 				obj := &clusterv1.Cluster{
 					ObjectMeta: metav1.ObjectMeta{
 						Namespace: testNamespace.Name,
@@ -145,7 +145,7 @@ func TestClusterCacheReconciler(t *testing.T) {
 				}
 				g.Expect(k8sClient.Delete(ctx, obj)).To(Succeed())
 
-				t.Log(fmt.Sprintf("Checking cluster %q's clusterAccessor is removed", clusterName))
+				t.Logf("Checking cluster %q's clusterAccessor is removed", clusterName)
 				g.Eventually(func() bool { return cct.clusterAccessorExists(util.ObjectKey(obj)) }, timeout).Should(BeFalse())
 			}
 		})

internal/controllers/topology/cluster/patches/template.go

@@ -62,7 +62,7 @@ func (t *requestItemBuilder) WithHolder(object client.Object, fieldPath string)
 }
 
 // uuidGenerator is defined as a package variable to enable changing it during testing.
-var uuidGenerator func() types.UID = uuid.NewUUID
+var uuidGenerator = uuid.NewUUID
 
 // Build builds a GeneratePatchesRequestItem.
 func (t *requestItemBuilder) Build() (*runtimehooksv1.GeneratePatchesRequestItem, error) {

internal/webhooks/cluster_test.go

@@ -47,9 +47,7 @@ func TestClusterDefaultNamespaces(t *testing.T) {
 		},
 	}
 	webhook := &Cluster{}
-	tFunc := util.CustomDefaultValidateTest(ctx, c, webhook)
-
-	t.Run("for Cluster", tFunc)
+	t.Run("for Cluster", util.CustomDefaultValidateTest(ctx, c, webhook))
 	g.Expect(webhook.Default(ctx, c)).To(Succeed())
 
 	g.Expect(c.Spec.InfrastructureRef.Namespace).To(Equal(c.Namespace))
@@ -351,8 +349,7 @@ func TestClusterDefaultTopologyVersion(t *testing.T) {
 
 	// Create the webhook and add the fakeClient as its client.
 	webhook := &Cluster{Client: fakeClient}
-	tFunc := util.CustomDefaultValidateTest(ctx, c, webhook)
-	t.Run("for Cluster", tFunc)
+	t.Run("for Cluster", util.CustomDefaultValidateTest(ctx, c, webhook))
 	g.Expect(webhook.Default(ctx, c)).To(Succeed())
 
 	g.Expect(c.Spec.Topology.Version).To(HavePrefix("v"))

internal/webhooks/clusterclass_test.go

@@ -77,9 +77,7 @@ func TestClusterClassDefaultNamespaces(t *testing.T) {
 
 	// Create the webhook and add the fakeClient as its client.
 	webhook := &ClusterClass{Client: fakeClient}
-	tFunc := util.CustomDefaultValidateTest(ctx, in, webhook)
-
-	t.Run("for ClusterClass", tFunc)
+	t.Run("for ClusterClass", util.CustomDefaultValidateTest(ctx, in, webhook))
 
 	g := NewWithT(t)
 	g.Expect(webhook.Default(ctx, in)).To(Succeed())

util/container/image.go

@@ -18,10 +18,8 @@ limitations under the License.
 package container
 
 import (
-
 	//  Import the crypto sha256 algorithm for the docker image parser to work
 	_ "crypto/sha256"
-
 	//  Import the crypto/sha512 algorithm for the docker image parser to work with 384 and 512 sha hashes
 	_ "crypto/sha512"
 	"fmt"