🧹 Bumping GolangciLint version and fixing lint issues (external-secrets#2304)

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

Author: gusfcarvalho

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GOLANGCI_VERSION: 'v1.49.0'
+  GOLANGCI_VERSION: 'v1.52.2'
   KUBERNETES_VERSION: '1.24.x'
 
   # Sonar

apis/externalsecrets/v1beta1/externalsecret_validator.go

@@ -22,15 +22,15 @@ import (
 
 type ExternalSecretValidator struct{}
 
-func (esv *ExternalSecretValidator) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (esv *ExternalSecretValidator) ValidateCreate(_ context.Context, obj runtime.Object) error {
 	return validateExternalSecret(obj)
 }
 
-func (esv *ExternalSecretValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) error {
+func (esv *ExternalSecretValidator) ValidateUpdate(_ context.Context, _, newObj runtime.Object) error {
 	return validateExternalSecret(newObj)
 }
 
-func (esv *ExternalSecretValidator) ValidateDelete(ctx context.Context, obj runtime.Object) error {
+func (esv *ExternalSecretValidator) ValidateDelete(_ context.Context, _ runtime.Object) error {
 	return nil
 }
 

apis/externalsecrets/v1beta1/provider_schema_test.go

@@ -30,45 +30,45 @@ func (p *PP) Capabilities() SecretStoreCapabilities {
 }
 
 // New constructs a SecretsManager Provider.
-func (p *PP) NewClient(ctx context.Context, store GenericStore, kube client.Client, namespace string) (SecretsClient, error) {
+func (p *PP) NewClient(_ context.Context, _ GenericStore, _ client.Client, _ string) (SecretsClient, error) {
 	return p, nil
 }
 
 // PushSecret writes a single secret into a provider.
-func (p *PP) PushSecret(ctx context.Context, value []byte, remoteRef PushRemoteRef) error {
+func (p *PP) PushSecret(_ context.Context, _ []byte, _ PushRemoteRef) error {
 	return nil
 }
 
 // DeleteSecret deletes a single secret from a provider.
-func (p *PP) DeleteSecret(ctx context.Context, remoteRef PushRemoteRef) error {
+func (p *PP) DeleteSecret(_ context.Context, _ PushRemoteRef) error {
 	return nil
 }
 
 // GetSecret returns a single secret from the provider.
-func (p *PP) GetSecret(ctx context.Context, ref ExternalSecretDataRemoteRef) ([]byte, error) {
+func (p *PP) GetSecret(_ context.Context, _ ExternalSecretDataRemoteRef) ([]byte, error) {
 	return []byte("NOOP"), nil
 }
 
 // GetSecretMap returns multiple k/v pairs from the provider.
-func (p *PP) GetSecretMap(ctx context.Context, ref ExternalSecretDataRemoteRef) (map[string][]byte, error) {
+func (p *PP) GetSecretMap(_ context.Context, _ ExternalSecretDataRemoteRef) (map[string][]byte, error) {
 	return map[string][]byte{}, nil
 }
 
 // Empty GetAllSecrets.
-func (p *PP) GetAllSecrets(ctx context.Context, ref ExternalSecretFind) (map[string][]byte, error) {
+func (p *PP) GetAllSecrets(_ context.Context, _ ExternalSecretFind) (map[string][]byte, error) {
 	// TO be implemented
 	return map[string][]byte{}, nil
 }
 
-func (p *PP) Close(ctx context.Context) error {
+func (p *PP) Close(_ context.Context) error {
 	return nil
 }
 
 func (p *PP) Validate() (ValidationResult, error) {
 	return ValidationResultReady, nil
 }
 
-func (p *PP) ValidateStore(store GenericStore) error {
+func (p *PP) ValidateStore(_ GenericStore) error {
 	return nil
 }
 

apis/externalsecrets/v1beta1/secretstore_validator.go

@@ -31,7 +31,7 @@ const (
 type GenericStoreValidator struct{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GenericStoreValidator) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (r *GenericStoreValidator) ValidateCreate(_ context.Context, obj runtime.Object) error {
 	st, ok := obj.(GenericStore)
 	if !ok {
 		return fmt.Errorf(errInvalidStore)
@@ -40,7 +40,7 @@ func (r *GenericStoreValidator) ValidateCreate(ctx context.Context, obj runtime.
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GenericStoreValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) error {
+func (r *GenericStoreValidator) ValidateUpdate(_ context.Context, _, newObj runtime.Object) error {
 	st, ok := newObj.(GenericStore)
 	if !ok {
 		return fmt.Errorf(errInvalidStore)
@@ -49,7 +49,7 @@ func (r *GenericStoreValidator) ValidateUpdate(ctx context.Context, oldObj, newO
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *GenericStoreValidator) ValidateDelete(ctx context.Context, obj runtime.Object) error {
+func (r *GenericStoreValidator) ValidateDelete(_ context.Context, _ runtime.Object) error {
 	return nil
 }
 

pkg/controllers/crds/crds_controller.go

@@ -200,10 +200,7 @@ func (r *Reconciler) updateCRD(ctx context.Context, req ctrl.Request) error {
 			return err
 		}
 	}
-	if err := r.Update(ctx, &updatedResource); err != nil {
-		return err
-	}
-	return nil
+	return r.Update(ctx, &updatedResource)
 }
 
 func injectService(crd *apiext.CustomResourceDefinition, svc types.NamespacedName) error {
@@ -344,10 +341,7 @@ func (r *Reconciler) refreshCerts(refreshCA bool, secret *corev1.Secret) error {
 	if err != nil {
 		return err
 	}
-	if err := r.writeSecret(cert, key, caArtifacts, secret); err != nil {
-		return err
-	}
-	return nil
+	return r.writeSecret(cert, key, caArtifacts, secret)
 }
 
 func buildArtifactsFromSecret(secret *corev1.Secret) (*KeyPairArtifacts, error) {

pkg/controllers/externalsecret/externalsecret_controller.go

@@ -331,10 +331,7 @@ func createOrUpdate(ctx context.Context, c client.Client, obj client.Object, f f
 			return err
 		}
 		// Setting Field Owner even for CreationPolicy==Create
-		if err := c.Create(ctx, obj, client.FieldOwner(fqdn)); err != nil {
-			return err
-		}
-		return nil
+		return c.Create(ctx, obj, client.FieldOwner(fqdn))
 	}
 
 	existing := obj.DeepCopyObject()
@@ -346,10 +343,7 @@ func createOrUpdate(ctx context.Context, c client.Client, obj client.Object, f f
 		return nil
 	}
 
-	if err := c.Update(ctx, obj, client.FieldOwner(fqdn)); err != nil {
-		return err
-	}
-	return nil
+	return c.Update(ctx, obj, client.FieldOwner(fqdn))
 }
 
 func patchSecret(ctx context.Context, c client.Client, scheme *runtime.Scheme, secret *v1.Secret, mutationFunc func() error, fieldOwner string) error {

pkg/controllers/externalsecret/externalsecret_controller_template.go

@@ -100,7 +100,7 @@ func (p *Parser) MergeSecret(ctx context.Context, namespace string, tpl esv1beta
 	return nil
 }
 
-func (p *Parser) MergeLiteral(ctx context.Context, tpl esv1beta1.TemplateFrom) error {
+func (p *Parser) MergeLiteral(_ context.Context, tpl esv1beta1.TemplateFrom) error {
 	if tpl.Literal == nil {
 		return nil
 	}

pkg/controllers/secretstore/client_manager_test.go

@@ -331,7 +331,7 @@ func (f *WrapProvider) Capabilities() esv1beta1.SecretStoreCapabilities {
 }
 
 // ValidateStore checks if the provided store is valid.
-func (f *WrapProvider) ValidateStore(store esv1beta1.GenericStore) error {
+func (f *WrapProvider) ValidateStore(_ esv1beta1.GenericStore) error {
 	return nil
 }
 
@@ -340,15 +340,15 @@ type MockFakeClient struct {
 	closeCalled bool
 }
 
-func (c *MockFakeClient) PushSecret(ctx context.Context, value []byte, remoteRef esv1beta1.PushRemoteRef) error {
+func (c *MockFakeClient) PushSecret(_ context.Context, _ []byte, _ esv1beta1.PushRemoteRef) error {
 	return nil
 }
 
-func (c *MockFakeClient) DeleteSecret(ctx context.Context, remoteRef esv1beta1.PushRemoteRef) error {
+func (c *MockFakeClient) DeleteSecret(_ context.Context, _ esv1beta1.PushRemoteRef) error {
 	return nil
 }
 
-func (c *MockFakeClient) GetSecret(ctx context.Context, ref esv1beta1.ExternalSecretDataRemoteRef) ([]byte, error) {
+func (c *MockFakeClient) GetSecret(_ context.Context, _ esv1beta1.ExternalSecretDataRemoteRef) ([]byte, error) {
 	return nil, nil
 }
 
@@ -357,16 +357,16 @@ func (c *MockFakeClient) Validate() (esv1beta1.ValidationResult, error) {
 }
 
 // GetSecretMap returns multiple k/v pairs from the provider.
-func (c *MockFakeClient) GetSecretMap(ctx context.Context, ref esv1beta1.ExternalSecretDataRemoteRef) (map[string][]byte, error) {
+func (c *MockFakeClient) GetSecretMap(_ context.Context, _ esv1beta1.ExternalSecretDataRemoteRef) (map[string][]byte, error) {
 	return nil, nil
 }
 
 // GetAllSecrets returns multiple k/v pairs from the provider.
-func (c *MockFakeClient) GetAllSecrets(ctx context.Context, ref esv1beta1.ExternalSecretFind) (map[string][]byte, error) {
+func (c *MockFakeClient) GetAllSecrets(_ context.Context, _ esv1beta1.ExternalSecretFind) (map[string][]byte, error) {
 	return nil, nil
 }
 
-func (c *MockFakeClient) Close(ctx context.Context) error {
+func (c *MockFakeClient) Close(_ context.Context) error {
 	c.closeCalled = true
 	return nil
 }

pkg/generator/acr/acr.go

@@ -162,7 +162,7 @@ func (g *Generator) generate(
 
 type accessTokenFetcher func(acrRefreshToken, tenantID, registryURL, scope string) (string, error)
 
-func fetchACRAccessToken(acrRefreshToken, tenantID, registryURL, scope string) (string, error) {
+func fetchACRAccessToken(acrRefreshToken, _, registryURL, scope string) (string, error) {
 	formData := url.Values{
 		"grant_type":    {"refresh_token"},
 		"service":       {registryURL},

pkg/generator/acr/acr_test.go

@@ -213,6 +213,6 @@ type FakeTokenGetter struct {
 	err   error
 }
 
-func (f *FakeTokenGetter) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
+func (f *FakeTokenGetter) GetToken(_ context.Context, _ policy.TokenRequestOptions) (azcore.AccessToken, error) {
 	return f.token, f.err
 }