public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Environment replacement

This commit is contained in:
Priya Wadhwa 2018-03-21 13:37:00 -07:00
parent cf24231121
commit f56b3e9542
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/util/command_util.go
View File

@ -38,9 +38,24 @@ func ResolveEnvironmentReplacement(command, value string, envs []string) (string
return "", err
}
shlex := shell.NewLex(p.EscapeToken)
processedWord, err := shlex.ProcessWord(value, envs)
return shlex.ProcessWord(value, envs)
}
// ResolveFilepathEnvironmentReplacement replaces env variables in filepaths
// and returns a cleaned version of the path
func ResolveFilepathEnvironmentReplacement(command, value string, envs []string) (string, error) {
p, err := parser.Parse(bytes.NewReader([]byte(command)))
if err != nil {
return "", err
}
return filepath.Clean(processedWord), nil
shlex := shell.NewLex(p.EscapeToken)
fp, err := shlex.ProcessWord(value, envs)
if err != nil {
return "", err
}
fp = filepath.Clean(fp)
if filepath.IsAbs(value) {
fp = filepath.Join(fp, "/")
}
return fp, nil
}