Merge pull request #1839 from pratikjagrut/patches.path.check

fix: remove path variable check

Author: FabianKramm

e2e/tests/config/config.go

@@ -3,10 +3,11 @@ package config
 import (
 	"bytes"
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
 	"os"
 	"path/filepath"
 
+	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
+
 	"github.com/loft-sh/devspace/cmd"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -1907,4 +1908,33 @@ var _ = DevSpaceDescribe("config", func() {
 		gomega.Expect(deployment1.Kubectl).To(gomega.BeNil())
 		gomega.Expect(*deployment1.Helm.ComponentChart).To(gomega.BeTrue())
 	})
+
+	// regression test for issue: https://github.com/loft-sh/devspace/issues/1835
+	ginkgo.It("should load config with var in patch", func() {
+		tempDir, err := framework.CopyToTempDir("tests/config/testdata/profile-patches")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		config, _, err := framework.LoadConfigWithOptions(f, filepath.Join(tempDir, "path-variable.yaml"),
+			&loader.ConfigOptions{Profiles: []string{"demo"}})
+		framework.ExpectNoError(err)
+
+		framework.ExpectEqual(len(config.Config().Deployments), 1)
+
+		deployment := config.Config().Deployments[0]
+		framework.ExpectEqual(deployment.Name, "test-me-server")
+
+		values, ok := deployment.Helm.Values["containers"].([]interface{})
+		gomega.Expect(ok).To(gomega.BeTrue())
+		gomega.Expect(values).NotTo(gomega.BeEmpty())
+
+		v, ok := values[0].(map[interface{}]interface{})
+		gomega.Expect(ok).To(gomega.BeTrue())
+		gomega.Expect(v).NotTo(gomega.BeNil())
+
+		framework.ExpectEqual(v["name"], "replace-0")
+
+		gomega.Expect(deployment.Kubectl).To(gomega.BeNil())
+		gomega.Expect(*deployment.Helm.ComponentChart).To(gomega.BeTrue())
+	})
 })

e2e/tests/config/testdata/profile-patches/path-variable.yaml

@@ -0,0 +1,28 @@
+version: v1beta11
+vars:
+  - name: IMAGE
+    value: john/devbackend
+  - name: PREFIX
+    value: test-me
+deployments:
+  - name: ${PREFIX}-server
+    helm:
+      componentChart: true
+      values:
+        containers:
+          - name: container-0
+            image: ${IMAGE}
+dev:
+  replacePods:
+    - imageSelector: ${IMAGE}
+      replaceImage: ubuntu:18.04
+      patches:
+        - op: add
+          path: spec.containers[0].command
+          value: ["sleep"]
+profiles:
+  - name: demo
+    patches:
+    - op: replace
+      path: deployments.name=${PREFIX}-server.helm.values.containers[0].name
+      value: replace-0

pkg/devspace/config/loader/loader.go

@@ -2,14 +2,15 @@ package loader
 
 import (
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/util/constraint"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
 
+	"github.com/loft-sh/devspace/pkg/util/constraint"
+
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
 
@@ -422,10 +423,6 @@ func validateProfile(profile interface{}) error {
 	}
 
 	for idx, patch := range profileConfig.Patches {
-		if vars.VarMatchRegex.MatchString(patch.Path) {
-			return fmt.Errorf("patches[%d] path cannot be a variable", idx)
-		}
-
 		if expression.ExpressionMatchRegex.MatchString(patch.Path) {
 			return fmt.Errorf("patches[%d] path cannot be an expression", idx)
 		}

pkg/devspace/config/loader/loader_test.go

@@ -1127,37 +1127,6 @@ profiles:
 				},
 			},
 		},
-		"Profile with patch path variable": {
-			in: &parseTestCaseInput{
-				config: `
-version: v1beta11
-deployments:
-- name: deployment
-  helm:
-    componentChart: true
-    values:
-      containers:
-      - image: nginx
-profiles:
-- name: testprofile
-  patches:
-  - path: ${path}
-    op: replace
-    value:
-      - name: deployment
-        helm:
-          componentChart: true
-          values:
-            containers:
-            - image: ubuntu
-`,
-				options: &ConfigOptions{Profiles: []string{"testprofile"}},
-				generatedConfig: &generated.Config{Vars: map[string]string{
-					"path": "deployments",
-				}},
-			},
-			expectedErr: "error validating profiles[0]: patches[0] path cannot be a variable",
-		},
 		"Profile with patch path expression": {
 			in: &parseTestCaseInput{
 				config: `