Merge pull request #2556 from lizardruss/cyclic-dependency-warning

fix: silence warning for cyclic dependency root

Author: FabianKramm

e2e/tests/dependencies/dependencies.go

@@ -1,8 +1,11 @@
 package dependencies
 
 import (
+	"bytes"
 	"context"
 	ginkgo "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 	"time"
@@ -55,16 +58,23 @@ var _ = DevSpaceDescribe("dependencies", func() {
 		}()
 
 		// create a new dev command and start it
+		output := &bytes.Buffer{}
 		devCmd := &cmd.RunPipelineCmd{
 			GlobalFlags: &flags.GlobalFlags{
 				NoWarn:     true,
 				Namespace:  ns,
 				ConfigPath: "devspace.yaml",
 			},
 			Pipeline: "dev",
+			Log:      log.NewStreamLogger(output, output, logrus.DebugLevel),
 		}
 		err = devCmd.RunDefault(f)
 		framework.ExpectNoError(err)
+
+		// Expect no multiple dependency warning
+		gomega.Expect(output.String()).NotTo(
+			gomega.ContainSubstring("Seems like you have multiple dependencies with name"),
+		)
 	})
 
 	ginkgo.It("should wait for dependencies", func() {
@@ -478,7 +488,7 @@ dep2dep2wait
 		framework.ExpectEqual(len(list.Items), 0)
 	})
 
-	ginkgo.It("should resolve and deploy cyclic dependencies", func() {
+	ginkgo.It("should resolve and deploy cyclic git dependencies", func() {
 		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/cyclic")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
@@ -499,18 +509,25 @@ dep2dep2wait
 		framework.ExpectEqual(dependencies[0].Name(), "dependency")
 
 		// create a new deploy command
+		output := &bytes.Buffer{}
 		deployCmd := &cmd.RunPipelineCmd{
 			GlobalFlags: &flags.GlobalFlags{
 				NoWarn:    true,
 				Namespace: ns,
 			},
 			Pipeline: "deploy",
+			Log:      log.NewStreamLogger(output, output, logrus.DebugLevel),
 		}
 
 		// run the command
 		err = deployCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 
+		// Expect no multiple dependency warning
+		gomega.Expect(output.String()).NotTo(
+			gomega.ContainSubstring("Seems like you have multiple dependencies with name"),
+		)
+
 		// expect single deployment
 		_, err = kubeClient.RawClient().AppsV1().Deployments(ns).Get(context.TODO(), "nginx", metav1.GetOptions{})
 		framework.ExpectNoError(err)

e2e/tests/dependencies/testdata/cyclic/dependency2/devspace.yaml

@@ -3,6 +3,9 @@ version: v2beta1
 dependencies:
   dependency:
     path: ../dependency
+  root:
+    git: https://github.com/devspace-sh/devspace.git
+    subPath: e2e/tests/dependencies/testdata/cyclic
 
 deployments:
   nginx2:

pkg/devspace/dependency/resolver.go

@@ -136,7 +136,7 @@ func (r *resolver) resolveRecursive(ctx devspacecontext.Context, basePath, paren
 		)
 		if n, ok := r.DependencyGraph.Nodes[dependencyConfig.Name]; ok {
 			child = n.Data.(*Dependency)
-			if child != nil && child.Config() != nil && child.Config().Path() != dependencyConfigPath {
+			if child != nil && child.Config() != nil && child.Config().Path() != dependencyConfigPath && !child.Root() {
 				ctx.Log().Warnf("Seems like you have multiple dependencies with name %s, but they use different source settings (%s != %s). This can lead to unexpected results and you should make sure that the devspace.yaml name is unique across your dependencies or that you use the dependencies.overrideName option", child.name, child.Config().Path(), dependencyConfigPath)
 			}