From 4b4f000cd17965ad2e2574601ecbb9103abbf615 Mon Sep 17 00:00:00 2001
From: Johan de Klerk <johan@shiplogic.com>
Date: Fri, 3 Mar 2023 09:08:47 +0200
Subject: [PATCH] Send in default env for CurrentEnv function

---
 mage_helpers/file_system.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mage_helpers/file_system.go b/mage_helpers/file_system.go
index dd5fb88..b45122a 100644
--- a/mage_helpers/file_system.go
+++ b/mage_helpers/file_system.go
@@ -121,7 +121,7 @@ func CurrentBasePath() string {
 	return base
 }
 
-func CurrentEnv() string {
+func CurrentEnv(defaultEnv ...string) string {
 
 	// Get env from CI commit branch
 	env := os.Getenv("CI_COMMIT_BRANCH")
@@ -142,7 +142,12 @@ func CurrentEnv() string {
 	}
 
 	if env != "dev" && env != "stage" && env != "qa" && env != "sandbox" && env != "prod" && env != "playground" {
-		env = "dev"
+		if defaultEnv != nil && len(defaultEnv) > 0 {
+			forcedEnv := defaultEnv[0]
+			env = forcedEnv
+		} else {
+			env = "dev"
+		}
 	}
 	return env
 }
-- 
GitLab