Filter out env vars for specific commands only

cli/args.go

@@ -144,10 +144,15 @@ func filterTerraformExtraArgs(terragruntOptions *options.TerragruntOptions, terr
 
 func filterTerraformEnvVarsFromExtraArgs(terragruntOptions *options.TerragruntOptions, terragruntConfig *config.TerragruntConfig) map[string]string {
 	out := map[string]string{}
+	cmd := util.FirstArg(terragruntOptions.TerraformCliArgs)
 
 	for _, arg := range terragruntConfig.Terraform.ExtraArgs {
-		for k, v := range arg.EnvVars {
-			out[k] = v
+		for _, argcmd := range arg.Commands {
+			if cmd == argcmd {
+				for k, v := range arg.EnvVars {
+					out[k] = v
+				}
+			}
 		}
 	}
 

test/fixture-env-vars-block/terraform.tfvars

@@ -1,9 +1,19 @@
 terragrunt = {
   terraform = {
     extra_arguments "test" {
+      commands = ["apply"]
       env_vars = {
         TF_VAR_custom_var = "I'm set in extra_arguments env_vars"
       }
     }
+
+    extra_arguments "shouldnotapply" {
+      commands = [ "refresh" ]
+
+      env_vars = {
+        TF_VAR_custom_var = "I'm only set for refresh command, so will be ignored for apply"
+      }
+
+    }
   }
 }