Merge pull request #2033 from FabianKramm/master

fix: allow __ vars

Author: FabianKramm

cmd/run.go

@@ -347,12 +347,16 @@ func NewSpecificRunCommand(f factory.Factory, globalFlags *flags.GlobalFlags, co
 		Short: description,
 		Long:  longDescription,
 		Args:  cobra.ArbitraryArgs,
-		RunE: func(cobraCmd *cobra.Command, _ []string) error {
+		RunE: func(cobraCmd *cobra.Command, originalArgs []string) error {
 			args, err := ParseArgs(cobraCmd, cmd.GlobalFlags, f.GetLog())
 			if err != nil {
 				return err
 			}
 
+			if cmd.ConfigPath != "" {
+				return cobraCmd.Parent().RunE(cobraCmd, originalArgs)
+			}
+
 			plugin.SetPluginCommand(cobraCmd, args)
 			return cmd.Run(f, args)
 		},

e2e/tests/config/testdata/vars/devspace.yaml

@@ -2,7 +2,7 @@ version: v1beta10
 vars:
   - name: TEST_OVERRIDE
     value: devspace.yaml
-  - name: NOT_USED
+  - name: NOT__USED
   - name: TEST_1
   - name: TEST_2
     command: "echo test2"

pkg/util/encoding/encoding.go

@@ -34,8 +34,8 @@ func Convert(ID string) string {
 	return SafeConcatName(ID)
 }
 
-var UnsafeNameRegEx = regexp.MustCompile(`^[a-z0-9]+(?:-?[a-z0-9]+)*$`)
-var UnsafeUpperNameRegEx = regexp.MustCompile(`^[A-Za-z0-9]+(?:[\-_]?[A-Za-z0-9])*$`)
+var UnsafeNameRegEx = regexp.MustCompile(`^(([a-z0-9][a-z0-9\-]*[a-z0-9])|([a-z0-9]))$`)
+var UnsafeUpperNameRegEx = regexp.MustCompile(`^(([A-Za-z0-9][A-Za-z0-9\-_]*[A-Za-z0-9])|([A-Za-z0-9]))$`)
 
 func IsUnsafeUpperName(unsafeName string) bool {
 	return !UnsafeUpperNameRegEx.MatchString(unsafeName)

pkg/util/encoding/encoding_test.go

@@ -0,0 +1,91 @@
+package encoding
+
+import (
+	"gotest.tools/assert"
+	"testing"
+)
+
+type testCase struct {
+	name string
+	safe bool
+}
+
+func TestIsUnsafeUpperName(t *testing.T) {
+	cases := []testCase{
+		{
+			name: "a",
+			safe: true,
+		},
+		{
+			name: "a--b",
+			safe: true,
+		},
+		{
+			name: "a- -b",
+			safe: false,
+		},
+		{
+			name: "a-$-b",
+			safe: false,
+		},
+		{
+			name: "a-_-b",
+			safe: false,
+		},
+		{
+			name: "-ab",
+			safe: false,
+		},
+		{
+			name: "AB",
+			safe: false,
+		},
+	}
+	upperCases := []testCase{
+		{
+			name: "a",
+			safe: true,
+		},
+		{
+			name: "a-_B",
+			safe: true,
+		},
+		{
+			name: "a--b",
+			safe: true,
+		},
+		{
+			name: "A__B",
+			safe: true,
+		},
+		{
+			name: "A_ _B",
+			safe: false,
+		},
+		{
+			name: "A_%_B",
+			safe: false,
+		},
+		{
+			name: "A_%$",
+			safe: false,
+		},
+		{
+			name: "-ABV",
+			safe: false,
+		},
+		{
+			name: "ABV_",
+			safe: false,
+		},
+	}
+
+	for _, c := range cases {
+		unsafe := IsUnsafeName(c.name)
+		assert.Equal(t, !unsafe, c.safe, "expect "+c.name)
+	}
+	for _, c := range upperCases {
+		unsafe := IsUnsafeUpperName(c.name)
+		assert.Equal(t, !unsafe, c.safe, "expect upper "+c.name)
+	}
+}