Merge pull request #2600 from lizardruss/devspace-space

feat: add variables to support migrating DevSpace Cloud users

Author: FabianKramm

e2e/tests/hooks/hooks.go

@@ -221,6 +221,9 @@ var _ = DevSpaceDescribe("hooks", func() {
 		// check namespace hook
 		framework.ExpectLocalFileContentsImmediately("namespace.txt", ns)
 
+		// check space hook
+		framework.ExpectLocalFileContentsImmediately("space.txt", ns)
+
 		// stop second command
 		cancel2()
 

e2e/tests/hooks/testdata/once/devspace.yaml

@@ -14,6 +14,7 @@ deployments:
 hooks:
   - command: |
       echo -n $DEVSPACE_NAMESPACE > namespace.txt
+      echo -n $DEVSPACE_SPACE > space.txt
     events: ["after:deploy"]
   - command: |
       mkdir -p /app

pkg/devspace/config/loader/variable/predefined_variable.go

@@ -138,6 +138,9 @@ func init() {
 	predefinedVars["devspace.git.commit"] = predefinedVars["DEVSPACE_GIT_COMMIT"]
 	predefinedVars["devspace.context"] = predefinedVars["DEVSPACE_CONTEXT"]
 	predefinedVars["devspace.namespace"] = predefinedVars["DEVSPACE_NAMESPACE"]
+
+	// support migrating DevSpace Cloud users
+	predefinedVars["DEVSPACE_SPACE"] = predefinedVars["DEVSPACE_NAMESPACE"]
 }
 
 func IsPredefinedVariable(name string) bool {

pkg/devspace/config/loader/variable/resolver.go

@@ -20,7 +20,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-var AlwaysResolvePredefinedVars = []string{"DEVSPACE_NAME", "DEVSPACE_EXECUTABLE", "DEVSPACE_KUBECTL_EXECUTABLE", "DEVSPACE_TMPDIR", "DEVSPACE_VERSION", "DEVSPACE_RANDOM", "DEVSPACE_PROFILE", "DEVSPACE_PROFILES", "DEVSPACE_USER_HOME", "DEVSPACE_TIMESTAMP", "devspace.context", "DEVSPACE_CONTEXT", "devspace.namespace", "DEVSPACE_NAMESPACE"}
+var AlwaysResolvePredefinedVars = []string{"DEVSPACE_NAME", "DEVSPACE_EXECUTABLE", "DEVSPACE_KUBECTL_EXECUTABLE", "DEVSPACE_TMPDIR", "DEVSPACE_VERSION", "DEVSPACE_RANDOM", "DEVSPACE_PROFILE", "DEVSPACE_PROFILES", "DEVSPACE_USER_HOME", "DEVSPACE_TIMESTAMP", "devspace.context", "DEVSPACE_CONTEXT", "devspace.namespace", "DEVSPACE_NAMESPACE", "DEVSPACE_SPACE"}
 
 // NewResolver creates a new resolver that caches resolved variables in memory and in the provided cache
 func NewResolver(localCache localcache.Cache, predefinedVariableOptions *PredefinedVariableOptions, flags []string, log log.Logger) (Resolver, error) {