public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: use helm secrets view rather than helm secrets dec to decrypt 

Signed-off-by: Adam Gardner <adam.gardner@magicmemories.com>

chore: fix test case broken by change of helm subcommand

Signed-off-by: Adam Gardner <adam.gardner@magicmemories.com>
This commit is contained in:
Adam Gardner 2022-06-29 15:31:07 -10:00
parent a5b7c2b08d
commit 74c1f9e9a0
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/helmexec/exec.go
View File

@ -281,38 +281,14 @@ func (helm *execer) DecryptSecret(context HelmContext, name string, flags ...str
helm.logger.Infof("Decrypting secret %v", absPath) helm.logger.Infof("Decrypting secret %v", absPath)
preArgs := context.GetTillerlessArgs(helm) preArgs := context.GetTillerlessArgs(helm)
env := context.getTillerlessEnv() env := context.getTillerlessEnv()
out, err := helm.exec(append(append(preArgs, "secrets", "dec", absPath), flags...), env) secretBytes, err := helm.exec(append(append(preArgs, "secrets", "view", absPath), flags...), env)
helm.info(out)
if err != nil { if err != nil {
secret.err = err secret.err = err
return "", err return "", err
} }
// HELM_SECRETS_DEC_SUFFIX is used by the helm-secrets plugin to define the output file
decSuffix := os.Getenv("HELM_SECRETS_DEC_SUFFIX")
if len(decSuffix) == 0 {
decSuffix = ".yaml.dec"
}
// helm secrets replaces the extension with its suffix ONLY when the extension is ".yaml"
var decFilename string
if strings.HasSuffix(absPath, ".yaml") {
decFilename = strings.Replace(absPath, ".yaml", decSuffix, 1)
} else {
decFilename = absPath + decSuffix
}
secretBytes, err := os.ReadFile(decFilename)
if err != nil {
secret.err = err
return "", err
}
secret.bytes = secretBytes secret.bytes = secretBytes
if err := os.Remove(decFilename); err != nil {
return "", err
}
} else { } else {
// Cache hit // Cache hit
helm.logger.Debugf("Found secret in cache %v", absPath) helm.logger.Debugf("Found secret in cache %v", absPath)

2
pkg/helmexec/exec_test.go
View File

@ -376,7 +376,7 @@ func Test_DecryptSecret(t *testing.T) {
expected := fmt.Sprintf(`Preparing to decrypt secret %v/secretName expected := fmt.Sprintf(`Preparing to decrypt secret %v/secretName
Decrypting secret %s/secretName Decrypting secret %s/secretName
exec: helm --kube-context dev secrets dec %s/secretName exec: helm --kube-context dev secrets view %s/secretName
Preparing to decrypt secret %s/secretName Preparing to decrypt secret %s/secretName
Found secret in cache %s/secretName Found secret in cache %s/secretName
`, cwd, cwd, cwd, cwd, cwd) `, cwd, cwd, cwd, cwd, cwd)