fix: follow up for the relative paths improvement (#262)

Fixes for the bugs that are introduced by #261, that is values.yaml files specified in `values:` have redundant base path in their prefixes, and remaining .dec files after secrets decryption(https://github.com/roboll/helmfile/issues/251#issuecomment-417285854)
This commit is contained in:
KUOKA Yusuke
2018-08-30 21:59:59 +09:00
committed by GitHub
parent 421299c883
commit bb3b44e511
4 changed files with 17 additions and 9 deletions
+10 -1
View File
@@ -120,7 +120,8 @@ func (helm *execer) DecryptSecret(name string) (string, error) {
// os.Rename seems to results in "cross-device link` errors in some cases
// Instead of moving, copy it to the destination temp file as a work-around
// See https://github.com/roboll/helmfile/issues/251#issuecomment-417166296f
decFile, err := os.Open(name + ".dec")
decFilename := name + ".dec"
decFile, err := os.Open(decFilename)
if err != nil {
return "", err
}
@@ -131,6 +132,14 @@ func (helm *execer) DecryptSecret(name string) (string, error) {
return "", err
}
if err := decFile.Close(); err != nil {
return "", err
}
if err := os.Remove(decFilename); err != nil {
return "", err
}
return tmpFile.Name(), err
}