fixup! vendor credentials is env-vars for execute

internal/apply/apply.go

@@ -77,11 +77,18 @@ func applyAll(dir string, projectConfig projectconfig.ZeroProjectConfig, applyEn
 			modulePath = filepath.Join(dir, modulePath)
 		}
 
+		// TODO: in the case user lost the `/tmp` (module source dir), this will fail
+		// and we should redownload the module for the user
+		modConfig, err := module.ParseModuleConfig(modulePath)
+		if err != nil {
+			exit.Fatal("Failed to load module config, credentials cannot be injected properly")
+		}
+
 		// Get project credentials for the makefile
 		credentials := globalconfig.GetProjectCredentials(projectConfig.Name)
-
+		credentialEnvs := credentials.SelectedVendorsCredentialsAsEnv(modConfig.RequiredCredentials)
 		envList = util.AppendProjectEnvToCmdEnv(mod.Parameters, envList)
-		envList = util.AppendProjectEnvToCmdEnv(credentials.AsEnvVars(), envList)
+		envList = util.AppendProjectEnvToCmdEnv(credentialEnvs, envList)
 		util.ExecuteCommand(exec.Command("make"), modulePath, envList)
 		return nil
 	})

internal/config/globalconfig/global_config_test.go

@@ -161,4 +161,9 @@ func TestMarshalSelectedVendorsCredentialsAsEnv(t *testing.T) {
 		assert.Equal(t, false, hasCircleCIKey)
 	})
 
+	t.Run("omits vendors not selected", func(t *testing.T) {
+		envs := pc.SelectedVendorsCredentialsAsEnv([]string{})
+		assert.Equal(t, 0, len(envs))
+	})
+
 }

tests/test_data/apply/project1/zero-module.yml

@@ -0,0 +1,19 @@
+name: project1
+description: 'project1'
+author: 'Commit'
+
+template:
+  strictMode: true
+  delimiters:
+    - "<%"
+    - "%>"
+  inputDir: '.'
+  outputDir: 'test'
+
+requiredCredentials:
+  - aws
+  - github
+
+parameters:
+  - field: foo
+    label: foo

tests/test_data/apply/project2/zero-module.yml

@@ -0,0 +1,19 @@
+name: project2
+description: 'project2'
+author: 'Commit'
+
+template:
+  strictMode: true
+  delimiters:
+    - "<%"
+    - "%>"
+  inputDir: '.'
+  outputDir: 'test'
+
+requiredCredentials:
+  - aws
+  - github
+
+parameters:
+  - field: baz
+    label: baz