Fix Exec task command line arguments for Terraform variables

ayltai · Jul 8, 2020 · dc6e361 · dc6e361
1 parent 47d7053
commit dc6e361
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 }
 
 group 'com.github.ayltai'
-version '0.2.10'
+version '0.2.11'
 
 sourceCompatibility = 8
 targetCompatibility = 8

diff --git a/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java b/src/main/java/com/github/ayltai/gradle/plugin/BaseApplyTask.java
@@ -87,7 +87,11 @@ protected List<String> getCommandLineArgs() {
         if (!this.variables.isEmpty()) {
             this.variables.forEach(variable -> {
                 args.addAll(variable.files.stream().map(file -> "-var-file=" + file.getAbsolutePath()).collect(Collectors.toList()));
-                args.addAll(variable.vars.stream().map(var -> String.format(Locale.US, "-var '%1$s=%2$s'", var.name, var.value)).collect(Collectors.toList()));
+
+                variable.vars.forEach(var -> {
+                    args.add("-var");
+                    args.add(String.format(Locale.US, "'%1$s=%2$s'", var.name, var.value));
+                });
             });
         }