From a51e7aa04061a5c6c811c0cb89ce4e6a16559947 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Thu, 7 Nov 2024 15:03:57 -0600
Subject: [PATCH 1/9] feat(local exec): add ability to skip steps

---
 action/pipeline/exec.go     | 56 +++++++++++++++++++++++++++++++++++++
 action/pipeline/pipeline.go |  1 +
 command/pipeline/exec.go    | 26 +++++++++++++----
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index ae91d641..24e2a88a 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"slices"
 	"strings"
 	"syscall"
 
@@ -114,6 +115,61 @@ func (c *Config) Exec(client compiler.Engine) error {
 		return err
 	}
 
+	// create a slice for steps to be removed
+	stepsToRemove := c.Steps
+
+	// print steps to be removed to the user
+	if len(stepsToRemove) > 0 {
+		for _, stepName := range stepsToRemove {
+			fmt.Println("skip step: ", stepName)
+		}
+	}
+
+	// filter out steps to be removed
+	if len(_pipeline.Stages) > 0 {
+		// if using stages
+
+		// counter for total steps to run
+		totalSteps := 0
+
+		for i, stage := range _pipeline.Stages {
+
+			filteredStageSteps := stage.Steps[:0]
+
+			for _, step := range stage.Steps {
+				// if c.steps contains step.Name
+				if !slices.Contains(stepsToRemove, step.Name) {
+					filteredStageSteps = append(filteredStageSteps, step)
+					totalSteps++
+				}
+
+				_pipeline.Stages[i].Steps = filteredStageSteps
+			}
+		}
+
+		// check if any steps are left to run, excluding "init" step
+		if totalSteps <= 1 {
+			return fmt.Errorf("no steps left to run after removing skipped steps")
+		}
+
+	} else {
+		// if not using stages
+
+		filteredSteps := _pipeline.Steps[:0]
+
+		for _, step := range _pipeline.Steps {
+			if !slices.Contains(stepsToRemove, step.Name) {
+				filteredSteps = append(filteredSteps, step)
+			}
+		}
+		_pipeline.Steps = filteredSteps
+
+		// check if any steps are left to run, excluding "init" step
+		if len(_pipeline.Steps) <= 1 {
+			return fmt.Errorf("no steps left to run after removing skipped steps")
+		}
+	}
+
 	// create current directory path for local mount
 	mount := fmt.Sprintf("%s:%s:rw", base, constants.WorkspaceDefault)
 
