skaffold init --force supports cases with 1 image and multiple builders

pkg/skaffold/initializer/build/builders_test.go

@@ -98,6 +98,19 @@ func TestResolveBuilderImages(t *testing.T) {
 				},
 			},
 		},
+		{
+			description:      "successful force - 1 image 2 builders",
+			buildConfigs:     []InitBuilder{docker.ArtifactConfig{File: "Dockerfile1"}, jib.ArtifactConfig{BuilderName: jib.PluginName(jib.JibGradle), File: "build.gradle"}},
+			images:           []string{"image1"},
+			shouldMakeChoice: true,
+			force:            true,
+			expectedPairs: []BuilderImagePair{
+				{
+					Builder:   docker.ArtifactConfig{File: "Dockerfile1"},
+					ImageName: "image1",
+				},
+			},
+		},
 		{
 			description:      "error with ambiguous force",
 			buildConfigs:     []InitBuilder{docker.ArtifactConfig{File: "Dockerfile1"}, jib.ArtifactConfig{BuilderName: jib.PluginName(jib.JibGradle), File: "build.gradle"}},

pkg/skaffold/initializer/build/resolve.go

@@ -53,12 +53,47 @@ func (d *defaultBuildInitializer) resolveBuilderImages() error {
 	}
 
 	if d.force {
-		return errors.BuilderImageAmbiguitiesErr{}
+		return d.resolveBuilderImagesForcefully()
 	}
 
 	return d.resolveBuilderImagesInteractively()
 }
 
+func (d *defaultBuildInitializer) resolveBuilderImagesForcefully() error {
+	// In the case of 1 image and multiple builders, respects the ordering Docker > Jib > Bazel > Buildpacks
+	if len(d.unresolvedImages) == 1 {
+		image := d.unresolvedImages[0]
+		choice := d.builders[0]
+		for _, builder := range d.builders {
+			if builderRank(builder) < builderRank(choice) {
+				choice = builder
+			}
+		}
+
+		d.builderImagePairs = append(d.builderImagePairs, BuilderImagePair{Builder: choice, ImageName: image})
+		d.unresolvedImages = util.RemoveFromSlice(d.unresolvedImages, image)
+		return nil
+	}
+
+	return errors.BuilderImageAmbiguitiesErr{}
+}
+
+func builderRank(builder InitBuilder) int {
+	a := builder.ArtifactType()
+	switch {
+	case a.DockerArtifact != nil:
+		return 1
+	case a.JibArtifact != nil:
+		return 2
+	case a.BazelArtifact != nil:
+		return 3
+	case a.BuildpackArtifact != nil:
+		return 4
+	}
+
+	return 5
+}
+
 func (d *defaultBuildInitializer) resolveBuilderImagesInteractively() error {
 	// Build map from choice string to builder config struct
 	choices := make([]string, len(d.builders))