Merge pull request #2045 from FabianKramm/master

refactor: fix --from-file & rename run_dependency_pipelines

Author: FabianKramm

cmd/init.go

@@ -443,14 +443,15 @@ echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
 
 	// Add pipeline: dev
 	config.Pipelines["dev"] = &latest.Pipeline{
-		Run: `run_dependency_pipelines --all    # 1. Deploy any projects this project needs (see "dependencies")
-create_deployments --all          # 2. Deploy Helm charts and manifests specfied as "deployments"
+		Run: `
+run_dependencies --all     # 1. Deploy any projects this project needs (see "dependencies")
+create_deployments --all   # 2. Deploy Helm charts and manifests specfied as "deployments"
 start_dev ` + imageName + `                     # 3. Start dev mode "` + imageName + `" (see "dev" section)`,
 	}
 
 	// Add pipeline: dev
 	config.Pipelines["deploy"] = &latest.Pipeline{
-		Run: `run_dependency_pipelines --all                    # 1. Deploy any projects this project needs (see "dependencies")
+		Run: `run_dependencies --all                    # 1. Deploy any projects this project needs (see "dependencies")
 build_images --all -t $(git describe --always)    # 2. Build, tag (git commit hash) and push all images (see "images")
 create_deployments --all                          # 3. Deploy Helm charts and manifests specfied as "deployments"`,
 	}

e2e/tests/dependencies/testdata/git/devspace.yaml

@@ -15,6 +15,6 @@ dependencies:
 pipelines:
   dev:
     run: |-
-      run_dependency_pipelines dependency
-      run_dependency_pipelines dependency-deploy > dependency.txt
+      run_dependencies dependency
+      run_dependencies dependency-deploy > dependency.txt
       dep-test > imports.txt

e2e/tests/dependencies/testdata/wait/dep1.yaml

@@ -7,7 +7,7 @@ dependencies:
 
 pipelines:
   deploy: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     # We use dep2 here because we don't know if dep1 or dep2 finishs first
     echo "dep2" >> out.txt
 

e2e/tests/dependencies/testdata/wait/dep2.yaml

@@ -7,6 +7,6 @@ dependencies:
 
 pipelines:
   deploy: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     echo "dep2" >> out.txt
 

e2e/tests/dependencies/testdata/wait/devspace.yaml

@@ -9,6 +9,6 @@ dependencies:
 
 pipelines:
   dev: |-
-    run_dependency_pipelines --all
+    run_dependencies --all
     echo "wait" >> out.txt
 

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

@@ -22,7 +22,7 @@ pipelines:
       echo ${devspace.name} > name.txt
       echo ${DEVSPACE_TMPDIR} > temp.txt
       
-      run_dependency_pipelines --all > dependency.txt
+      run_dependencies --all > dependency.txt
       
       run_pipelines import1 > import1.txt
       run_pipelines import2 > import2.txt

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -163,9 +163,9 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 		}
 
 		if !dep.Disabled {
-			deployPipeline += "run_dependency_pipelines " + name + "\n"
-			buildPipeline += "run_dependency_pipelines " + name + " --pipeline build\n"
-			purgePipeline += "run_dependency_pipelines " + name + " --pipeline purge\n"
+			deployPipeline += "run_dependencies " + name + "\n"
+			buildPipeline += "run_dependencies " + name + " --pipeline build\n"
+			purgePipeline += "run_dependencies " + name + " --pipeline purge\n"
 		}
 	}
 

pkg/devspace/pipeline/engine/pipelinehandler/commands/create_deployments.go

@@ -74,7 +74,7 @@ func CreateDeployments(ctx devspacecontext.Context, pipeline types.Pipeline, arg
 }
 
 func applySetValues(ctx devspacecontext.Context, name, objName string, set, setString, from, fromFiles []string) (devspacecontext.Context, error) {
-	if len(set) == 0 && len(setString) == 0 && len(from) == 0 {
+	if len(set) == 0 && len(setString) == 0 && len(from) == 0 && len(fromFiles) == 0 {
 		return ctx, nil
 	}
 

pkg/devspace/pipeline/engine/pipelinehandler/commands/run_dependency_pipelines.go

@@ -19,7 +19,7 @@ type RunDependencyPipelinesOptions struct {
 }
 
 func RunDependencyPipelines(ctx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
-	ctx.Log().Debugf("run_dependency_pipelines %s", strings.Join(args, " "))
+	ctx.Log().Debugf("run_dependencies %s", strings.Join(args, " "))
 	err := pipeline.Exclude(ctx)
 	if err != nil {
 		return err
@@ -57,7 +57,7 @@ func RunDependencyPipelines(ctx devspacecontext.Context, pipeline types.Pipeline
 			}
 		}
 	} else {
-		return fmt.Errorf("either specify 'run_dependency_pipelines --all' or 'run_dependency_pipelines dep1 dep2'")
+		return fmt.Errorf("either specify 'run_dependencies --all' or 'run_dependencies dep1 dep2'")
 	}
 
 	// run hooks & deploy dependencies

pkg/devspace/pipeline/engine/pipelinehandler/handler.go

@@ -57,6 +57,9 @@ var PipelineCommands = map[string]func(devCtx devspacecontext.Context, pipeline
 	"stop_dev": func(devCtx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
 		return commands.StopDev(devCtx, pipeline, args)
 	},
+	"run_dependencies": func(devCtx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
+		return commands.RunDependencyPipelines(devCtx, pipeline, args)
+	},
 	"run_dependency_pipelines": func(devCtx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
 		return commands.RunDependencyPipelines(devCtx, pipeline, args)
 	},