Merge pull request #2068 from FabianKramm/master

FabianKramm · web-flow · commit 6dde63b2f3aa · 2022-05-06T13:34:50.000+02:00
refactor: disable probes if image or command is replaced
diff --git a/e2e/framework/helper.go b/e2e/framework/helper.go
@@ -157,7 +157,7 @@ func ExpectRemoteContainerFileContents(labelSelector, container string, namespac
 func ExpectLocalFileContentsImmediately(filePath string, contents string) {
 	out, err := ioutil.ReadFile(filePath)
 	ExpectNoError(err)
-	gomega.ExpectWithOffset(2, string(out)).To(gomega.Equal(contents))
+	gomega.ExpectWithOffset(1, string(out)).To(gomega.Equal(contents))
 }
 
 func ExpectLocalFileContents(filePath string, contents string) {
diff --git a/e2e/tests/dependencies/dependencies.go b/e2e/tests/dependencies/dependencies.go
@@ -66,9 +66,7 @@ var _ = DevSpaceDescribe("dependencies", func() {
 		err = devCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 		framework.ExpectLocalFileContentsImmediately(filepath.Join(tempDir, "out.txt"), `dep3
-dep2
-dep2
-wait
+dep2dep2wait
 `)
 	})
 
diff --git a/e2e/tests/dependencies/testdata/wait/dep1.yaml b/e2e/tests/dependencies/testdata/wait/dep1.yaml
@@ -9,5 +9,5 @@ pipelines:
   deploy: |-
     run_dependencies --all
     # We use dep2 here because we don't know if dep1 or dep2 finishs first
-    echo "dep2" >> out.txt
+    echo -n "dep2" >> out.txt
 
diff --git a/e2e/tests/dependencies/testdata/wait/dep2.yaml b/e2e/tests/dependencies/testdata/wait/dep2.yaml
@@ -8,5 +8,5 @@ dependencies:
 pipelines:
   deploy: |-
     run_dependencies --all
-    echo "dep2" >> out.txt
+    echo -n "dep2" >> out.txt
 
diff --git a/e2e/tests/pipelines/pipelines.go b/e2e/tests/pipelines/pipelines.go
@@ -2,6 +2,7 @@ package pipelines
 
 import (
 	"context"
+	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"io/ioutil"
 	"os"
 	"time"
@@ -33,6 +34,41 @@ var _ = DevSpaceDescribe("pipelines", func() {
 		framework.ExpectNoError(err)
 	})
 
+	ginkgo.It("should resolve pipeline flags", func() {
+		tempDir, err := framework.CopyToTempDir("tests/pipelines/testdata/flags")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("pipelines")
+		framework.ExpectNoError(err)
+		defer framework.ExpectDeleteNamespace(kubeClient, ns)
+
+		devCmd := &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+			},
+			Pipeline: "dev",
+			Ctx: values.WithFlagsMap(context.Background(), map[string]string{
+				"test":  "test",
+				"test2": "",
+			}),
+		}
+		err = devCmd.RunDefault(f)
+		framework.ExpectNoError(err)
+
+		framework.ExpectLocalFileContentsImmediately("test.txt", "test\n")
+		framework.ExpectLocalFileContentsImmediately("test2.txt", "\n")
+		framework.ExpectLocalFileContentsImmediately("other.txt", "test\n")
+		framework.ExpectLocalFileContentsImmediately("other2.txt", "false\n")
+		framework.ExpectLocalFileContentsImmediately("other3.txt", "true\n")
+		framework.ExpectLocalFileContentsImmediately("dep1-test.txt", "test\n")
+		framework.ExpectLocalFileContentsImmediately("dep1-test2.txt", "true\n")
+		framework.ExpectLocalFileContentsImmediately("dep1-other.txt", "test\n")
+		framework.ExpectLocalFileContentsImmediately("dep1-other2.txt", "false\n")
+		framework.ExpectLocalFileContentsImmediately("dep1-other3.txt", "false\n")
+	})
+
 	ginkgo.It("should exec container", func() {
 		tempDir, err := framework.CopyToTempDir("tests/pipelines/testdata/exec_container")
 		framework.ExpectNoError(err)
diff --git a/e2e/tests/pipelines/testdata/flags/dep1.yaml b/e2e/tests/pipelines/testdata/flags/dep1.yaml
@@ -0,0 +1,35 @@
+version: v2beta1
+name: dep1
+
+pipelines:
+  other:
+    flags:
+      - name: other
+        default: test
+        type: string
+      - name: other2
+        default: true
+      - name: other3
+        default: false
+    run: |-
+      if get_flag test; then
+        exit 1
+      fi
+      
+      echo $(get_flag other) > dep1-other.txt
+      echo $(get_flag other2) > dep1-other2.txt
+      echo $(get_flag other3) > dep1-other3.txt
+
+  dev:
+    flags:
+      - name: test
+        default: test
+        type: string
+      - name: test3
+    run: |-
+      echo $(get_flag test) > dep1-test.txt
+      if get_flag test2; then
+        exit 1
+      fi
+      echo $(get_flag test3) > dep1-test2.txt
+      run_pipelines other --set-flag other2=false
diff --git a/e2e/tests/pipelines/testdata/flags/devspace.yaml b/e2e/tests/pipelines/testdata/flags/devspace.yaml
@@ -0,0 +1,43 @@
+version: v2beta1
+name: test
+
+dependencies:
+  dep1:
+    path: dep1.yaml
+
+pipelines:
+  other:
+    flags:
+      - name: other
+        default: test
+        type: string
+      - name: other2
+        default: true
+      - name: other3
+        default: true
+    run: |-
+      if get_flag test; then
+        exit 1
+      fi
+      
+      echo $(get_flag other) > other.txt
+      echo $(get_flag other2) > other2.txt
+      echo $(get_flag other3) > other3.txt
+
+  dev:
+    flags:
+      - name: test
+        default: test
+        type: string
+      - name: test2
+    run: |-
+      echo "$(get_flag test)" > test.txt
+      echo "$(get_flag test2)" > test2.txt
+      
+      run_pipelines other --set-flag other2=false
+      run_dependencies dep1 --set-flag test3=true --pipeline dev
+      
+      
+      
+
+
diff --git a/pkg/devspace/context/values/values.go b/pkg/devspace/context/values/values.go
@@ -3,6 +3,7 @@ package values
 import (
 	"context"
 	flag "github.com/spf13/pflag"
+	"strings"
 )
 
 // The key type is unexported to prevent collisions
@@ -18,14 +19,29 @@ const (
 	flagsKey
 )
 
-// WithFlags creates a new context with the dev context
+// WithFlagsMap creates a new context with the given flags
+func WithFlagsMap(parent context.Context, flagsMap map[string]string) context.Context {
+	return WithValue(parent, flagsKey, flagsMap)
+}
+
+// WithFlags creates a new context with the given flags
 func WithFlags(parent context.Context, flagSet *flag.FlagSet) context.Context {
-	return WithValue(parent, flagsKey, flagSet)
+	flagsMap := map[string]string{}
+	flagSet.VisitAll(func(f *flag.Flag) {
+		sliceType, ok := f.Value.(flag.SliceValue)
+		if ok {
+			flagsMap[f.Name] = strings.Join(sliceType.GetSlice(), " ")
+		} else {
+			flagsMap[f.Name] = f.Value.String()
+		}
+	})
+
+	return WithFlagsMap(parent, flagsMap)
 }
 
 // FlagsFrom returns a context used to start and stop dev configurations
-func FlagsFrom(ctx context.Context) (*flag.FlagSet, bool) {
-	flags, ok := ctx.Value(flagsKey).(*flag.FlagSet)
+func FlagsFrom(ctx context.Context) (map[string]string, bool) {
+	flags, ok := ctx.Value(flagsKey).(map[string]string)
 	return flags, ok
 }
 
diff --git a/pkg/devspace/deploy/deployer/kubectl/builder.go b/pkg/devspace/deploy/deployer/kubectl/builder.go
@@ -85,8 +85,7 @@ var useOldDryRun = func(ctx context.Context, dir, path string) (bool, error) {
 
 	v1, err := constraint.NewVersion(strings.TrimPrefix(strings.TrimSpace(string(out)), "Client Version: v"))
 	if err != nil {
-
-		return false, err
+		return false, nil
 	}
 
 	v2, err := constraint.NewVersion("1.18.0")
diff --git a/pkg/devspace/pipeline/engine/basichandler/commands/get_flag.go b/pkg/devspace/pipeline/engine/basichandler/commands/get_flag.go
@@ -4,9 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/context/values"
-	flag "github.com/spf13/pflag"
 	"mvdan.cc/sh/v3/interp"
-	"strings"
 )
 
 func GetFlag(ctx context.Context, args []string) error {
@@ -22,19 +20,7 @@ func GetFlag(ctx context.Context, args []string) error {
 		return interp.NewExitStatus(1)
 	}
 
-	value := ""
-	found := false
-	flags.VisitAll(func(f *flag.Flag) {
-		if !found && f.Name == args[0] {
-			sliceType, ok := f.Value.(flag.SliceValue)
-			if ok {
-				value = strings.Join(sliceType.GetSlice(), " ")
-			} else {
-				value = f.Value.String()
-			}
-			found = true
-		}
-	})
+	value, found := flags[args[0]]
 	if !found {
 		_, _ = hc.Stderr.Write([]byte(fmt.Sprintf("couldn't find flag %s", args[0])))
 		return interp.NewExitStatus(1)
diff --git a/pkg/devspace/pipeline/engine/pipelinehandler/commands/run_dependency_pipelines.go b/pkg/devspace/pipeline/engine/pipelinehandler/commands/run_dependency_pipelines.go
@@ -65,7 +65,6 @@ func RunDependencyPipelines(ctx devspacecontext.Context, pipeline types.Pipeline
 	if pluginErr != nil {
 		return pluginErr
 	}
-
 	err = pipeline.StartNewDependencies(ctx, deployDependencies, options.DependencyOptions)
 	if err != nil {
 		return err
diff --git a/pkg/devspace/pipeline/engine/pipelinehandler/commands/run_pipelines.go b/pkg/devspace/pipeline/engine/pipelinehandler/commands/run_pipelines.go
@@ -13,6 +13,7 @@ import (
 
 type RunPipelineOptions struct {
 	types.PipelineOptions
+
 	Set       []string `long:"set" description:"Set configuration"`
 	SetString []string `long:"set-string" description:"Set configuration as string"`
 }
diff --git a/pkg/devspace/pipeline/pipeline.go b/pkg/devspace/pipeline/pipeline.go
@@ -294,48 +294,6 @@ func findDependencies(start types.Pipeline, dependencyName string) types.Pipelin
 	return nil
 }
 
-func (p *pipeline) startNewDependency(ctx devspacecontext.Context, dependency types2.Dependency, options types.DependencyOptions) error {
-	// find the dependency pipeline to execute
-	executePipeline := options.Pipeline
-	if executePipeline == "" {
-		if dependency.DependencyConfig().Pipeline != "" {
-			executePipeline = dependency.DependencyConfig().Pipeline
-		} else {
-			executePipeline = "deploy"
-		}
-	}
-
-	// find pipeline
-	var (
-		pipelineConfig *latest.Pipeline
-		err            error
-	)
-	if dependency.Config().Config().Pipelines == nil || dependency.Config().Config().Pipelines[executePipeline] == nil {
-		pipelineConfig, err = types.GetDefaultPipeline(executePipeline)
-		if err != nil {
-			return err
-		}
-	} else {
-		pipelineConfig = dependency.Config().Config().Pipelines[executePipeline]
-	}
-
-	devCtx, _ := values.DevContextFrom(ctx.Context())
-	devCtxCancel, cancelDevCtx := context.WithCancel(devCtx)
-	ctx = ctx.WithContext(values.WithDevContext(ctx.Context(), devCtxCancel))
-	dependencyDevPodManager := devpod.NewManager(cancelDevCtx)
-	pip := NewPipeline(dependency.Name(), dependencyDevPodManager, p.dependencyRegistry, pipelineConfig, p.options)
-	pip.(*pipeline).parent = p
-
-	p.m.Lock()
-	p.dependencies[dependency.Name()] = pip
-	p.m.Unlock()
-
-	if streamLogger, ok := ctx.Log().(*log.StreamLogger); !ok || streamLogger.GetFormat() != log.RawFormat {
-		ctx = ctx.WithLogger(ctx.Log().WithPrefix(dependency.Name() + " "))
-	}
-	return pip.Run(ctx.AsDependency(dependency), nil)
-}
-
 func (p *pipeline) StartNewPipelines(ctx devspacecontext.Context, pipelines []*latest.Pipeline, options types.PipelineOptions) error {
 	if options.Background {
 		for _, configPipeline := range pipelines {
@@ -375,6 +333,11 @@ func (p *pipeline) StartNewPipelines(ctx devspacecontext.Context, pipelines []*l
 }
 
 func (p *pipeline) startNewPipeline(ctx devspacecontext.Context, configPipeline *latest.Pipeline, id string, options types.PipelineOptions) error {
+	ctx, err := applyFlags(ctx, configPipeline, options.SetFlag)
+	if err != nil {
+		return err
+	}
+
 	// exchange job if it's not alive anymore
 	j, err := p.createJob(configPipeline, id)
 	if err != nil {
@@ -390,6 +353,70 @@ func (p *pipeline) startNewPipeline(ctx devspacecontext.Context, configPipeline
 	return nil
 }
 
+func (p *pipeline) startNewDependency(ctx devspacecontext.Context, dependency types2.Dependency, options types.DependencyOptions) error {
+	// find the dependency pipeline to execute
+	executePipeline := options.Pipeline
+	if executePipeline == "" {
+		if dependency.DependencyConfig().Pipeline != "" {
+			executePipeline = dependency.DependencyConfig().Pipeline
+		} else {
+			executePipeline = "deploy"
+		}
+	}
+
+	// find pipeline
+	var (
+		pipelineConfig *latest.Pipeline
+		err            error
+	)
+	if dependency.Config().Config().Pipelines == nil || dependency.Config().Config().Pipelines[executePipeline] == nil {
+		pipelineConfig, err = types.GetDefaultPipeline(executePipeline)
+		if err != nil {
+			return err
+		}
+	} else {
+		pipelineConfig = dependency.Config().Config().Pipelines[executePipeline]
+	}
+
+	ctx, err = applyFlags(ctx, pipelineConfig, options.SetFlag)
+	if err != nil {
+		return err
+	}
+
+	devCtx, _ := values.DevContextFrom(ctx.Context())
+	devCtxCancel, cancelDevCtx := context.WithCancel(devCtx)
+	ctx = ctx.WithContext(values.WithDevContext(ctx.Context(), devCtxCancel))
+	dependencyDevPodManager := devpod.NewManager(cancelDevCtx)
+	pip := NewPipeline(dependency.Name(), dependencyDevPodManager, p.dependencyRegistry, pipelineConfig, p.options)
+	pip.(*pipeline).parent = p
+
+	p.m.Lock()
+	p.dependencies[dependency.Name()] = pip
+	p.m.Unlock()
+
+	if streamLogger, ok := ctx.Log().(*log.StreamLogger); !ok || streamLogger.GetFormat() != log.RawFormat {
+		ctx = ctx.WithLogger(ctx.Log().WithPrefix(dependency.Name() + " "))
+	}
+	return pip.Run(ctx.AsDependency(dependency), nil)
+}
+
+func applyFlags(ctx devspacecontext.Context, pipeline *latest.Pipeline, setFlags []string) (devspacecontext.Context, error) {
+	newFlags := map[string]string{}
+	for _, flag := range pipeline.Flags {
+		newFlags[flag.Name] = fmt.Sprintf("%v", flag.Default)
+	}
+	for _, v := range setFlags {
+		splitted := strings.Split(v, "=")
+		if len(splitted) <= 1 {
+			return nil, fmt.Errorf("error parsing flag %s: expected format flag=value", v)
+		}
+
+		newFlags[splitted[0]] = strings.Join(splitted[1:], "=")
+	}
+
+	return ctx.WithContext(values.WithFlagsMap(ctx.Context(), newFlags)), nil
+}
+
 func (p *pipeline) createJob(configPipeline *latest.Pipeline, id string) (job *Job, err error) {
 	p.m.Lock()
 	defer p.m.Unlock()
diff --git a/pkg/devspace/pipeline/types/pipeline.go b/pkg/devspace/pipeline/types/pipeline.go
diff --git a/pkg/devspace/services/podreplace/builder.go b/pkg/devspace/services/podreplace/builder.go

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func ExpectRemoteContainerFileContents(labelSelector, container string, namespac`
`157`	`157`	`func ExpectLocalFileContentsImmediately(filePath string, contents string) {`
`158`	`158`	`out, err := ioutil.ReadFile(filePath)`
`159`	`159`	`ExpectNoError(err)`
`160`		`- gomega.ExpectWithOffset(2, string(out)).To(gomega.Equal(contents))`
	`160`	`+ gomega.ExpectWithOffset(1, string(out)).To(gomega.Equal(contents))`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`func ExpectLocalFileContents(filePath string, contents string) {`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,7 @@ var useOldDryRun = func(ctx context.Context, dir, path string) (bool, error) {`
`85`	`85`
`86`	`86`	`v1, err := constraint.NewVersion(strings.TrimPrefix(strings.TrimSpace(string(out)), "Client Version: v"))`
`87`	`87`	`if err != nil {`
`88`		`-`
`89`		`- return false, err`
	`88`	`+ return false, nil`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`v2, err := constraint.NewVersion("1.18.0")`