Skip to content

Commit 76921d6

Browse files
briandealwisbriandealwis
committed
only apply -Djib.console=plain to project builds
1 parent 63bcff2 commit 76921d6

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎pkg/skaffold/jib/jib_gradle.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,27 @@ func GetDependenciesGradle(ctx context.Context, workspace string, a *latest.JibG
4242
}
4343

4444
func getCommandGradle(ctx context.Context, workspace string, a *latest.JibGradleArtifact) *exec.Cmd {
45-
args := append(gradleCommand(a, "_jibSkaffoldFiles"), "-q")
45+
args := []string{gradleCommand(a, "_jibSkaffoldFiles"), "-q"}
4646
return GradleCommand.CreateCommand(ctx, workspace, args)
4747
}
4848

4949
// GenerateGradleArgs generates the arguments to Gradle for building the project as an image.
5050
func GenerateGradleArgs(task string, imageName string, a *latest.JibGradleArtifact, skipTests bool) []string {
51-
args := append(gradleCommand(a, task), "--image="+imageName)
51+
// disable jib's rich progress footer; we could use `--console=plain`
52+
// but it also disables colour which can be helpful
53+
args := []string{"-Djib.console=plain", gradleCommand(a, task), "--image=" + imageName}
5254
if skipTests {
5355
args = append(args, "-x", "test")
5456
}
5557
args = append(args, a.Flags...)
5658
return args
5759
}
5860

59-
func gradleCommand(a *latest.JibGradleArtifact, task string) []string {
60-
// disable jib's rich progress footer; we could use `--console=plain`
61-
// but it also disables colour which can be helpful
62-
args := []string{"-Djib.console=plain"}
61+
func gradleCommand(a *latest.JibGradleArtifact, task string) string {
6362
if a.Project == "" {
64-
return append(args, ":"+task)
63+
return ":" + task
6564
}
6665

6766
// multi-module
68-
return append(args, fmt.Sprintf(":%s:%s", a.Project, task))
67+
return fmt.Sprintf(":%s:%s", a.Project, task)
6968
}

‎pkg/skaffold/jib/jib_gradle_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,31 +97,31 @@ func TestGetCommandGradle(t *testing.T) {
9797
jibGradleArtifact: latest.JibGradleArtifact{},
9898
filesInWorkspace: []string{},
9999
expectedCmd: func(workspace string) *exec.Cmd {
100-
return GradleCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", ":_jibSkaffoldFiles", "-q"})
100+
return GradleCommand.CreateCommand(ctx, workspace, []string{":_jibSkaffoldFiles", "-q"})
101101
},
102102
},
103103
{
104104
description: "gradle default with project",
105105
jibGradleArtifact: latest.JibGradleArtifact{Project: "project"},
106106
filesInWorkspace: []string{},
107107
expectedCmd: func(workspace string) *exec.Cmd {
108-
return GradleCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", ":project:_jibSkaffoldFiles", "-q"})
108+
return GradleCommand.CreateCommand(ctx, workspace, []string{":project:_jibSkaffoldFiles", "-q"})
109109
},
110110
},
111111
{
112112
description: "gradle with wrapper",
113113
jibGradleArtifact: latest.JibGradleArtifact{},
114114
filesInWorkspace: []string{"gradlew", "gradlew.cmd"},
115115
expectedCmd: func(workspace string) *exec.Cmd {
116-
return GradleCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", ":_jibSkaffoldFiles", "-q"})
116+
return GradleCommand.CreateCommand(ctx, workspace, []string{":_jibSkaffoldFiles", "-q"})
117117
},
118118
},
119119
{
120120
description: "gradle with wrapper and project",
121121
jibGradleArtifact: latest.JibGradleArtifact{Project: "project"},
122122
filesInWorkspace: []string{"gradlew", "gradlew.cmd"},
123123
expectedCmd: func(workspace string) *exec.Cmd {
124-
return GradleCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", ":project:_jibSkaffoldFiles", "-q"})
124+
return GradleCommand.CreateCommand(ctx, workspace, []string{":project:_jibSkaffoldFiles", "-q"})
125125
},
126126
},
127127
}

