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

Remove temporary dir as well (#563) 

Fixes #540

Signed-off-by: Quan TRAN <account@itscaro.me>
Signed-off-by: yxxhero <aiopsclub@163.com>
Co-authored-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
Quan TRAN 2022-12-14 00:33:07 +01:00 committed by GitHub
parent a93035a3e5
commit 7860ac988a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/state/state.go
View File

@ -2763,13 +2763,34 @@ func (st *HelmState) ExpandedHelmfiles() ([]SubHelmfileSpec, error) {
}
func (st *HelmState) removeFiles(files []string) {
dirsToClean := map[string]int{}
for _, f := range files {
dirsToClean[filepath.Dir(f)] = 1
if err := st.fs.DeleteFile(f); err != nil {
st.logger.Warnf("Removing %s: %v", err)
st.logger.Warnf("Removing %s: %v", f, err)
} else {
st.logger.Debugf("Removed %s", f)
}
}
for d := range dirsToClean {
// check if the directory is empty
des, err := st.fs.ReadDir(d)
if err != nil {
st.logger.Warnf("Reading dir %s: %v", d, err)
continue
}
if len(des) > 0 {
st.logger.Debugf("Not removing %s because it's not empty", d)
continue
}
if err := st.fs.DeleteFile(d); err != nil {
st.logger.Warnf("Removing %s: %v", d, err)
} else {
st.logger.Debugf("Removed %s", d)
}
}
}
func (st *HelmState) generateTemporaryReleaseValuesFiles(release *ReleaseSpec, values []interface{}, missingFileHandler *string) ([]string, error) {

1
test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml vendored
View File

@ -109,4 +109,5 @@ data:
foo: FOO
Removed /tmp/helmfile/foo-values-649697bc75
Removed /tmp/helmfile
changing working directory back to "/home/runner/work/helmfile/helmfile/test/e2e/template/helmfile"