Update handling of Terraform environment variables

cloudposse · Jan 2, 2025 · 971be07 · 971be07
1 parent 0cbee45
commit 971be07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/exec/shell_utils.go b/internal/exec/shell_utils.go
@@ -193,10 +193,11 @@ func execTerraformShellCommand(
 		envVar := fmt.Sprintf("TF_CLI_ARGS_%s", cmd)
 		existing := os.Getenv(envVar)
 		if existing != "" {
+			u.LogWarning(atmosConfig, fmt.Sprintf("Found Terraform environment variable '%s' which may conflict with or be overwritten by Atmos", envVar))
 			// Remove any surrounding quotes from existing value
 			existing = strings.Trim(existing, "\"")
 			// Create new value by combining existing and new var-file argument
-			newValue := fmt.Sprintf("%s -var-file=%s", existing, varFile)
+			newValue := fmt.Sprintf("\"%s -var-file=%s\"", existing, varFile)
 			componentEnvList = append(componentEnvList, fmt.Sprintf("%s=%s", envVar, newValue))
 		} else {
 			componentEnvList = append(componentEnvList, fmt.Sprintf("%s=-var-file=%s", envVar, varFile))
@@ -245,7 +246,7 @@ func execTerraformShellCommand(
 	pa := os.ProcAttr{
 		Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
 		Dir:   componentPath,
-		Env:   append(os.Environ(), componentEnvList...),
+		Env:   append(componentEnvList, os.Environ()...), // Give priority to Atmos defined env vars
 	}
 
 	// Start a new shell

diff --git a/internal/exec/terraform.go b/internal/exec/terraform.go
@@ -235,7 +235,7 @@ func ExecuteTerraform(info schema.ConfigAndStacksInfo) error {
 	for _, envVar := range os.Environ() {
 		if strings.HasPrefix(envVar, "TF_") {
 			varName := strings.Split(envVar, "=")[0]
-			u.LogWarning(atmosConfig, fmt.Sprintf("Found Terraform environment variable '%s' which may conflict with Atmos", varName))
+			u.LogWarning(atmosConfig, fmt.Sprintf("Found Terraform environment variable '%s' which may conflict with or be overwritten by Atmos", varName))
 		}
 	}