fix: skaffold diagnose outputs incorrect yaml for multiconfig projects

cmd/skaffold/app/cmd/diagnose.go

@@ -64,6 +64,10 @@ func doDiagnose(ctx context.Context, out io.Writer) error {
 			color.Blue.Fprintln(out, "\nConfiguration")
 		}
 	}
+	// remove the dependency config references since they have already been imported and will be marshalled together.
+	for i := range configs {
+		configs[i].Dependencies = nil
+	}
 	buf, err := yaml.MarshalWithSeparator(configs)
 	if err != nil {
 		return fmt.Errorf("marshalling configuration: %w", err)

integration/diagnose_test.go

@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
+	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
 func TestDiagnose(t *testing.T) {
@@ -63,3 +64,13 @@ func folders(root string) ([]string, error) {
 
 	return folders, err
 }
+
+func TestMultiConfigDiagnose(t *testing.T) {
+	MarkIntegrationTest(t, CanRunWithoutGcp)
+	testutil.Run(t, "test multiconfig diagnose", func(t *testutil.T) {
+		out := skaffold.Diagnose("--yaml-only").InDir("testdata/diagnose/multi-config").RunOrFailOutput(t.T)
+		expected, err := ioutil.ReadFile("testdata/diagnose/multi-config/skaffold_merged.yaml")
+		t.CheckNoError(err)
+		t.CheckDeepEqual(expected, out)
+	})
+}

integration/testdata/diagnose/multi-config/skaffold.yaml

@@ -0,0 +1,13 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+requires:
+- path: ./skaffold2.yaml
+- path: ./skaffold3.yaml
+build:
+  artifacts:
+  - image: app1
+    context: /foo
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*

integration/testdata/diagnose/multi-config/skaffold2.yaml

@@ -0,0 +1,12 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: cfg2
+build:
+  artifacts:
+  - image: app2
+    context: /foo
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*

integration/testdata/diagnose/multi-config/skaffold3.yaml

@@ -0,0 +1,12 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: cfg3
+build:
+  artifacts:
+  - image: app3
+    context: /foo
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*

integration/testdata/diagnose/multi-config/skaffold_merged.yaml

@@ -0,0 +1,60 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: cfg2
+build:
+  artifacts:
+  - image: app2
+    context: /foo
+    docker:
+      dockerfile: Dockerfile
+  tagPolicy:
+    gitCommit: {}
+  local:
+    concurrency: 1
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*
+  logs:
+    prefix: container
+---
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: cfg3
+build:
+  artifacts:
+  - image: app3
+    context: /foo
+    docker:
+      dockerfile: Dockerfile
+  tagPolicy:
+    gitCommit: {}
+  local:
+    concurrency: 1
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*
+  logs:
+    prefix: container
+---
+apiVersion: skaffold/v2beta13
+kind: Config
+build:
+  artifacts:
+  - image: app1
+    context: /foo
+    docker:
+      dockerfile: Dockerfile
+  tagPolicy:
+    gitCommit: {}
+  local:
+    concurrency: 1
+deploy:
+  kubectl:
+    manifests:
+    - /k8s/*
+  logs:
+    prefix: container