From bc8a921f5f811d866bd1c381bd474c00170ad2b9 Mon Sep 17 00:00:00 2001 From: Bartosz Ciesielczyk <120648697+cbartoszDell@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:44:32 +0100 Subject: [PATCH] update golangci-lint (#456) * update golangci-lint * remove extraneous append * outdent else * outdent else * fmt fixes (#486) --------- Co-authored-by: Jooseppi Luna --- .github/workflows/linters.yaml | 4 ++-- controllers/csm_controller_test.go | 6 +++--- pkg/resources/serviceaccount/serviceaccount.go | 8 ++++---- pkg/utils/utils.go | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml index 618c46f7e..2109263c3 100644 --- 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/checkout@v3.2.0 @@ -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 index 4c6bf8a5c..92f359609 100644 --- 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 index 4b1dc2516..9a616abf1 100644 --- 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 index 2644e090c..96ceacdec 100644 --- 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 }