Merge pull request #2724 from dgageot/fix-2683

Fix 'skaffold diagnose' for custom builder without dependencies

Author: nkubala

integration/diagnose_test.go

@@ -33,17 +33,17 @@ func TestDiagnose(t *testing.T) {
 	tests := []struct {
 		name string
 		dir  string
-		args []string
 	}{
 		{name: "kaniko builder", dir: "examples/kaniko"},
 		{name: "docker builder", dir: "examples/nodejs"},
 		{name: "jib maven builder", dir: "testdata/jib"},
+		{name: "jib gradle builder", dir: "testdata/jib-gradle"},
 		{name: "bazel builder", dir: "examples/bazel"},
-		// todo add test cases for "jib gradle builder" and "custom builder"
+		{name: "custom builder", dir: "testdata/custom"},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			skaffold.Diagnose(test.args...).InDir(test.dir).RunOrFailOutput(t)
+			skaffold.Diagnose().InDir(test.dir).RunOrFailOutput(t)
 		})
 	}
 }

pkg/skaffold/schema/defaults/defaults.go

@@ -19,7 +19,7 @@ package defaults
 import (
 	"fmt"
 
-	"github.com/mitchellh/go-homedir"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
@@ -68,6 +68,7 @@ func Set(c *latest.SkaffoldConfig) error {
 		setDefaultWorkspace(a)
 		defaultToDockerArtifact(a)
 		setDefaultDockerfile(a)
+		setDefaultCustomDependencies(a)
 	}
 
 	for _, pf := range c.PortForward {
@@ -154,6 +155,14 @@ func setDefaultDockerfile(a *latest.Artifact) {
 	}
 }
 
+func setDefaultCustomDependencies(a *latest.Artifact) {
+	if a.CustomArtifact != nil {
+		if a.CustomArtifact.Dependencies == nil {
+			a.CustomArtifact.Dependencies = &latest.CustomDependencies{}
+		}
+	}
+}
+
 // SetDefaultDockerArtifact sets defaults on docker artifacts
 func SetDefaultDockerArtifact(a *latest.DockerArtifact) {
 	a.DockerfilePath = valueOrDefault(a.DockerfilePath, constants.DefaultDockerfilePath)

pkg/skaffold/schema/defaults/defaults_test.go

@@ -42,6 +42,12 @@ func TestSetDefaults(t *testing.T) {
 							},
 						},
 					},
+					{
+						ImageName: "third",
+						ArtifactType: latest.ArtifactType{
+							CustomArtifact: &latest.CustomArtifact{},
+						},
+					},
 				},
 			},
 		},
@@ -58,6 +64,10 @@ func TestSetDefaults(t *testing.T) {
 	testutil.CheckDeepEqual(t, "second", cfg.Build.Artifacts[1].ImageName)
 	testutil.CheckDeepEqual(t, "folder", cfg.Build.Artifacts[1].Workspace)
 	testutil.CheckDeepEqual(t, "Dockerfile.second", cfg.Build.Artifacts[1].DockerArtifact.DockerfilePath)
+
+	testutil.CheckDeepEqual(t, "third", cfg.Build.Artifacts[2].ImageName)
+	testutil.CheckDeepEqual(t, []string(nil), cfg.Build.Artifacts[2].CustomArtifact.Dependencies.Paths)
+	testutil.CheckDeepEqual(t, []string(nil), cfg.Build.Artifacts[2].CustomArtifact.Dependencies.Ignore)
 }
 
 func TestSetDefaultsOnCluster(t *testing.T) {