‎pkg/skaffold/jib/jib_maven.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ func getCommandMaven(ctx context.Context, workspace string, a *latest.JibMavenAr
4848

4949
// GenerateMavenArgs generates the arguments to Maven for building the project as an image.
5050
func GenerateMavenArgs(goal string, imageName string, a *latest.JibMavenArtifact, skipTests bool) []string {
51-
args := mavenArgs(a)
51+
// disable jib's rich progress footer on builds; we could use --batch-mode
52+
// but it also disables colour which can be helpful
53+
args := []string{"-Djib.console=plain"}
54+
args = append(args, mavenArgs(a)...)
5255

5356
if skipTests {
5457
args = append(args, "-DskipTests=true")
@@ -68,9 +71,7 @@ func GenerateMavenArgs(goal string, imageName string, a *latest.JibMavenArtifact
6871
}
6972

7073
func mavenArgs(a *latest.JibMavenArtifact) []string {
71-
// disable jib's rich progress footer; we could use --batch-mode
72-
// but it also disables colour which can be helpful
73-
args := []string{"-Djib.console=plain"}
74+
var args []string
7475

7576
args = append(args, a.Flags...)
7677

‎pkg/skaffold/jib/jib_maven_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func TestGetCommandMaven(t *testing.T) {
9696
jibMavenArtifact: latest.JibMavenArtifact{},
9797
filesInWorkspace: []string{},
9898
expectedCmd: func(workspace string) *exec.Cmd {
99-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--non-recursive", "jib:_skaffold-files", "--quiet"})
99+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--non-recursive", "jib:_skaffold-files", "--quiet"})
100100
},
101101
},
102102
{
@@ -106,47 +106,47 @@ func TestGetCommandMaven(t *testing.T) {
106106
},
107107
filesInWorkspace: []string{},
108108
expectedCmd: func(workspace string) *exec.Cmd {
109-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "-DskipTests", "-x", "--non-recursive", "jib:_skaffold-files", "--quiet"})
109+
return MavenCommand.CreateCommand(ctx, workspace, []string{"-DskipTests", "-x", "--non-recursive", "jib:_skaffold-files", "--quiet"})
110110
},
111111
},
112112
{
113113
description: "maven with profile",
114114
jibMavenArtifact: latest.JibMavenArtifact{Profile: "profile"},
115115
filesInWorkspace: []string{},
116116
expectedCmd: func(workspace string) *exec.Cmd {
117-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files", "--quiet"})
117+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files", "--quiet"})
118118
},
119119
},
120120
{
121121
description: "maven with wrapper no profile",
122122
jibMavenArtifact: latest.JibMavenArtifact{},
123123
filesInWorkspace: []string{"mvnw", "mvnw.bat"},
124124
expectedCmd: func(workspace string) *exec.Cmd {
125-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--non-recursive", "jib:_skaffold-files", "--quiet"})
125+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--non-recursive", "jib:_skaffold-files", "--quiet"})
126126
},
127127
},
128128
{
129129
description: "maven with wrapper no profile",
130130
jibMavenArtifact: latest.JibMavenArtifact{},
131131
filesInWorkspace: []string{"mvnw", "mvnw.cmd"},
132132
expectedCmd: func(workspace string) *exec.Cmd {
133-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--non-recursive", "jib:_skaffold-files", "--quiet"})
133+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--non-recursive", "jib:_skaffold-files", "--quiet"})
134134
},
135135
},
136136
{
137137
description: "maven with wrapper and profile",
138138
jibMavenArtifact: latest.JibMavenArtifact{Profile: "profile"},
139139
filesInWorkspace: []string{"mvnw", "mvnw.bat"},
140140
expectedCmd: func(workspace string) *exec.Cmd {
141-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files", "--quiet"})
141+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files", "--quiet"})
142142
},
143143
},
144144
{
145145
description: "maven with multi-modules",
146146
jibMavenArtifact: latest.JibMavenArtifact{Module: "module"},
147147
filesInWorkspace: []string{"mvnw", "mvnw.bat"},
148148
expectedCmd: func(workspace string) *exec.Cmd {
149-
return MavenCommand.CreateCommand(ctx, workspace, []string{"-Djib.console=plain", "--projects", "module", "--also-make", "jib:_skaffold-files", "--quiet"})
149+
return MavenCommand.CreateCommand(ctx, workspace, []string{"--projects", "module", "--also-make", "jib:_skaffold-files", "--quiet"})
150150
},
151151
},
152152
}

0 commit comments

Comments
 (0)