feat: --from-file, ${devspace.name} & ${devspace.tempFolder}

Author: FabianKramm

cmd/build.go

@@ -6,6 +6,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/build"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	pipelinetypes "github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/util/factory"
@@ -74,6 +75,9 @@ func (cmd *BuildCmd) Run(f factory.Factory) error {
 		defer cancelFn()
 	}
 
+	// set command in context
+	cmd.Ctx = values.WithCommand(cmd.Ctx, "build")
+
 	configOptions := cmd.ToConfigOptions()
 	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, true)
 	if err != nil {

cmd/deploy.go

@@ -8,6 +8,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/registry"
 	"github.com/loft-sh/devspace/pkg/devspace/deploy"
@@ -25,6 +26,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
+	"io/ioutil"
 	"k8s.io/client-go/kubernetes/fake"
 	"os"
 	"strings"
@@ -113,6 +115,9 @@ func (cmd *DeployCmd) Run(f factory.Factory) error {
 		defer cancelFn()
 	}
 
+	// set command in context
+	cmd.Ctx = values.WithCommand(cmd.Ctx, "deploy")
+
 	configOptions := cmd.ToConfigOptions()
 	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
@@ -158,6 +163,15 @@ func prepare(ctx context.Context, f factory.Factory, configOptions *loader.Confi
 	// start file logging
 	logpkg.StartFileLogging()
 
+	// create a temporary folder for us to use
+	tempFolder, err := ioutil.TempDir("", "devspace-")
+	if err != nil {
+		return nil, errors.Wrap(err, "create temporary folder")
+	}
+
+	// add temp folder to context
+	ctx = values.WithTempFolder(ctx, tempFolder)
+
 	// get the main logger after file logging is started
 	log := f.GetLog()
 

cmd/dev.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"io"
 	"os"
 
@@ -133,6 +134,9 @@ func (cmd *DevCmd) Run(f factory.Factory) error {
 		defer cancelFn()
 	}
 
+	// set command in context
+	cmd.Ctx = values.WithCommand(cmd.Ctx, "dev")
+
 	configOptions := cmd.ToConfigOptions()
 	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
@@ -199,6 +203,10 @@ func runWithHooks(ctx *devspacecontext.Context, command string, fn func() error)
 	}
 
 	defer func() {
+		// delete temp folder
+		deleteTempFolder(ctx.Context, ctx.Log)
+
+		// execute hooks
 		if err != nil {
 			hook.LogExecuteHooks(ctx, map[string]interface{}{"error": err}, command+":after:execute", command+":error")
 		} else {
@@ -207,10 +215,25 @@ func runWithHooks(ctx *devspacecontext.Context, command string, fn func() error)
 	}()
 
 	return interrupt.Global.Run(fn, func() {
+		// delete temp folder
+		deleteTempFolder(ctx.Context, ctx.Log)
+
+		// execute hooks
 		hook.LogExecuteHooks(ctx, nil, command+":interrupt")
 	})
 }
 
+func deleteTempFolder(ctx context.Context, log log.Logger) {
+	// delete temp folder
+	tempFolder, ok := values.TempFolderFrom(ctx)
+	if ok && tempFolder != os.TempDir() {
+		err := os.RemoveAll(tempFolder)
+		if err != nil {
+			log.Debugf("error removing temp folder: %v", err)
+		}
+	}
+}
+
 func (cmd *DevCmd) adjustConfig(conf config.Config) error {
 	// check if terminal is enabled
 	c := conf.Config()

cmd/flags/flags.go

@@ -11,6 +11,7 @@ type GlobalFlags struct {
 	NoWarn bool
 	Debug  bool
 
+	OverrideName             string
 	Namespace                string
 	KubeContext              string
 	Profiles                 []string
@@ -29,6 +30,7 @@ func (gf *GlobalFlags) ToConfigOptions() *loader.ConfigOptions {
 	profiles := []string{}
 	profiles = append(profiles, gf.Profiles...)
 	return &loader.ConfigOptions{
+		OverrideName:             gf.OverrideName,
 		Profiles:                 profiles,
 		ProfileRefresh:           gf.ProfileRefresh,
 		DisableProfileActivation: gf.DisableProfileActivation,
@@ -43,6 +45,7 @@ func SetGlobalFlags(flags *flag.FlagSet) *GlobalFlags {
 		Flags: flags,
 	}
 
+	flags.StringVar(&globalFlags.OverrideName, "override-name", "", "If specified will override the devspace.yaml name")
 	flags.BoolVar(&globalFlags.NoWarn, "no-warn", false, "If true does not show any warning when deploying into a different namespace or kube-context than before")
 	flags.BoolVar(&globalFlags.Debug, "debug", false, "Prints the stack trace if an error occurs")
 	flags.BoolVar(&globalFlags.Silent, "silent", false, "Run in silent mode and prevents any devspace log output except panics & fatals")

cmd/purge.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 
@@ -74,6 +75,9 @@ func (cmd *PurgeCmd) Run(f factory.Factory) error {
 		defer cancelFn()
 	}
 
+	// set command in context
+	cmd.Ctx = values.WithCommand(cmd.Ctx, "purge")
+
 	configOptions := cmd.ToConfigOptions()
 	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {

e2e/framework/helper.go

@@ -138,7 +138,7 @@ func ExpectLocalFileContents(filePath string, contents string) {
 func ExpectLocalFileContentsWithoutSpaces(filePath string, contents string) {
 	out, err := ioutil.ReadFile(filePath)
 	ExpectNoError(err)
-	gomega.ExpectWithOffset(2, strings.TrimSpace(string(out))).To(gomega.Equal(contents))
+	gomega.ExpectWithOffset(1, strings.TrimSpace(string(out))).To(gomega.Equal(contents))
 }
 
 func ExpectLocalFileNotFound(filePath string) {

e2e/tests/imports/imports.go

@@ -7,7 +7,9 @@ import (
 	"github.com/loft-sh/devspace/e2e/kube"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/onsi/ginkgo"
+	"io/ioutil"
 	"os"
+	"strings"
 )
 
 var _ = DevSpaceDescribe("imports", func() {
@@ -52,10 +54,22 @@ var _ = DevSpaceDescribe("imports", func() {
 		// run the command
 		err = deployCmd.Run(f)
 		framework.ExpectNoError(err)
+
+		// read temp folder
+		out, err := ioutil.ReadFile("temp.txt")
+		framework.ExpectNoError(err)
+		framework.ExpectLocalFileContentsWithoutSpaces("name.txt", "base")
 		framework.ExpectLocalFileContentsWithoutSpaces("dependency.txt", "import3")
+		framework.ExpectLocalFileContentsWithoutSpaces("dependency-name.txt", "import1")
+		framework.ExpectLocalFileContentsWithoutSpaces("dependency-temp.txt", strings.TrimSpace(string(out)))
 		framework.ExpectLocalFileContentsWithoutSpaces("import1.txt", "import1")
 		framework.ExpectLocalFileContentsWithoutSpaces("import2.txt", "import2")
+		framework.ExpectLocalFileContentsWithoutSpaces("import2-name.txt", "base")
 		framework.ExpectLocalFileContentsWithoutSpaces("import3.txt", "import3")
 		framework.ExpectLocalFileContentsWithoutSpaces("vars.txt", ns+"-"+ns+"-base-import1-import2-import3")
+
+		// make sure temp folder is erased
+		_, err = os.Stat(strings.TrimSpace(string(out)))
+		framework.ExpectError(err)
 	})
 })

e2e/tests/imports/testdata/local/devspace.yaml

@@ -11,16 +11,20 @@ vars:
 dependencies:
   import1:
     path: import1.yaml
-    pipeline: import3
+    pipeline: import3-dep
 
 pipelines:
   deploy:
     steps:
       - run: |-
+          echo ${devspace.name} > name.txt
+          echo ${devspace.tempFolder} > temp.txt
+          
           run_dependency_pipelines --all > dependency.txt
           
           run_pipelines import1 > import1.txt
           run_pipelines import2 > import2.txt
+          run_pipelines import2-name > import2-name.txt
           run_pipelines import3 > import3.txt
 
           echo ${DEVSPACE_NAMESPACE}-${devspace.namespace}-${BASE}-${IMPORT1}-${IMPORT2}-${IMPORT3} > vars.txt

e2e/tests/imports/testdata/local/import2.yaml

@@ -5,6 +5,10 @@ vars:
   IMPORT2: import2
 
 pipelines:
+  import2-name:
+    steps:
+      - run: |-
+          echo ${devspace.name}
   import2:
     steps:
       - run: |-

e2e/tests/imports/testdata/local/import3.yaml

@@ -8,4 +8,10 @@ pipelines:
   import3:
     steps:
       - run: |-
-          echo ${IMPORT3}
+          echo ${IMPORT3}
+  import3-dep:
+    steps:
+      - run: |-
+          echo ${IMPORT3}
+          echo ${devspace.name} > dependency-name.txt
+          echo ${devspace.tempFolder} > dependency-temp.txt