update golangci-lint (#456)

* update golangci-lint * remove extraneous append * outdent else * outdent else * fmt fixes (#486) --------- Co-authored-by: Jooseppi Luna <[email protected]>
dell · Feb 22, 2024 · bc8a921 · bc8a921
1 parent 2902cb3
commit bc8a921
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: false
       - name: Checkout the code
         uses: actions/[email protected]
@@ -26,5 +26,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54.2
+          version: v1.55
           skip-cache: true
diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go
@@ -214,14 +214,14 @@ func (suite *CSMControllerTestSuite) TestResiliencyReconcileError() {
 }
 
 func (suite *CSMControllerTestSuite) TestReverseProxyReconcile() {
-	suite.makeFakeRevProxyCSM(csmName, suite.namespace, true, append(getReverseProxyModule()), string(v1.PowerMax))
+	suite.makeFakeRevProxyCSM(csmName, suite.namespace, true, getReverseProxyModule(), string(v1.PowerMax))
 	suite.runFakeCSMManager("", false)
 	suite.deleteCSM(csmName)
 	suite.runFakeCSMManager("", true)
 }
 
 func (suite *CSMControllerTestSuite) TestReverseProxyPreCheckError() {
-	suite.makeFakeRevProxyCSM(csmName, suite.namespace, false, append(getReverseProxyModule()), "badVersion")
+	suite.makeFakeRevProxyCSM(csmName, suite.namespace, false, getReverseProxyModule(), "badVersion")
 	reconciler := suite.createReconciler()
 	res, err := reconciler.Reconcile(ctx, req)
 	ctrl.Log.Info("reconcile response", "res is: ", res)
@@ -239,7 +239,7 @@ func (suite *CSMControllerTestSuite) TestReconcileReverseProxyError() {
 }
 
 func (suite *CSMControllerTestSuite) TestPowermaxReconcileError() {
-	suite.makeFakeRevProxyCSM(csmName, suite.namespace, false, append(getReverseProxyModule()), "badDriver")
+	suite.makeFakeRevProxyCSM(csmName, suite.namespace, false, getReverseProxyModule(), "badDriver")
 	reconciler := suite.createReconciler()
 	res, err := reconciler.Reconcile(ctx, req)
 	ctrl.Log.Info("reconcile response", "res is: ", res)

diff --git a/pkg/resources/serviceaccount/serviceaccount.go b/pkg/resources/serviceaccount/serviceaccount.go
@@ -39,10 +39,10 @@ func SyncServiceAccount(ctx context.Context, sa corev1.ServiceAccount, client cl
 	} else if err != nil {
 		log.Errorw("Unknown error.", "Error", err.Error())
 		return err
-	} else {
-		// Updating the service account keeps regenerating the secrets.
-		// We dont have to update the service account if it exists.
-		log.Infow("ServiceAccount already exists", "Name:", sa.Name)
 	}
+
+	// Updating the service account keeps regenerating the secrets.
+	// We dont have to update the service account if it exists.
+	log.Infow("ServiceAccount already exists", "Name:", sa.Name)
 	return nil
 }
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -727,12 +727,12 @@ func DeleteObject(ctx context.Context, obj crclient.Object, ctrlClient crclient.
 	} else if err != nil {
 		log.Errorw("error to find object in deleteObj", "Error", err.Error(), "Name:", name, "Kind:", kind)
 		return err
-	} else {
-		log.Infow("Deleting object", "Name:", name, "Kind:", kind)
-		err = ctrlClient.Delete(ctx, obj)
-		if err != nil && !k8serror.IsNotFound(err) {
-			return err
-		}
+	}
+
+	log.Infow("Deleting object", "Name:", name, "Kind:", kind)
+	err = ctrlClient.Delete(ctx, obj)
+	if err != nil && !k8serror.IsNotFound(err) {
+		return err
 	}
 	return nil
 }