Fix golangci-lint reported issue in the operator and bump the action …

…to v6 (#1387)
k8ssandra · Aug 21, 2024 · d60620a · d60620a
1 parent 779d7b3
commit d60620a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/test_and_build_image.yaml b/.github/workflows/test_and_build_image.yaml
@@ -29,7 +29,7 @@ jobs:
           go-version-file: 'go.mod'
           cache: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           # GHA requires longer timeout

diff --git a/CHANGELOG/CHANGELOG-1.18.md b/CHANGELOG/CHANGELOG-1.18.md
@@ -16,6 +16,7 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 ## unreleased
 
 * [CHANGE] Update cassandra-medusa to 0.22.2
+* [BUGFIX] Fix golangci-lint reported issue in the operator and bump the action to v6
 
 ## v1.18.0 - 2024-07-24
 

diff --git a/controllers/control/k8ssandratask_controller.go b/controllers/control/k8ssandratask_controller.go
@@ -55,6 +55,7 @@ import (
 const (
 	k8ssandraTaskFinalizer = "control.k8ssandra.io/finalizer"
 	defaultTTL             = time.Duration(86400) * time.Second
+	invalidSpecErrorFormat = "invalid spec: %s"
 )
 
 var (
@@ -149,7 +150,7 @@ func (r *K8ssandraTaskReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return r.reportInvalidSpec(ctx, kTask, "unknown K8ssandraCluster %s.%s", kcKey.Namespace, kcKey.Name)
 	}
 	if dcs, err := filterDcs(kc, kTask.Spec.Datacenters); err != nil {
-		return r.reportInvalidSpec(ctx, kTask, err.Error())
+		return r.reportInvalidSpec(ctx, kTask, invalidSpecErrorFormat, err.Error())
 	} else {
 		for _, dc := range dcs {
 			dcNamespace := utils.FirstNonEmptyString(dc.Meta.Namespace, kc.Namespace)