diff --git a/action/pipeline/pipeline.go b/action/pipeline/pipeline.go
index 8eb6bad1..799e7efa 100644
--- a/action/pipeline/pipeline.go
+++ b/action/pipeline/pipeline.go
@@ -16,6 +16,7 @@ type Config struct {
 	Target           string
 	Org              string
 	Repo             string
+	Steps            []string
 	Ref              string
 	File             string
 	FileChangeset    []string
diff --git a/command/pipeline/exec.go b/command/pipeline/exec.go
index 8eeb0513..e2aa1f16 100644
--- a/command/pipeline/exec.go
+++ b/command/pipeline/exec.go
@@ -134,6 +134,15 @@ var CommandExec = &cli.Command{
 			Value:   constants.PipelineTypeYAML,
 		},
 
+		// Step Flags
+
+		&cli.StringSliceFlag{
+			EnvVars: []string{"VELA_SKIP_STEP", "SKIP_STEP"},
+			Name:    "skip-step",
+			Aliases: []string{"sk", "skip"},
+			Usage:   "skip a step in the pipeline",
+		},
+
 		// Compiler Template Flags
 
 		&cli.StringFlag{
@@ -151,7 +160,7 @@ var CommandExec = &cli.Command{
 		&cli.StringSliceFlag{
 			EnvVars: []string{"VELA_TEMPLATE_FILE", "PIPELINE_TEMPLATE_FILE"},
 			Name:    "template-file",
-			Aliases: []string{"tf, tfs, template-files"},
+			Aliases: []string{"tf", "tfs", "template-files"},
 			Usage:   "enables using a local template file for expansion in the form <name>:<path>",
 		},
 		&cli.IntFlag{
@@ -218,17 +227,21 @@ EXAMPLES:
     $ {{.HelpName}} --volume /tmp/bar.txt:/tmp/bar.txt:rw
   7. Execute a local Vela pipeline with type of go
     $ {{.HelpName}} --pipeline-type go
-  8. Execute a local Vela pipeline with local templates
+  8. Execute a local Vela pipeline with specific step skipped
+    $ {{.HelpName}} --skip-step echo_hello --skip-step 'echo goodbye'
+  9. Execute a local Vela pipeline with specific template step skipped
+    $ {{.HelpName}} --skip-step <template name>_echo_hello --skip-step '<template name>_echo goodbye'
+  10. Execute a local Vela pipeline with local templates
     $ {{.HelpName}} --template-file <template_name>:<path_to_template>
-  9. Execute a local Vela pipeline with specific environment variables
+  11. Execute a local Vela pipeline with specific environment variables
     $ {{.HelpName}} --env KEY1=VAL1,KEY2=VAL2
-  10. Execute a local Vela pipeline with your existing local environment loaded into pipeline
+  12. Execute a local Vela pipeline with your existing local environment loaded into pipeline
     $ {{.HelpName}} --local-env
-  11. Execute a local Vela pipeline with an environment file loaded in
+  13. Execute a local Vela pipeline with an environment file loaded in
     $ {{.HelpName}} --env-file (uses .env by default)
       OR
     $ {{.HelpName}} --env-file-path <path_to_file>
-  12. Execute a local Vela pipeline using remote templates
+  14. Execute a local Vela pipeline using remote templates
     $ {{.HelpName}} --compiler.github.token <GITHUB_PAT> --compiler.github.url <GITHUB_URL>
 
 DOCUMENTATION:
@@ -296,6 +309,7 @@ func exec(c *cli.Context) error {
 		Target:           c.String("target"),
 		Org:              c.String(internal.FlagOrg),
 		Repo:             c.String(internal.FlagRepo),
+		Steps:            c.StringSlice("skip-step"),
 		File:             c.String("file"),
 		FileChangeset:    c.StringSlice("file-changeset"),
 		TemplateFiles:    c.StringSlice("template-file"),

From 2cfe59bd531967053f85bdfee930e7b4a9b977f5 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Thu, 7 Nov 2024 15:45:30 -0600
Subject: [PATCH 2/9] addressing linter errors

---
 action/pipeline/exec.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index 24e2a88a..c9f438be 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -131,7 +131,6 @@ func (c *Config) Exec(client compiler.Engine) error {
 
 		// counter for total steps to run
 		totalSteps := 0
-
 		for i, stage := range _pipeline.Stages {
 
 			filteredStageSteps := stage.Steps[:0]
@@ -151,10 +150,8 @@ func (c *Config) Exec(client compiler.Engine) error {
 		if totalSteps <= 1 {
 			return fmt.Errorf("no steps left to run after removing skipped steps")
 		}
-
 	} else {
 		// if not using stages
-
 		filteredSteps := _pipeline.Steps[:0]
 
 		for _, step := range _pipeline.Steps {
@@ -162,6 +159,7 @@ func (c *Config) Exec(client compiler.Engine) error {
 				filteredSteps = append(filteredSteps, step)
 			}
 		}
+
 		_pipeline.Steps = filteredSteps
 
 		// check if any steps are left to run, excluding "init" step

From 7d8f639dd1f6e00858cf8bc7b343875fe9f113f4 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Thu, 7 Nov 2024 15:50:37 -0600
Subject: [PATCH 3/9] addressing linter errors

---
 action/pipeline/exec.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index c9f438be..648d2da7 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -128,11 +128,10 @@ func (c *Config) Exec(client compiler.Engine) error {
 	// filter out steps to be removed
 	if len(_pipeline.Stages) > 0 {
 		// if using stages
-
 		// counter for total steps to run
 		totalSteps := 0
-		for i, stage := range _pipeline.Stages {
 
+		for i, stage := range _pipeline.Stages {
 			filteredStageSteps := stage.Steps[:0]
 
 			for _, step := range stage.Steps {

From 1bfd7ab8bffe12a98bf9fa8fc7981f92430f7fff Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 09:12:46 -0600
Subject: [PATCH 4/9] address feedback

---
 action/pipeline/exec.go     | 6 +++++-
 action/pipeline/pipeline.go | 2 +-
 command/pipeline/exec.go    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index 648d2da7..ee0baae6 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -116,7 +116,7 @@ func (c *Config) Exec(client compiler.Engine) error {
 	}
 
 	// create a slice for steps to be removed
-	stepsToRemove := c.Steps
+	stepsToRemove := c.SkipSteps
 
 	// print steps to be removed to the user
 	if len(stepsToRemove) > 0 {
@@ -137,6 +137,8 @@ func (c *Config) Exec(client compiler.Engine) error {
 			for _, step := range stage.Steps {
 				// if c.steps contains step.Name
 				if !slices.Contains(stepsToRemove, step.Name) {
+					fmt.Println("skip step: ", stepsToRemove)
+
 					filteredStageSteps = append(filteredStageSteps, step)
 					totalSteps++
 				}
@@ -155,6 +157,8 @@ func (c *Config) Exec(client compiler.Engine) error {
 
 		for _, step := range _pipeline.Steps {
 			if !slices.Contains(stepsToRemove, step.Name) {
+				fmt.Println("skip step: ", stepsToRemove)
+
 				filteredSteps = append(filteredSteps, step)
 			}
 		}
diff --git a/action/pipeline/pipeline.go b/action/pipeline/pipeline.go
index 799e7efa..abe8ee4f 100644
--- a/action/pipeline/pipeline.go
+++ b/action/pipeline/pipeline.go
@@ -16,7 +16,7 @@ type Config struct {
 	Target           string
 	Org              string
 	Repo             string
-	Steps            []string
+	SkipSteps        []string
 	Ref              string
 	File             string
 	FileChangeset    []string
diff --git a/command/pipeline/exec.go b/command/pipeline/exec.go
index e2aa1f16..8651052b 100644
--- a/command/pipeline/exec.go
+++ b/command/pipeline/exec.go
@@ -309,7 +309,7 @@ func exec(c *cli.Context) error {
 		Target:           c.String("target"),
 		Org:              c.String(internal.FlagOrg),
 		Repo:             c.String(internal.FlagRepo),
-		Steps:            c.StringSlice("skip-step"),
+		SkipSteps:        c.StringSlice("skip-step"),
 		File:             c.String("file"),
 		FileChangeset:    c.StringSlice("file-changeset"),
 		TemplateFiles:    c.StringSlice("template-file"),

From b6fe6133c06e183cc1f949b38717939e89ea102d Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 11:19:04 -0600
Subject: [PATCH 5/9] addressing feedback

---
 action/pipeline/exec.go | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index ee0baae6..f8158b11 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -118,16 +118,8 @@ func (c *Config) Exec(client compiler.Engine) error {
 	// create a slice for steps to be removed
 	stepsToRemove := c.SkipSteps
 
-	// print steps to be removed to the user
-	if len(stepsToRemove) > 0 {
-		for _, stepName := range stepsToRemove {
-			fmt.Println("skip step: ", stepName)
-		}
-	}
-
 	// filter out steps to be removed
 	if len(_pipeline.Stages) > 0 {
-		// if using stages
 		// counter for total steps to run
 		totalSteps := 0
 
@@ -137,8 +129,6 @@ func (c *Config) Exec(client compiler.Engine) error {
 			for _, step := range stage.Steps {
 				// if c.steps contains step.Name
 				if !slices.Contains(stepsToRemove, step.Name) {
-					fmt.Println("skip step: ", stepsToRemove)
-
 					filteredStageSteps = append(filteredStageSteps, step)
 					totalSteps++
 				}
@@ -157,12 +147,17 @@ func (c *Config) Exec(client compiler.Engine) error {
 
 		for _, step := range _pipeline.Steps {
 			if !slices.Contains(stepsToRemove, step.Name) {
-				fmt.Println("skip step: ", stepsToRemove)
-
 				filteredSteps = append(filteredSteps, step)
 			}
 		}
 
+		// print steps to be removed to the user
+		if len(stepsToRemove) > 0 {
+			for _, stepName := range stepsToRemove {
+				fmt.Println("skip step5: ", stepName)
+			}
+		}
+
 		_pipeline.Steps = filteredSteps
 
 		// check if any steps are left to run, excluding "init" step

From bb78239bcee2b91fadf3a1dd3c9d2c053410eaf8 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 11:27:30 -0600
Subject: [PATCH 6/9] remove troubleshooting reference

---
 action/pipeline/exec.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index f8158b11..6958348f 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -154,7 +154,7 @@ func (c *Config) Exec(client compiler.Engine) error {
 		// print steps to be removed to the user
 		if len(stepsToRemove) > 0 {
 			for _, stepName := range stepsToRemove {
-				fmt.Println("skip step5: ", stepName)
+				fmt.Println("skip step: ", stepName)
 			}
 		}
 

From 8b19480fbc115e572d1bfdc6d1bd5ef101c18798 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 14:46:54 -0600
Subject: [PATCH 7/9] move new code to new func skipSteps

---
 action/pipeline/exec.go | 98 +++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index 6958348f..753f08d3 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -17,6 +17,7 @@ import (
 	"github.com/go-vela/cli/version"
 	api "github.com/go-vela/server/api/types"
 	"github.com/go-vela/server/compiler"
+	"github.com/go-vela/server/compiler/types/pipeline"
 	"github.com/go-vela/server/constants"
 	"github.com/go-vela/worker/executor"
 	"github.com/go-vela/worker/runtime"
@@ -118,52 +119,16 @@ func (c *Config) Exec(client compiler.Engine) error {
 	// create a slice for steps to be removed
 	stepsToRemove := c.SkipSteps
 
-	// filter out steps to be removed
-	if len(_pipeline.Stages) > 0 {
-		// counter for total steps to run
-		totalSteps := 0
-
-		for i, stage := range _pipeline.Stages {
-			filteredStageSteps := stage.Steps[:0]
-
-			for _, step := range stage.Steps {
-				// if c.steps contains step.Name
-				if !slices.Contains(stepsToRemove, step.Name) {
-					filteredStageSteps = append(filteredStageSteps, step)
-					totalSteps++
-				}
-
-				_pipeline.Stages[i].Steps = filteredStageSteps
-			}
-		}
-
-		// check if any steps are left to run, excluding "init" step
-		if totalSteps <= 1 {
-			return fmt.Errorf("no steps left to run after removing skipped steps")
+	// print steps to be removed to the user
+	if len(stepsToRemove) > 0 {
+		for _, stepName := range stepsToRemove {
+			fmt.Println("skip step: ", stepName)
 		}
-	} else {
-		// if not using stages
-		filteredSteps := _pipeline.Steps[:0]
-
-		for _, step := range _pipeline.Steps {
-			if !slices.Contains(stepsToRemove, step.Name) {
-				filteredSteps = append(filteredSteps, step)
-			}
-		}
-
-		// print steps to be removed to the user
-		if len(stepsToRemove) > 0 {
-			for _, stepName := range stepsToRemove {
-				fmt.Println("skip step: ", stepName)
-			}
-		}
-
-		_pipeline.Steps = filteredSteps
+	}
 
-		// check if any steps are left to run, excluding "init" step
-		if len(_pipeline.Steps) <= 1 {
-			return fmt.Errorf("no steps left to run after removing skipped steps")
-		}
+	// call the skipSteps function
+	if err := skipSteps(_pipeline, stepsToRemove); err != nil {
+		return err
 	}
 
 	// create current directory path for local mount
@@ -266,3 +231,48 @@ func (c *Config) Exec(client compiler.Engine) error {
 
 	return nil
 }
+
+// skipSteps filters out steps to be removed from the pipeline.
+func skipSteps(_pipeline *pipeline.Build, stepsToRemove []string) error {
+	// filter out steps to be removed
+	if len(_pipeline.Stages) > 0 {
+		// counter for total steps to run
+		totalSteps := 0
+
+		for i, stage := range _pipeline.Stages {
+			filteredStageSteps := stage.Steps[:0]
+
+			for _, step := range stage.Steps {
+				if !slices.Contains(stepsToRemove, step.Name) {
+					filteredStageSteps = append(filteredStageSteps, step)
+					totalSteps++
+				}
+			}
+
+			_pipeline.Stages[i].Steps = filteredStageSteps
+		}
+
+		// check if any steps are left to run, excluding "init" step
+		if totalSteps <= 1 {
+			return fmt.Errorf("no steps left to run after removing skipped steps")
+		}
+	} else {
+		// if not using stages
+		filteredSteps := _pipeline.Steps[:0]
+
+		for _, step := range _pipeline.Steps {
+			if !slices.Contains(stepsToRemove, step.Name) {
+				filteredSteps = append(filteredSteps, step)
+			}
+		}
+
+		_pipeline.Steps = filteredSteps
+
+		// check if any steps are left to run, excluding "init" step
+		if len(_pipeline.Steps) <= 1 {
+			return fmt.Errorf("no steps left to run after removing skipped steps")
+		}
+	}
+
+	return nil
+}

From d0deedd561e9590de759b68900004ae2b61f2016 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 15:13:20 -0600
Subject: [PATCH 8/9] move calling of skipSteps

---
 action/pipeline/exec.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index 753f08d3..7a556e8b 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -119,16 +119,15 @@ func (c *Config) Exec(client compiler.Engine) error {
 	// create a slice for steps to be removed
 	stepsToRemove := c.SkipSteps
 
-	// print steps to be removed to the user
+	// print and remove steps
 	if len(stepsToRemove) > 0 {
 		for _, stepName := range stepsToRemove {
 			fmt.Println("skip step: ", stepName)
 		}
-	}
 
-	// call the skipSteps function
-	if err := skipSteps(_pipeline, stepsToRemove); err != nil {
-		return err
+		if err := skipSteps(_pipeline, stepsToRemove); err != nil {
+			return err
+		}
 	}
 
 	// create current directory path for local mount

From 53f93fa36e63838459880f68b3cd970f32737c40 Mon Sep 17 00:00:00 2001
From: Kelly Merrick <kelly.merrick@target.com>
Date: Tue, 7 Jan 2025 15:37:36 -0600
Subject: [PATCH 9/9] use logrus to print to user

---
 action/pipeline/exec.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action/pipeline/exec.go b/action/pipeline/exec.go
index 7a556e8b..2217408c 100644
--- a/action/pipeline/exec.go
+++ b/action/pipeline/exec.go
@@ -122,7 +122,7 @@ func (c *Config) Exec(client compiler.Engine) error {
 	// print and remove steps
 	if len(stepsToRemove) > 0 {
 		for _, stepName := range stepsToRemove {
-			fmt.Println("skip step: ", stepName)
+			logrus.Info("skipping step: ", stepName)
 		}
 
 		if err := skipSteps(_pipeline, stepsToRemove); err != nil {