From 3e45e4f861763ba20730813788b26df6e54869d0 Mon Sep 17 00:00:00 2001
From: Yash Mehrotra <yashmehrotra95@gmail.com>
Date: Tue, 8 Oct 2024 10:34:16 +0530
Subject: [PATCH] chore(playbook): allow git and env templating in params

---
 .gitignore                  | 3 ++-
 cmd/playbook.go             | 3 +++
 playbook/runner/template.go | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3a72b906..b224bb3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,10 @@ charts/.devenv*
 devenv.local.nix
 ginkgo.report
 mission-control.properties
+test.properties
 cover.out
 coverprofile.out
 *.test
 junit-report.xml
 nohup.out
-.envrc
\ No newline at end of file
+.envrc
diff --git a/cmd/playbook.go b/cmd/playbook.go
index fb6902170..4d8eee086 100644
--- a/cmd/playbook.go
+++ b/cmd/playbook.go
@@ -133,6 +133,7 @@ var Run = &cobra.Command{
 		run, err := playbook.Run(ctx, p, *params)
 		if err != nil {
 			logger.Errorf("%+v", err)
+			shutdown.ShutdownAndExit(1, err.Error())
 			return
 		}
 
@@ -146,11 +147,13 @@ var Run = &cobra.Command{
 		action, step, err = runner.GetNextActionToRun(ctx, *run)
 		if err != nil {
 			logger.Fatalf(err.Error())
+			shutdown.ShutdownAndExit(1, err.Error())
 			return
 		}
 
 		if action == nil {
 			logger.Errorf("No actions to run")
+			shutdown.ShutdownAndExit(1, err.Error())
 			return
 		}
 
diff --git a/playbook/runner/template.go b/playbook/runner/template.go
index 23f429208..966d3b468 100644
--- a/playbook/runner/template.go
+++ b/playbook/runner/template.go
@@ -106,11 +106,6 @@ func CreateTemplateEnv(ctx context.Context, playbook *models.Playbook, run *mode
 		}
 	}
 
-	// We are just crafting the template for param rendering
-	if run.ID == uuid.Nil {
-		return templateEnv, nil
-	}
-
 	if gitOpsEnvVar, err := getGitOpsTemplateVars(ctx, *run, spec.Actions); err != nil {
 		return templateEnv, oops.Wrapf(err, "failed to get gitops vars")
 	} else if gitOpsEnvVar != nil {