fix gocritic linter

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

.golangci.yaml

@@ -8,7 +8,6 @@ linters:
       - linters:
           - errchkjson
           - forbidigo
-          - gocritic
           - gosec
           - govet
           - musttag

pkg/agent/config.go

@@ -750,14 +750,15 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 			break
 		}
 
-		if flagClientID != "" && flagPrivateKeyPath != "" {
+		switch {
+		case flagClientID != "" && flagPrivateKeyPath != "":
 			// If --client-id and --private-key-path are passed, then
 			// --credentials-file is ignored.
 			creds = &client.VenafiSvcAccountCredentials{
 				ClientID:       flagClientID,
 				PrivateKeyFile: flagPrivateKeyPath,
 			}
-		} else if flagCredentialsPath != "" {
+		case flagCredentialsPath != "":
 			credsBytes, err := readCredentialsFile(flagCredentialsPath)
 			if err != nil {
 				errs = multierror.Append(errs, multierror.Prefix(err, "credentials file:"))
@@ -768,7 +769,7 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 				errs = multierror.Append(errs, multierror.Prefix(err, "credentials file:"))
 				break // Don't continue with the client since creds is invalid.
 			}
-		} else {
+		default:
 			return nil, fmt.Errorf("programmer mistake: --client-id and --private-key-path or --credentials-file must have been provided")
 		}
 

pkg/client/client_venafi_cloud.go

@@ -71,7 +71,7 @@ type (
 	}
 
 	accessTokenInformation struct {
-		AccessToken string `json:"access_token"` //base 64 encoded token
+		AccessToken string `json:"access_token"` // base 64 encoded token
 		Type        string `json:"token_type"`   // always be “bearer” for now
 		ExpiresIn   int64  `json:"expires_in"`   // number of seconds after which the access token will expire
 	}

pkg/datagatherer/k8s/dynamic.go

@@ -329,7 +329,7 @@ func (g *DataGathererDynamic) Fetch() (interface{}, int, error) {
 		fetchNamespaces = []string{metav1.NamespaceAll}
 	}
 
-	//delete expired items from the cache
+	// delete expired items from the cache
 	g.cache.DeleteExpired()
 	for _, item := range g.cache.Items() {
 		// filter cache items by namespace

pkg/datagatherer/k8s/dynamic_test.go

@@ -678,7 +678,7 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 				},
 			})
 			require.NoError(t, err)
-			//start test Informer
+			// start test Informer
 			factory.Start(ctx.Done())
 			k8scache.WaitForCacheSync(ctx.Done(), testInformer.HasSynced)
 
@@ -996,7 +996,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			//start test Informer
+			// start test Informer
 			factory.Start(ctx.Done())
 			k8scache.WaitForCacheSync(ctx.Done(), testInformer.HasSynced)
 			dgd := dg.(*DataGathererDynamic)

pkg/testutil/envtest.go

@@ -206,16 +206,17 @@ func FakeVenafiCloud(t *testing.T) (_ *httptest.Server, _ *x509.Certificate, set
 			_, _ = w.Write([]byte(`{"error":"expected header 'Authorization: Bearer VALID_ACCESS_TOKEN' or 'tppl-api-key: VALID_API_KEY', but got Authorization=` + r.Header.Get("Authorization") + ` and tppl-api-key=` + r.Header.Get("Tppl-Api-Key")))
 			return
 		}
-		if r.URL.Path == "/v1/tlspk/upload/clusterdata/no" {
+		switch r.URL.Path {
+		case "/v1/tlspk/upload/clusterdata/no":
 			if r.URL.Query().Get("name") != "test cluster name" {
 				w.WriteHeader(http.StatusBadRequest)
 				_, _ = w.Write([]byte(`{"error":"unexpected name query param in the test server: ` + r.URL.Query().Get("name") + `, expected: 'test cluster name'"}`))
 				return
 			}
 			_, _ = w.Write([]byte(`{"status":"ok","organization":"756db001-280e-11ee-84fb-991f3177e2d0"}`))
-		} else if r.URL.Path == "/v1/useraccounts" {
+		case "/v1/useraccounts":
 			_, _ = w.Write([]byte(`{"user": {"username": "user","id": "76a126f0-280e-11ee-84fb-991f3177e2d0"}}`))
-		} else {
+		default:
 			w.WriteHeader(http.StatusInternalServerError)
 			_, _ = w.Write([]byte(`{"error":"unexpected path in the test server","path":"` + r.URL.Path + `"}`))
 		}
@@ -236,15 +237,16 @@ func FakeTPP(t testing.TB) (*httptest.Server, *x509.Certificate) {
 
 		accessToken := strings.TrimPrefix(r.Header.Get("Authorization"), "Bearer ")
 
-		if r.URL.Path == "/vedsdk/Identity/Self" {
+		switch r.URL.Path {
+		case "/vedsdk/Identity/Self":
 			if accessToken != "VALID_ACCESS_TOKEN" {
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 			_, _ = w.Write([]byte(`{"Identities":[{"Name":"TEST"}]}`))
-		} else if r.URL.Path == "/vedsdk/certificates/checkpolicy" {
+		case "/vedsdk/certificates/checkpolicy":
 			_, _ = w.Write([]byte(`{"Policy":{"Subject":{"Organization":{"Value": "test-org"}}}}`))
-		} else {
+		default:
 			w.WriteHeader(http.StatusInternalServerError)
 			_, _ = w.Write([]byte(`{"error":"unexpected path in the test server","path":"` + r.URL.Path + `"}`))
 		}