kill jib profile and rewrite as flags

GoogleContainerTools · Sep 5, 2019 · 50bf6e0 · 50bf6e0
1 parent 0504be7
commit 50bf6e0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 54 deletions.
diff --git a/docs/content/en/schemas/v1beta14.json b/docs/content/en/schemas/v1beta14.json
@@ -1208,11 +1208,6 @@
             "[\"--no-build-cache\"]"
           ]
         },
-        "profile": {
-          "type": "string",
-          "description": "selects which Maven profile to activate *(Maven-only)*.",
-          "x-intellij-html-description": "selects which Maven profile to activate <em>(Maven-only)</em>."
-        },
         "project": {
           "type": "string",
           "description": "selects which sub-project to build for multi-module builds.",
@@ -1221,7 +1216,6 @@
       },
       "preferredOrder": [
         "project",
-        "profile",
         "args"
       ],
       "additionalProperties": false,

diff --git a/pkg/skaffold/build/local/jib_maven_test.go b/pkg/skaffold/build/local/jib_maven_test.go
@@ -59,13 +59,6 @@ func TestBuildJibMavenToDocker(t *testing.T) {
 				"mvn -Djib.console=plain jib:_skaffold-fail-if-jib-out-of-date -Djib.requiredVersion=" + jib.MinimumJibMavenVersion + " --projects module --also-make package jib:dockerBuild -Djib.containerize=module -Dimage=img:tag",
 			),
 		},
-		{
-			description: "build with module and profile",
-			artifact:    &latest.JibArtifact{Project: "module", Profile: "profile"},
-			commands: testutil.CmdRun(
-				"mvn -Djib.console=plain jib:_skaffold-fail-if-jib-out-of-date -Djib.requiredVersion=" + jib.MinimumJibMavenVersion + " --activate-profiles profile --projects module --also-make package jib:dockerBuild -Djib.containerize=module -Dimage=img:tag",
-			),
-		},
 		{
 			description: "fail build",
 			artifact:    &latest.JibArtifact{},
@@ -132,13 +125,6 @@ func TestBuildJibMavenToRegistry(t *testing.T) {
 				"mvn -Djib.console=plain jib:_skaffold-fail-if-jib-out-of-date -Djib.requiredVersion=" + jib.MinimumJibMavenVersion + " --projects module --also-make package jib:build -Djib.containerize=module -Dimage=img:tag",
 			),
 		},
