Merge pull request #2223 from FabianKramm/main

refactor: allow arbitrary pipeline args
devspace-sh · Aug 15, 2022 · 1b97023 · 1b97023
2 parents 6f85879 + b0b323e
commit 1b97023
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -28,7 +28,6 @@ devspace deploy
 devspace deploy -n some-namespace
 devspace deploy --kube-context=deploy-context
 #######################################################`,
-		Args: cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			return cmd.Run(cobraCmd, args, f, "deployCommand")
 		},

diff --git a/cmd/dev.go b/cmd/dev.go
@@ -23,7 +23,6 @@ func NewDevCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *Raw
 #######################################################
 Starts your project in development mode
 #######################################################`,
-		Args: cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			return cmd.Run(cobraCmd, args, f, "devCommand")
 		},

diff --git a/cmd/purge.go b/cmd/purge.go
@@ -26,7 +26,6 @@ Deletes the deployed kubernetes resources:
 
 devspace purge
 #######################################################`,
-		Args: cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			return cmd.Run(cobraCmd, args, f, "purgeCommand")
 		},

diff --git a/cmd/run_pipeline.go b/cmd/run_pipeline.go
@@ -210,18 +210,11 @@ func (cmd *RunPipelineCmd) RunDefault(f factory.Factory) error {
 
 // Run executes the command logic
 func (cmd *RunPipelineCmd) Run(cobraCmd *cobra.Command, args []string, f factory.Factory, hookName string) error {
-	dashArgs := []string{}
-	if cobraCmd != nil && cobraCmd.ArgsLenAtDash() > -1 {
-		dashArgs = args[cobraCmd.ArgsLenAtDash():]
-		args = args[:cobraCmd.ArgsLenAtDash()]
-	}
-
-	if len(args) > 1 {
-		return fmt.Errorf("please specify only 1 pipeline to execute (got %v). E.g. devspace run-pipeline my-pipe -- other args", args)
-	} else if len(args) == 0 && cmd.Pipeline == "" {
+	if len(args) == 0 && cmd.Pipeline == "" {
 		return fmt.Errorf("please specify a pipeline through --pipeline or argument")
-	} else if len(args) == 1 && cmd.Pipeline == "" {
+	} else if len(args) > 0 && cmd.Pipeline == "" {
 		cmd.Pipeline = args[0]
+		args = args[1:]
 	}
 
 	if cmd.Log == nil {
@@ -259,7 +252,7 @@ func (cmd *RunPipelineCmd) Run(cobraCmd *cobra.Command, args []string, f factory
 	}
 
 	return runWithHooks(ctx, hookName, func() error {
-		return runPipeline(ctx, dashArgs, options)
+		return runPipeline(ctx, args, options)
 	})
 }