jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-03 15:02:35 +02:00
Code Issues Releases Activity

fix(dockerOptions) allow proper usage of empty values (#3025)

Browse Source 
This follows up on #3024
Setting emptyValue to s.th. like `--entrypoint=''` will break in case the argument is properly escaped.

Docker will return with
`container process caused: exec: "''": executable file not found in $PATH`
This commit is contained in:
Oliver Nocon 2021-08-02 14:57:37 +02:00 committed by GitHub
parent 4aa59dbdcb
commit 6f32b437be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/stepmeta.go
View File

@ -437,7 +437,7 @@ func OptionsAsStringSlice(options []Option) []string {
if len(v.Value) != 0 {
e = append(e, fmt.Sprintf("%v %v", v.Name, v.Value))
} else {
e = append(e, fmt.Sprintf("%v=''", v.Name))
e = append(e, fmt.Sprintf("%v=", v.Name))
}
}

4
pkg/config/stepmeta_test.go
View File

@ -557,7 +557,7 @@ func TestGetContextDefaults(t *testing.T) {
var d PipelineDefaults
d.ReadPipelineDefaults([]io.ReadCloser{cd})
assert.Equal(t, []interface{}{"entrypoint=''"}, d.Defaults[0].Steps["testStep"]["dockerOptions"])
assert.Equal(t, []interface{}{"entrypoint="}, d.Defaults[0].Steps["testStep"]["dockerOptions"])
})
t.Run("Negative case", func(t *testing.T) {
@ -730,7 +730,7 @@ func TestOptionsAsStringSlice(t *testing.T) {
{options: []Option{}, expected: []string{}},
{options: []Option{{Name: "name1", Value: "value1"}}, expected: []string{"name1 value1"}},
{options: []Option{{Name: "name1", Value: "value1"}, {Name: "name2", Value: "value2"}}, expected: []string{"name1 value1", "name2 value2"}},
{options: []Option{{Name: "empty", Value: ""}}, expected: []string{"empty=''"}},
{options: []Option{{Name: "empty", Value: ""}}, expected: []string{"empty="}},
}
for _, test := range tt {