jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-28 05:47:08 +02:00
Code Issues Releases Activity

Dont dedup mvn flags (#1479)

Browse Source
This commit is contained in:
Florian Wilhelm 2020-04-28 20:38:36 +02:00 committed by GitHub
parent 60e06a864c
commit 7bbdaf783c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/mavenExecute.go
View File

@ -24,9 +24,9 @@ func runMavenExecute(config mavenExecuteOptions, runner execRunner) error {
ProjectSettingsFile: config.ProjectSettingsFile,
GlobalSettingsFile: config.GlobalSettingsFile,
M2Path: config.M2Path,
Goals: splitTrimAndDeDupParams(config.Goals),
Defines: splitTrimAndDeDupParams(config.Defines),
Flags: splitTrimAndDeDupParams(config.Flags),
Goals: splitAndTrimParams(config.Goals),
Defines: splitAndTrimParams(config.Defines),
Flags: splitAndTrimParams(config.Flags),
LogSuccessfulMavenTransfers: config.LogSuccessfulMavenTransfers,
ReturnStdout: config.ReturnStdout,
}
@ -38,6 +38,8 @@ func runMavenExecute(config mavenExecuteOptions, runner execRunner) error {
return err
}
func splitTrimAndDeDupParams(params []string) []string {
return sliceUtils.SplitTrimAndDeDup(params, " ")
// We *must not* deduplicate the parameters here as this will break commands such as `mvn -pl a -pl b`,
// which would become `mvn -pl a b` which is invalid
func splitAndTrimParams(params []string) []string {
return sliceUtils.SplitAndTrim(params, " ")
}

8
pkg/piperutils/slices.go
View File

@ -54,9 +54,9 @@ func Trim(in []string) (out []string) {
return
}
// SplitTrimAndDeDup iterates over the strings in the given slice and splits each on the provided separator.
// Each resulting sub-string is then a separate entry in the returned array. Duplicate and empty entries are eliminated.
func SplitTrimAndDeDup(in []string, separator string) (out []string) {
// SplitAndTrim iterates over the strings in the given slice and splits each on the provided separator.
// Each resulting sub-string is then a separate entry in the returned array.
func SplitAndTrim(in []string, separator string) (out []string) {
if len(in) == 0 {
return in
}
@ -64,7 +64,7 @@ func SplitTrimAndDeDup(in []string, separator string) (out []string) {
entryParts := strings.Split(entry, separator)
for _, part := range entryParts {
part = strings.TrimSpace(part)
if part != "" && !ContainsString(out, part) {
if part != "" {
out = append(out, part)
}
}

16
pkg/piperutils/slices_test.go
View File

@ -69,33 +69,33 @@ func TestSplitTrimAndDeDup(t *testing.T) {
// init
s := []string{" a", "", "-a-b --c ", "d-e", "f", " f", ""}
// test
s = SplitTrimAndDeDup(s, "-")
s = SplitAndTrim(s, "-")
// assert
assert.Equal(t, []string{"a", "b", "c", "d", "e", "f"}, s)
assert.Equal(t, []string{"a", "a", "b", "c", "d", "e", "f", "f"}, s)
})
t.Run("Separator is space", func(t *testing.T) {
// init
s := []string{" a", " a b c ", "d e", "f", "f ", ""}
// test
s = SplitTrimAndDeDup(s, " ")
s = SplitAndTrim(s, " ")
// assert
assert.Equal(t, []string{"a", "b", "c", "d", "e", "f"}, s)
assert.Equal(t, []string{"a", "a", "b", "c", "d", "e", "f", "f"}, s)
})
t.Run("Separator is multi-char", func(t *testing.T) {
// init
s := []string{" a", " a** b**c ", "**d **e", "f**", "f ", ""}
// test
s = SplitTrimAndDeDup(s, "**")
s = SplitAndTrim(s, "**")
// assert
assert.Equal(t, []string{"a", "b", "c", "d", "e", "f"}, s)
assert.Equal(t, []string{"a", "a", "b", "c", "d", "e", "f", "f"}, s)
})
t.Run("Separator is empty string", func(t *testing.T) {
// init
s := []string{" a", " a bc ", "d e", "f", "f ", ""}
// test
s = SplitTrimAndDeDup(s, "")
s = SplitAndTrim(s, "")
// assert
// If "sep" is empty, underlying strings.Split() splits after each UTF-8 char sequence.
assert.Equal(t, []string{"a", "b", "c", "d", "e", "f"}, s)
assert.Equal(t, []string{"a", "a", "b", "c", "d", "e", "f", "f"}, s)
})
}