fix: several fixes in config loading

Author: FabianKramm

cmd/build.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/devspace/build"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
@@ -63,7 +64,7 @@ Builds all defined images and pushes them
 // Run executes the command logic
 func (cmd *BuildCmd) Run(f factory.Factory) error {
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(f, configOptions, cmd.GlobalFlags, true)
+	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, true)
 	if err != nil {
 		return err
 	}

cmd/deploy.go

@@ -115,7 +115,7 @@ devspace deploy --kube-context=deploy-context
 // Run executes the down command logic
 func (cmd *DeployCmd) Run(f factory.Factory) error {
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(f, configOptions, cmd.GlobalFlags, false)
+	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
 		return err
 	}
@@ -153,7 +153,7 @@ func (cmd *DeployCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory
 	})
 }
 
-func prepare(f factory.Factory, configOptions *loader.ConfigOptions, globalFlags *flags.GlobalFlags, allowFailingKubeClient bool) (*devspacecontext.Context, error) {
+func prepare(ctx context.Context, f factory.Factory, configOptions *loader.ConfigOptions, globalFlags *flags.GlobalFlags, allowFailingKubeClient bool) (*devspacecontext.Context, error) {
 	// start file logging
 	logpkg.StartFileLogging()
 
@@ -202,17 +202,14 @@ func prepare(f factory.Factory, configOptions *loader.ConfigOptions, globalFlags
 		return nil, err
 	}
 
-	// Create our parent context
-	backgroundCtx := context.Background()
-
 	// load config
-	configInterface, err := configLoader.LoadWithCache(backgroundCtx, localCache, client, configOptions, log)
+	configInterface, err := configLoader.LoadWithCache(ctx, localCache, client, configOptions, log)
 	if err != nil {
 		return nil, err
 	}
 
 	// create devspace context
-	return devspacecontext.NewContext(backgroundCtx, log).
+	return devspacecontext.NewContext(ctx, log).
 		WithConfig(configInterface).
 		WithKubeClient(client), nil
 }

cmd/dev.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"github.com/loft-sh/devspace/pkg/devspace/build"
 	"github.com/loft-sh/devspace/pkg/devspace/config"
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
@@ -62,10 +63,10 @@ type DevCmd struct {
 	log          log.Logger
 
 	// used for testing to allow interruption
-	Interrupt chan error
-	Stdout    io.Writer
-	Stderr    io.Writer
-	Stdin     io.Reader
+	Ctx    context.Context
+	Stdout io.Writer
+	Stderr io.Writer
+	Stdin  io.Reader
 }
 
 // NewDevCmd creates a new devspace dev command
@@ -133,8 +134,12 @@ Open terminal instead of logs:
 
 // Run executes the command logic
 func (cmd *DevCmd) Run(f factory.Factory, args []string) error {
+	if cmd.Ctx == nil {
+		cmd.Ctx = context.Background()
+	}
+
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(f, configOptions, cmd.GlobalFlags, false)
+	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
 		return err
 	}

cmd/purge.go

@@ -1,6 +1,7 @@
 package cmd
 
 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/pipeline/types"
@@ -64,7 +65,7 @@ devspace purge -d my-deployment
 // Run executes the purge command logic
 func (cmd *PurgeCmd) Run(f factory.Factory) error {
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(f, configOptions, cmd.GlobalFlags, false)
+	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
 		return err
 	}

cmd/render.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	pipelinetypes "github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
@@ -79,7 +80,7 @@ deployment.
 func (cmd *RenderCmd) Run(f factory.Factory) error {
 	f.GetLog().Warnf("This command is deprecated, please use 'devspace deploy --render' instead")
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(f, configOptions, cmd.GlobalFlags, true)
+	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, true)
 	if err != nil {
 		return err
 	}