Merge pull request #11 from AzBuilder/terraform-ouput

Support Terraform Ouput and Show in json
AzBuilder · Oct 22, 2021 · 4bd2c32 · 4bd2c32
2 parents e2b8fe1 + 82efdaa
commit 4bd2c32
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.5.0-beta.2</revision>
+    <revision>0.5.0-beta.3</revision>
     <sonar.organization>azbuilder</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <maven.deploy.skip>true</maven.deploy.skip>

diff --git a/terraform-client/pom.xml b/terraform-client/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>0.5.0-beta.2</revision>
+        <revision>0.5.0-beta.3</revision>
         <maven.deploy.skip>false</maven.deploy.skip>
         <okhttp.version>4.9.1</okhttp.version>
         <commons-io.version>2.8.0</commons-io.version>

diff --git a/terraform-client/src/main/java/org/azbuilder/terraform/ProcessLauncher.java b/terraform-client/src/main/java/org/azbuilder/terraform/ProcessLauncher.java
@@ -6,7 +6,7 @@
 import java.util.function.*;
 import java.util.stream.*;
 
-final class ProcessLauncher {
+public final class ProcessLauncher {
     private Process process;
     private ProcessBuilder builder;
     private Consumer<String> outputListener, errorListener;

diff --git a/terraform-client/src/main/java/org/azbuilder/terraform/TerraformClient.java b/terraform-client/src/main/java/org/azbuilder/terraform/TerraformClient.java
@@ -158,6 +158,23 @@ public CompletableFuture<Boolean> destroy() throws IOException {
         return this.run(TerraformCommand.destroy);
     }
 
+    public CompletableFuture<Boolean> output(@NonNull String terraformVersion, @NonNull File workingDirectory, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+        return this.run(
+                terraformVersion,
+                workingDirectory,
+                null,
+                new HashMap<>(),
+                new HashMap<>(),
+                outputListener,
+                errorListener,
+                TerraformCommand.output);
+    }
+
+    public CompletableFuture<Boolean> output() throws IOException {
+        this.checkRunningParameters();
+        return this.run(TerraformCommand.output);
+    }
+
     private CompletableFuture<Boolean> run(String terraformVersion, File workingDirectory, String terraformBackendConfigFileName, Map<String, String> terraformVariables, Map<String, String> terraformEnvironmentVariables, Consumer<String> outputListener, Consumer<String> errorListener, TerraformCommand... commands) throws IOException {
         assert commands.length > 0;
         ProcessLauncher[] launchers = new ProcessLauncher[commands.length];
@@ -254,6 +271,10 @@ private ProcessLauncher getTerraformLauncher(String terraformVersion, File worki
                 else
                     launcher.appendCommands(TERRAFORM_PARAM_AUTO_APPROVED);
                 break;
+            case show:
+            case output:
+                launcher.appendCommands(TERRAFORM_PARAM_JSON);
+                break;
             case showPlan:
                 launcher.appendCommands(TERRAFORM_PARAM_OUTPUT_PLAN_FILE);
                 break;

diff --git a/terraform-client/src/main/java/org/azbuilder/terraform/TerraformCommand.java b/terraform-client/src/main/java/org/azbuilder/terraform/TerraformCommand.java
@@ -10,7 +10,8 @@ public enum TerraformCommand {
     destroy("destroy"),
     version("version"),
     show("show"),
-    showPlan("show");
+    showPlan("show"),
+    output("output");
 
     private String label;
 

diff --git a/terraform-spring-boot-autoconfigure/pom.xml b/terraform-spring-boot-autoconfigure/pom.xml
@@ -18,7 +18,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.5.0-beta.2</revision>
+    <revision>0.5.0-beta.3</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
     <lombok.version>1.18.20</lombok.version>
   </properties>

diff --git a/terraform-spring-boot-samples/pom.xml b/terraform-spring-boot-samples/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>0.5.0-beta.2</revision>
+        <revision>0.5.0-beta.3</revision>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 

diff --git a/terraform-spring-boot-starter/pom.xml b/terraform-spring-boot-starter/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.5.0-beta.2</revision>
+    <revision>0.5.0-beta.3</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
   </properties>