Rename mavenArgs/gradleArgs to args (#1565)

Signed-off-by: Cornelius Weig <[email protected]>

Author: Cornelius Weig

examples/annotated-skaffold.yaml

@@ -76,14 +76,14 @@ build:
     # jibMaven:
     #  module: modulename     # selects which maven module to build, for a multimodule project
     #  profile: profilename   # selects which maven profile to activate
-    #  mavenArgs:             # additional arguments to pass to maven
+    #  args:             # additional arguments to pass to maven
     #  - "arg1"
     #  - "arg2"
 
     # jibGradle builds containers using the Jib plugin for Gradle.
     # jibGradle:
     #  project: projectname   # selects which gradle project to build
-    #  gradleArgs:            # additional arguments to pass to gradle
+    #  args:            # additional arguments to pass to gradle
     #  - "arg1"
     #  - "arg2"
 

integration/examples/annotated-skaffold.yaml

@@ -73,14 +73,14 @@ build:
     # jibMaven:
     #  module: modulename     # selects which maven module to build, for a multimodule project
     #  profile: profilename   # selects which maven profile to activate
-    #  mavenArgs:             # additional arguments to pass to maven
+    #  args:             # additional arguments to pass to maven
     #  - "arg1"
     #  - "arg2"
 
     # jibGradle builds containers using the Jib plugin for Gradle.
     # jibGradle:
     #  project: projectname   # selects which gradle project to build
-    #  gradleArgs:            # additional arguments to pass to gradle
+    #  args:            # additional arguments to pass to gradle
     #  - "arg1"
     #  - "arg2"
 

pkg/skaffold/jib/jib_gradle.go

@@ -52,7 +52,7 @@ func GenerateGradleArgs(task string, imageName string, a *latest.JibGradleArtifa
 	if skipTests {
 		args = append(args, "-x", "test")
 	}
-	args = append(args, a.Flags...)
+	args = append(args, a.BuildArgs...)
 	return args
 }
 

pkg/skaffold/jib/jib_gradle_test.go

@@ -151,7 +151,7 @@ func TestGenerateGradleArgs(t *testing.T) {
 		out       []string
 	}{
 		{latest.JibGradleArtifact{}, false, []string{":task", "--image=image"}},
-		{latest.JibGradleArtifact{Flags: []string{"-extra", "args"}}, false, []string{":task", "--image=image", "-extra", "args"}},
+		{latest.JibGradleArtifact{BuildArgs: []string{"-extra", "args"}}, false, []string{":task", "--image=image", "-extra", "args"}},
 		{latest.JibGradleArtifact{}, true, []string{":task", "--image=image", "-x", "test"}},
 		{latest.JibGradleArtifact{Project: "project"}, false, []string{":project:task", "--image=image"}},
 		{latest.JibGradleArtifact{Project: "project"}, true, []string{":project:task", "--image=image", "-x", "test"}},

pkg/skaffold/jib/jib_maven.go

@@ -70,7 +70,7 @@ func GenerateMavenArgs(goal string, imageName string, a *latest.JibMavenArtifact
 func mavenArgs(a *latest.JibMavenArtifact) []string {
 	var args []string
 
-	args = append(args, a.Flags...)
+	args = append(args, a.BuildArgs...)
 
 	if a.Profile != "" {
 		args = append(args, "--activate-profiles", a.Profile)

pkg/skaffold/jib/jib_maven_test.go

@@ -102,7 +102,7 @@ func TestGetCommandMaven(t *testing.T) {
 		{
 			description: "maven with extra flags",
 			jibMavenArtifact: latest.JibMavenArtifact{
-				Flags: []string{"-DskipTests", "-x"},
+				BuildArgs: []string{"-DskipTests", "-x"},
 			},
 			filesInWorkspace: []string{},
 			expectedCmd: func(workspace string) *exec.Cmd {

pkg/skaffold/schema/latest/config.go

@@ -506,7 +506,7 @@ type JibMavenArtifact struct {
 	Profile string `yaml:"profile"`
 
 	// Flags is passed as additional build flags to maven
-	Flags []string `yaml:"mavenArgs,omitempty"`
+	BuildArgs []string `yaml:"args,omitempty"`
 }
 
 // JibGradleArtifact builds containers using the Jib plugin for Gradle.
@@ -515,5 +515,5 @@ type JibGradleArtifact struct {
 	Project string `yaml:"project"`
 
 	// Flags is passed as additional build flags to gradle
-	Flags []string `yaml:"gradleArgs,omitempty"`
+	BuildArgs []string `yaml:"args,omitempty"`
 }