chore: update create config function

plugins/providers/gcs/config.go

@@ -30,30 +30,11 @@ const (
 
 type Config struct {
 	ProviderConfig *domain.ProviderConfig
-	valid          bool
 
 	crypto    domain.Crypto
 	validator *validator.Validate
 }
 
-func (c *Config) EncryptCredentials() error {
-	if err := c.parseAndValidate(); err != nil {
-		return err
-	}
-
-	credentials, ok := c.ProviderConfig.Credentials.(*Credentials)
-	if !ok {
-		return ErrInvalidCredentialsType
-	}
-
-	if err := credentials.Encrypt(c.crypto); err != nil {
-		return err
-	}
-
-	c.ProviderConfig.Credentials = credentials
-	return nil
-}
-
 type Credentials struct {
 	ServiceAccountKey string `json:"service_account_key" mapstructure:"service_account_key" validate:"required,base64"`
 	ResourceName      string `json:"resource_name" mapstructure:"resource_name" validate:"required"`
@@ -97,14 +78,7 @@ func NewConfig(pc *domain.ProviderConfig, crypto domain.Crypto) *Config {
 	}
 }
 
-func (c *Config) ParseAndValidate() error {
-	return c.parseAndValidate()
-}
-
 func (c *Config) parseAndValidate() error {
-	if c.valid {
-		return nil
-	}
 
 	validationError := []error{}
 
@@ -129,7 +103,6 @@ func (c *Config) parseAndValidate() error {
 		return errors.New(strings.Join(errorStrings, "\n"))
 	}
 
-	c.valid = true
 	return nil
 }
 

plugins/providers/gcs/provider.go

@@ -36,11 +36,21 @@ func NewProvider(typeName string, crypto Crypto) *Provider {
 func (p *Provider) CreateConfig(pc *domain.ProviderConfig) error {
 	c := NewConfig(pc, p.crypto)
 
-	if err := c.ParseAndValidate(); err != nil {
+	if err := c.parseAndValidate(); err != nil {
 		return err
 	}
 
-	return c.EncryptCredentials()
+	credentials, ok := c.ProviderConfig.Credentials.(*Credentials)
+	if !ok {
+		return ErrInvalidCredentialsType
+	}
+
+	if err := credentials.Encrypt(c.crypto); err != nil {
+		return fmt.Errorf("encrypting creds: %w", err)
+	}
+
+	c.ProviderConfig.Credentials = credentials
+	return nil
 }
 
 func (p *Provider) GetResources(pc *domain.ProviderConfig) ([]*domain.Resource, error) {

plugins/providers/gcs/provider_test.go

@@ -114,7 +114,7 @@ func TestCreateConfig(t *testing.T) {
 		crypto.On("Encrypt", `{"type":"service_account"}`).Return("", expectedError)
 		actualError := p.CreateConfig(pc)
 
-		assert.Equal(t, expectedError, actualError)
+		assert.ErrorIs(t, actualError, expectedError)
 	})
 
 	t.Run("should make the provider config, parse and validate the credentials and permissions and return nil error on success", func(t *testing.T) {