tests: fix e2e hooks tests

Author: FabianKramm

cmd/build.go

@@ -28,6 +28,8 @@ type BuildCmd struct {
 	ForceBuild          bool
 	BuildSequential     bool
 	MaxConcurrentBuilds int
+
+	Ctx context.Context
 }
 
 // NewBuildCmd creates a new devspace build command
@@ -66,8 +68,14 @@ Builds all defined images and pushes them
 
 // Run executes the command logic
 func (cmd *BuildCmd) Run(f factory.Factory) error {
+	if cmd.Ctx == nil {
+		var cancelFn context.CancelFunc
+		cmd.Ctx, cancelFn = context.WithCancel(context.Background())
+		defer cancelFn()
+	}
+
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, true)
+	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, true)
 	if err != nil {
 		return err
 	}

cmd/deploy.go

@@ -15,7 +15,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/deploy"
 	"github.com/loft-sh/devspace/pkg/devspace/dev"
 	"github.com/loft-sh/devspace/pkg/devspace/devpod"
-	"github.com/loft-sh/devspace/pkg/devspace/hook"
 	fakekube "github.com/loft-sh/devspace/pkg/devspace/kubectl/testing"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
@@ -57,6 +56,8 @@ type DeployCmd struct {
 	Timeout int
 
 	log logpkg.Logger
+
+	Ctx context.Context
 }
 
 // NewDeployCmd creates a new deploy command
@@ -114,8 +115,14 @@ devspace deploy --kube-context=deploy-context
 
 // Run executes the down command logic
 func (cmd *DeployCmd) Run(f factory.Factory) error {
+	if cmd.Ctx == nil {
+		var cancelFn context.CancelFunc
+		cmd.Ctx, cancelFn = context.WithCancel(context.Background())
+		defer cancelFn()
+	}
+
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, false)
+	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
 		return err
 	}
@@ -254,12 +261,6 @@ func runPipeline(ctx *devspacecontext.Context, f factory.Factory, forceLeader bo
 	}
 	ctx = ctx.WithDependencies(dependencies)
 
-	// execute plugin hook
-	err = hook.ExecuteHooks(ctx, nil, "deploy")
-	if err != nil {
-		return err
-	}
-
 	// update last used kube context & save generated yaml
 	err = updateLastKubeContext(ctx)
 	if err != nil {

cmd/dev.go

@@ -136,7 +136,9 @@ 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()
+		var cancelFn context.CancelFunc
+		cmd.Ctx, cancelFn = context.WithCancel(context.Background())
+		defer cancelFn()
 	}
 
 	configOptions := cmd.ToConfigOptions()
@@ -152,12 +154,6 @@ func (cmd *DevCmd) Run(f factory.Factory, args []string) error {
 	}
 
 	return runWithHooks(ctx, "devCommand", func() error {
-		// Execute plugin hook
-		err = hook.ExecuteHooks(ctx, nil, "dev")
-		if err != nil {
-			return err
-		}
-
 		// Build and deploy images
 		err = cmd.runCommand(ctx, f, configOptions)
 		if err != nil {

cmd/purge.go

@@ -26,6 +26,8 @@ type PurgeCmd struct {
 	Dependency     []string
 
 	log log.Logger
+
+	Ctx context.Context
 }
 
 // NewPurgeCmd creates a new purge command
@@ -66,8 +68,14 @@ devspace purge -d my-deployment
 
 // Run executes the purge command logic
 func (cmd *PurgeCmd) Run(f factory.Factory) error {
+	if cmd.Ctx == nil {
+		var cancelFn context.CancelFunc
+		cmd.Ctx, cancelFn = context.WithCancel(context.Background())
+		defer cancelFn()
+	}
+
 	configOptions := cmd.ToConfigOptions()
-	ctx, err := prepare(context.Background(), f, configOptions, cmd.GlobalFlags, false)
+	ctx, err := prepare(cmd.Ctx, f, configOptions, cmd.GlobalFlags, false)
 	if err != nil {
 		return err
 	}

cmd/sync.go

@@ -119,6 +119,12 @@ type nameConfig struct {
 
 // Run executes the command logic
 func (cmd *SyncCmd) Run(f factory.Factory) error {
+	if cmd.Ctx == nil {
+		var cancelFn context.CancelFunc
+		cmd.Ctx, cancelFn = context.WithCancel(context.Background())
+		defer cancelFn()
+	}
+
 	// Switch working directory
 	if cmd.GlobalFlags.ConfigPath != "" {
 		_, err := os.Stat(cmd.GlobalFlags.ConfigPath)
@@ -175,10 +181,6 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		}
 	}
 
-	if cmd.Ctx == nil {
-		cmd.Ctx = context.Background()
-	}
-
 	// create the devspace context
 	ctx := devspacecontext.NewContext(cmd.Ctx, logger).
 		WithConfig(configInterface).