Merge pull request #2492 from FabianKramm/main

fix: cyclic dependency detection

Author: FabianKramm

cmd/run_pipeline.go

@@ -460,7 +460,7 @@ func runPipeline(ctx devspacecontext.Context, args []string, options *CommandOpt
 	defer devPodManager.Close()
 
 	// create dependency registry
-	dependencyRegistry := registry.NewDependencyRegistry(options.DeployOptions.Render)
+	dependencyRegistry := registry.NewDependencyRegistry(ctx.Config().Config().Name, options.DeployOptions.Render)
 
 	// get deploy pipeline
 	pipe := pipeline.NewPipeline(ctx.Config().Config().Name, devPodManager, dependencyRegistry, configPipeline, options.Options)

e2e/e2e_suite_test.go

@@ -1,11 +1,11 @@
 package e2e
 
 import (
+	"github.com/onsi/ginkgo/v2"
 	"math/rand"
 	"testing"
 	"time"
 
-	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 
 	// Register tests

e2e/framework/util.go

@@ -3,6 +3,7 @@ package framework
 import (
 	"context"
 	"fmt"
+	ginkgo "github.com/onsi/ginkgo/v2"
 	"os"
 	"path/filepath"
 	"sync"
@@ -15,7 +16,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/loft-sh/devspace/pkg/util/message"
-	"github.com/onsi/ginkgo"
 	"github.com/otiai10/copy"
 	"github.com/pkg/errors"
 )

e2e/tests/build/build.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/onsi/ginkgo/v2"
 	"io"
 	"os"
 	"os/exec"
@@ -19,7 +20,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/onsi/ginkgo"
 )
 
 var _ = DevSpaceDescribe("build", func() {

e2e/tests/build/framework.go

@@ -1,6 +1,6 @@
 package build
 
-import "github.com/onsi/ginkgo"
+import "github.com/onsi/ginkgo/v2"
 
 // DevSpaceDescribe annotates the test with the label.
 func DevSpaceDescribe(text string, body func()) bool {

e2e/tests/command/command.go

@@ -2,12 +2,12 @@ package command
 
 import (
 	"bytes"
+	"github.com/onsi/ginkgo/v2"
 	"os"
 
 	"github.com/loft-sh/devspace/cmd"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/e2e/framework"
-	"github.com/onsi/ginkgo"
 )
 
 var _ = DevSpaceDescribe("command", func() {

e2e/tests/command/framework.go

@@ -1,6 +1,6 @@
 package command
 
-import "github.com/onsi/ginkgo"
+import "github.com/onsi/ginkgo/v2"
 
 // DevSpaceDescribe annotates the test with the label.
 func DevSpaceDescribe(text string, body func()) bool {

e2e/tests/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"bytes"
 	"fmt"
+	"github.com/onsi/ginkgo/v2"
 	"os"
 	"path/filepath"
 
@@ -20,7 +21,6 @@ import (
 
 	"github.com/loft-sh/devspace/e2e/framework"
 	"github.com/loft-sh/devspace/e2e/kube"
-	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 )
 

e2e/tests/config/framework.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/onsi/ginkgo"
+import "github.com/onsi/ginkgo/v2"
 
 // DevSpaceDescribe annotates the test with the label.
 func DevSpaceDescribe(text string, body func()) bool {

e2e/tests/dependencies/dependencies.go

@@ -2,6 +2,7 @@ package dependencies
 
 import (
 	"context"
+	ginkgo "github.com/onsi/ginkgo/v2"
 	"os"
 	"path/filepath"
 	"time"
@@ -21,7 +22,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/survey"
-	"github.com/onsi/ginkgo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -42,6 +42,31 @@ var _ = DevSpaceDescribe("dependencies", func() {
 		kubeClient, err = kube.NewKubeHelper()
 	})
 
+	ginkgo.It("should execute cyclic dependencies correctly", func() {
+		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/cyclic2")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("dependencies")
+		framework.ExpectNoError(err)
+		defer func() {
+			err := kubeClient.DeleteNamespace(ns)
+			framework.ExpectNoError(err)
+		}()
+
+		// create a new dev command and start it
+		devCmd := &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:     true,
+				Namespace:  ns,
+				ConfigPath: "devspace.yaml",
+			},
+			Pipeline: "dev",
+		}
+		err = devCmd.RunDefault(f)
+		framework.ExpectNoError(err)
+	})
+
 	ginkgo.It("should wait for dependencies", func() {
 		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/wait")
 		framework.ExpectNoError(err)