[Feature] Add support for multiple env files

v2/ahoy.go

@@ -24,7 +24,7 @@ type Config struct {
 	AhoyAPI    string
 	Commands   map[string]Command
 	Entrypoint []string
-	Env        string
+	Env        []string
 }
 
 // Command is an ahoy command detailed in ahoy.yml files. Multiple
@@ -33,7 +33,7 @@ type Command struct {
 	Description string
 	Usage       string
 	Cmd         string
-	Env         string
+	Env         []string
 	Hide        bool
 	Optional    bool
 	Imports     []string
@@ -202,9 +202,11 @@ func getCommands(config Config) []cli.Command {
 	envVars := []string{}
 
 	// Get environment variables from the 'global' environment variable file, if it is defined.
-	if config.Env != "" {
-		globalEnvFile := filepath.Join(AhoyConf.srcDir, config.Env)
-		envVars = append(envVars, getEnvironmentVars(globalEnvFile)...)
+	if config.Env != nil {
+		for _, file := range config.Env {
+			globalEnvFile := filepath.Join(AhoyConf.srcDir, file)
+			envVars = append(envVars, getEnvironmentVars(globalEnvFile)...)
+		}
 	}
 
 	var keys []string
@@ -274,9 +276,12 @@ func getCommands(config Config) []cli.Command {
 				// If defined, included specified command-level environment variables.
 				// Note that this will intentionally override any conflicting variables
 				// defined in the 'global' env file.
-				if cmd.Env != "" {
-					cmdEnvFile := filepath.Join(AhoyConf.srcDir, cmd.Env)
-					envVars = append(envVars, getEnvironmentVars(cmdEnvFile)...)
+				if cmd.Env != nil {
+					for _, file := range cmd.Env {
+						cmdEnvFile := filepath.Join(AhoyConf.srcDir, file)
+						envVars = append(envVars, getEnvironmentVars(cmdEnvFile)...)
+
+					}
 				}
 
 				if verbose {

v2/testdata/.env.local1

@@ -0,0 +1,2 @@
+UNIQUE=unique
+TO_BE_OVERRIDDEN=local1

v2/testdata/.env.local2

@@ -0,0 +1 @@
+TO_BE_OVERRIDDEN=local2

v2/testdata/env-multiple.ahoy.yml

@@ -0,0 +1,21 @@
+ahoyapi: v2
+env:
+  - .env
+  - .env.cmd
+commands:
+  test-global:
+    cmd: echo $GLOBAL
+  test-command:
+    cmd: echo $COMMAND 
+  test-overridden:
+    cmd: echo $TO_BE_OVERRIDDEN
+  test-cmd-multiple-1:
+    cmd: echo $UNIQUE
+    env:
+      - .env.local1
+      - .env.local2
+  test-cmd-multiple-2:
+    cmd: echo $TO_BE_OVERRIDDEN 
+    env:
+      - .env.local1
+      - .env.local2

v2/testdata/env.ahoy.yml

@@ -1,17 +1,21 @@
 ahoyapi: v2
-env: ./.env
+env: 
+  - .env
 commands:
   test-global:
     cmd: echo $GLOBAL
 
   test-cmd:
     cmd: echo $COMMAND
-    env: .env.cmd
+    env:
+      - .env.cmd
 
   test-override:
     cmd: echo $TO_BE_OVERRIDDEN
-    env: .env.cmd
+    env: 
+      - .env.cmd
 
   test-invalid-env:
     cmd: echo "This should not print!" 
-    env: .env.thisfiledoesntexist
+    env: 
+      - .env.thisfiledoesntexist

v2/tests/environment-variables.bats

@@ -19,3 +19,25 @@
     run ./ahoy -f testdata/env.ahoy.yml test-invalid-env
     [ $status -eq 1 ]
 }
+
+@test "Multiple global env files can be defined" {
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-global
+    [[ "$output" = "global" ]]
+
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-command
+    [[ "$output" = "123456789" ]]
+
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-overridden
+    [[ "$output" = "after" ]]
+}
+
+@test "Multiple command env files can be defined" {
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-cmd-multiple-1
+    echo $output
+    [[ "$output" = "unique" ]]
+
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-cmd-multiple-2
+    echo $output
+    [[ "$output" = "local2" ]]
+}
+