mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-15 17:51:01 +00:00
Code Activity

Moving duplication validation logic to utils method

Browse source 
Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
This commit is contained in:
Gustavo Carvalho 2022-03-09 13:49:17 -03:00
parent 10c3ba355d
commit 8be3cd5a72
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/provider/vault/vault.go
View file

@ -276,9 +276,6 @@ func (v *client) findSecretsFromTags(ctx context.Context, candidates []string, t
if removeFromName != "" { if removeFromName != "" {
name = strings.TrimPrefix(name, removeFromName) name = strings.TrimPrefix(name, removeFromName)
} }
if _, exists := secrets[name]; exists {
return nil, fmt.Errorf(errDuplicateSecret, name)
}
secrets[name] = secret secrets[name] = secret
} }
} }
@ -300,9 +297,6 @@ func (v *client) findSecretsFromName(ctx context.Context, candidates []string, r
if removeFromName != "" { if removeFromName != "" {
name = strings.TrimPrefix(name, removeFromName) name = strings.TrimPrefix(name, removeFromName)
} }
if _, exists := secrets[name]; exists {
return nil, fmt.Errorf(errDuplicateSecret, name)
}
secrets[name] = secret secrets[name] = secret
} }
} }

6
pkg/utils/utils.go
View file

@ -60,7 +60,11 @@ func ConvertKeys(strategy esv1beta1.ExternalSecretConversionStrategy, in map[str
newName[rk] = string(rv) newName[rk] = string(rv)
} }
} }
out[strings.Join(newName, "")] = v key := strings.Join(newName, "")
if _, exists := out[key]; exists {
return nil, fmt.Errorf("secret name collision during conversion: %s", key)
}
out[key] = v
} }
return out, nil return out, nil
} }