Merge pull request #1822 from pratikjagrut/cyclic.dep.bug

fix: nil cyclic dependency error

Author: FabianKramm

e2e/tests/dependencies/dependencies.go

@@ -242,4 +242,19 @@ var _ = DevSpaceDescribe("dependencies", func() {
 		framework.ExpectNoError(err)
 		framework.ExpectEqual(len(list.Items), 0)
 	})
+
+	ginkgo.It("should resolve cyclic dependencies", func() {
+		tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/cyclic")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		// load it from the regular path first
+		_, dependencies, err := framework.LoadConfig(f, filepath.Join(tempDir, "devspace.yaml"))
+		framework.ExpectNoError(err)
+
+		// check if dependencies were loaded correctly
+		framework.ExpectEqual(len(dependencies), 1)
+		framework.ExpectEqual(dependencies[0].Name(), "dependency")
+
+	})
 })

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

@@ -0,0 +1,18 @@
+version: v1beta11
+dependencies:
+ - name: root-devspace
+   source:
+     path: ../
+deployments:
+- name: nginx
+  helm:
+    componentChart: true
+    values:
+      containers:
+      - image: nginx
+dev:
+  ports:
+  - imageSelector: nginx
+    forward:
+      - port: 8080
+        remotePort: 80

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

@@ -0,0 +1,12 @@
+version: v1beta11
+dependencies:
+- name: dependency
+  source:
+    path: dependency
+  # Use dev.ports config from dependency2
+  dev:
+    ports: true
+dev:
+  # Open terminal to the pod with the imageName created in dependency1
+  terminal:
+    imageSelector: image(dependency.default)

pkg/devspace/dependency/resolver.go

@@ -181,7 +181,7 @@ func (r *resolver) resolveRecursive(basePath, parentID string, currentDependency
 		}
 
 		// add child
-		if currentDependency != nil {
+		if currentDependency != nil && currentDependency.children != nil && child != nil {
 			currentDependency.children = append(currentDependency.children, child)
 		}
 	}