fix: apply lint suggestions

topfreegames · Aug 28, 2024 · 60debea · 60debea
1 parent 669fa4b
commit 60debea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -21,7 +21,7 @@ jobs:
           go-version: 1.21.9
 
       - name: Run lint
-        uses: golangci/golangci-lint-action@v3.1.0
+        uses: golangci/golangci-lint-action@v6.1.0
         with:
           version: latest
           args: --timeout 5m0s

diff --git a/Makefile b/Makefile
@@ -158,7 +158,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.0.1
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
-GOLANGCI_LINT_VERSION ?= v1.53.3
+GOLANGCI_LINT_VERSION ?= v1.60.3
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

diff --git a/internal/controller/ec2.aws/securitygroup_controller.go b/internal/controller/ec2.aws/securitygroup_controller.go
@@ -280,7 +280,7 @@ func (r *SecurityGroupReconciliation) reconcileNormal(ctx context.Context) (ctrl
 			securitygroupv1alpha2.CrossplaneResourceReadyCondition,
 			securitygroupv1alpha2.CrossplaneResourceReconciliationFailedReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"error creating/updating crossplane securitygroup: %s", err.Error(),
 		)
 		return resultError, fmt.Errorf("error creating crossplane securitygroup: %w", err)
 	}
@@ -291,7 +291,7 @@ func (r *SecurityGroupReconciliation) reconcileNormal(ctx context.Context) (ctrl
 			securitygroupv1alpha2.CrossplaneResourceReadyCondition,
 			securitygroupv1alpha2.CrossplaneResourceReconciliationFailedReason,
 			clusterv1beta1.ConditionSeverityError,
-			err.Error(),
+			"error getting crossplane securitygroup: %s", err.Error(),
 		)
 		return resultError, err
 	}
@@ -308,7 +308,7 @@ func (r *SecurityGroupReconciliation) reconcileNormal(ctx context.Context) (ctrl
 				securitygroupv1alpha2.SecurityGroupReadyCondition,
 				string(availableCondition.Reason),
 				clusterv1beta1.ConditionSeverityError,
-				availableCondition.Message,
+				"security group not available: %s", availableCondition.Message,
 			)
 			return resultError, ErrSecurityGroupNotAvailable
 		}
@@ -404,7 +404,7 @@ func (r *SecurityGroupReconciliation) attachKopsMachinePool(ctx context.Context,
 			securitygroupv1alpha2.SecurityGroupAttachedCondition,
 			securitygroupv1alpha2.SecurityGroupAttachmentFailedReason,
 			clusterv1beta1.ConditionSeverityError,
-			attachErr.Error(),
+			"failed to attach SecurityGroup: %s", attachErr.Error(),
 		)
 	} else {
 		conditions.MarkTrue(r.sg, securitygroupv1alpha2.SecurityGroupAttachedCondition)