codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use secretId to match secret names in configs

Browse Source
This commit is contained in:
decentral1se
2023-09-25 15:51:15 +02:00
parent 776a83d8d1
commit d5b18d74ef
2 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/secret/secret.go
View File

@ -87,22 +87,19 @@ func ReadSecretsConfig(appEnv map[string]string, composeFiles []string, recipeNa
return secretConfigs, nil
}
for _, secret := range config.Secrets {
firstIdx := strings.Index(secret.Name, "_")
lastIdx := strings.LastIndex(secret.Name, "_")
secretName := secret.Name[firstIdx+1 : lastIdx]
if secret.Name != "" && string(secret.Name[len(secret.Name)-1]) == "_" {
return secretConfigs, fmt.Errorf("missing version for secret? (%s)", secretName)
for secretId, secretConfig := range config.Secrets {
if string(secretConfig.Name[len(secretConfig.Name)-1]) == "_" {
return secretConfigs, fmt.Errorf("missing version for secret? (%s)", secretId)
}
if !(slices.Contains(enabledSecrets, secretName)) {
logrus.Debugf("%s not enabled in recipe config, not generating", secretName)
if !(slices.Contains(enabledSecrets, secretId)) {
logrus.Warnf("%s not enabled in recipe config, not generating", secretId)
continue
}
secretVersion := secret.Name[lastIdx+1:]
secretConfigs[secretName] = secretVersion
lastIdx := strings.LastIndex(secretConfig.Name, "_")
secretVersion := secretConfig.Name[lastIdx+1:]
secretConfigs[secretId] = secretVersion
}
return secretConfigs, nil