-		{
-			description: "build with module and profile",
-			artifact:    &latest.JibArtifact{Project: "module", Profile: "profile"},
-			commands: testutil.CmdRun(
-				"mvn -Djib.console=plain jib:_skaffold-fail-if-jib-out-of-date -Djib.requiredVersion=" + jib.MinimumJibMavenVersion + " --activate-profiles profile --projects module --also-make package jib:build -Djib.containerize=module -Dimage=img:tag",
-			),
-		},
 		{
 			description: "fail build",
 			artifact:    &latest.JibArtifact{},

diff --git a/pkg/skaffold/jib/jib_maven.go b/pkg/skaffold/jib/jib_maven.go
@@ -82,10 +82,6 @@ func mavenArgs(a *latest.JibArtifact) []string {
 	args := []string{"jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion}
 	args = append(args, a.Flags...)
 
-	if a.Profile != "" {
-		args = append(args, "--activate-profiles", a.Profile)
-	}
-
 	if a.Project == "" {
 		// single-module project
 		args = append(args, "--non-recursive")

diff --git a/pkg/skaffold/jib/jib_maven_test.go b/pkg/skaffold/jib/jib_maven_test.go
@@ -114,7 +114,7 @@ func TestGetCommandMaven(t *testing.T) {
 		expectedCmd      func(workspace string) exec.Cmd
 	}{
 		{
-			description:      "maven no profile",
+			description:      "maven basic",
 			jibArtifact:      latest.JibArtifact{},
 			filesInWorkspace: []string{},
 			expectedCmd: func(workspace string) exec.Cmd {
@@ -132,37 +132,21 @@ func TestGetCommandMaven(t *testing.T) {
 			},
 		},
 		{
-			description:      "maven with profile",
-			jibArtifact:      latest.JibArtifact{Profile: "profile"},
-			filesInWorkspace: []string{},
-			expectedCmd: func(workspace string) exec.Cmd {
-				return MavenCommand.CreateCommand(ctx, workspace, []string{"jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files-v2", "--quiet"})
-			},
-		},
-		{
-			description:      "maven with wrapper no profile",
+			description:      "maven with wrapper",
 			jibArtifact:      latest.JibArtifact{},
 			filesInWorkspace: []string{"mvnw", "mvnw.bat"},
 			expectedCmd: func(workspace string) exec.Cmd {
 				return MavenCommand.CreateCommand(ctx, workspace, []string{"jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--non-recursive", "jib:_skaffold-files-v2", "--quiet"})
 			},
 		},
 		{
-			description:      "maven with wrapper no profile",
+			description:      "maven with wrapper",
 			jibArtifact:      latest.JibArtifact{},
 			filesInWorkspace: []string{"mvnw", "mvnw.cmd"},
 			expectedCmd: func(workspace string) exec.Cmd {
 				return MavenCommand.CreateCommand(ctx, workspace, []string{"jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--non-recursive", "jib:_skaffold-files-v2", "--quiet"})
 			},
 		},
-		{
-			description:      "maven with wrapper and profile",
-			jibArtifact:      latest.JibArtifact{Profile: "profile"},
-			filesInWorkspace: []string{"mvnw", "mvnw.bat"},
-			expectedCmd: func(workspace string) exec.Cmd {
-				return MavenCommand.CreateCommand(ctx, workspace, []string{"jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--non-recursive", "jib:_skaffold-files-v2", "--quiet"})
-			},
-		},
 		{
 			description:      "maven with multi-modules",
 			jibArtifact:      latest.JibArtifact{Project: "module"},
@@ -197,13 +181,9 @@ func TestGenerateMavenArgs(t *testing.T) {
 	}{
 		{latest.JibArtifact{}, "image", false, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--non-recursive", "prepare-package", "jib:goal", "-Dimage=image"}},
 		{latest.JibArtifact{}, "image", true, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--non-recursive", "-DskipTests=true", "prepare-package", "jib:goal", "-Dimage=image"}},
-		{latest.JibArtifact{Profile: "profile"}, "image", false, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--non-recursive", "prepare-package", "jib:goal", "-Dimage=image"}},
-		{latest.JibArtifact{Profile: "profile"}, "image", true, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--non-recursive", "-DskipTests=true", "prepare-package", "jib:goal", "-Dimage=image"}},
 		{latest.JibArtifact{Project: "module"}, "image", false, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--projects", "module", "--also-make", "package", "jib:goal", "-Djib.containerize=module", "-Dimage=image"}},
 		{latest.JibArtifact{Project: "module"}, "image", true, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--projects", "module", "--also-make", "-DskipTests=true", "package", "jib:goal", "-Djib.containerize=module", "-Dimage=image"}},
-		{latest.JibArtifact{Project: "module", Profile: "profile"}, "image", false, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--projects", "module", "--also-make", "package", "jib:goal", "-Djib.containerize=module", "-Dimage=image"}},
-		{latest.JibArtifact{Project: "module", Profile: "profile"}, "image", true, nil, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--projects", "module", "--also-make", "-DskipTests=true", "package", "jib:goal", "-Djib.containerize=module", "-Dimage=image"}},
-		{latest.JibArtifact{Project: "module", Profile: "profile"}, "registry.tld/image", true, map[string]bool{"registry.tld": true}, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--activate-profiles", "profile", "--projects", "module", "--also-make", "-DskipTests=true", "package", "jib:goal", "-Djib.containerize=module", "-Djib.allowInsecureRegistries=true", "-Dimage=registry.tld/image"}},
+		{latest.JibArtifact{Project: "module"}, "registry.tld/image", true, map[string]bool{"registry.tld": true}, []string{"-Djib.console=plain", "jib:_skaffold-fail-if-jib-out-of-date", "-Djib.requiredVersion=" + MinimumJibMavenVersion, "--projects", "module", "--also-make", "-DskipTests=true", "package", "jib:goal", "-Djib.containerize=module", "-Djib.allowInsecureRegistries=true", "-Dimage=registry.tld/image"}},
 	}
 	for _, test := range tests {
 		args := GenerateMavenArgs("goal", test.image, &test.in, test.skipTests, test.insecureRegistries)

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -756,9 +756,6 @@ type JibArtifact struct {
 	// Project selects which sub-project to build for multi-module builds.
 	Project string `yaml:"project,omitempty"`
 
-	// Profile selects which Maven profile to activate *(Maven-only)*.
-	Profile string `yaml:"profile,omitempty"`
-
 	// Flags are additional build flags passed to the builder.
 	// For example: `["--no-build-cache"]`.
 	Flags []string `yaml:"args,omitempty"`

diff --git a/pkg/skaffold/schema/v1beta13/upgrade.go b/pkg/skaffold/schema/v1beta13/upgrade.go
@@ -29,6 +29,7 @@ import (
 // 2. Removals:
 // jibMaven builder
 // jibGradle builder
+// jibMaven profile removed
 // 3. No updates
 func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
 	var newConfig next.SkaffoldConfig
@@ -49,10 +50,13 @@ func upgradeOnePipeline(oldPipeline, newPipeline interface{}) error {
 	for i, a := range oldBuild.Artifacts {
 		switch {
 		case a.JibMavenArtifact != nil:
+			flags := a.JibMavenArtifact.Flags
+			if a.JibMavenArtifact.Profile != "" {
+				flags = append(flags, "--activate-profiles", a.JibMavenArtifact.Profile)
+			}
 			newBuild.Artifacts[i].JibArtifact = &next.JibArtifact{
 				Project: a.JibMavenArtifact.Module,
-				Profile: a.JibMavenArtifact.Profile,
-				Flags:   a.JibMavenArtifact.Flags,
+				Flags:   flags,
 			}
 		case a.JibGradleArtifact != nil:
 			newBuild.Artifacts[i].JibArtifact = &next.JibArtifact{

diff --git a/pkg/skaffold/schema/v1beta13/upgrade_test.go b/pkg/skaffold/schema/v1beta13/upgrade_test.go
@@ -38,6 +38,7 @@ build:
   - image: gcr.io/k8s-skaffold/jib-maven
     jibMaven:
       args: ['-v']
+      profile: prof
   - image: gcr.io/k8s-skaffold/jib-gradle
     jibGradle:
       args: ['-v']
@@ -96,7 +97,7 @@ build:
       target: //mytarget
   - image: gcr.io/k8s-skaffold/jib-maven
     jib:
-      args: ['-v']
+      args: ['-v', '--activate-profiles', 'prof']
   - image: gcr.io/k8s-skaffold/jib-gradle
     jib:
       args: ['-v']