Fix terraform plan refresh an refresh-only parameter (#42)

AzBuilder · Dec 21, 2023 · 5b8b991 · 5b8b991
1 parent 1c97560
commit 5b8b991
Show file tree

Hide file tree

Showing 9 changed files with 21 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.11.1</revision>
+ <revision>0.11.2</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
@@ -23,7 +23,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <commons-io.version>2.15.0</commons-io.version>
  <maven-artifact.version>3.9.5</maven-artifact.version>

diff --git a/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java b/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java
@@ -30,6 +30,8 @@ public class TerraformClient implements AutoCloseable {
  private static final String TERRAFORM_PARAM_PLAN_DESTROY = "-destroy";
  private static final String TERRAFORM_PARAM_OUTPUT_PLAN_FILE = "terraformLibrary.tfPlan";
  private static final String TERRAFORM_PARAM_DISABLE_USER_INPUT = "-input=false";
+ private static final String TERRAFORM_PLAN_REFRESH_FALSE="-refresh=false";
+ private static final String TERRAFORM_PLAN_REFRESH_ONLY="-refresh-only";
 
  private final ExecutorService executor = Executors.newWorkStealingPool();
 
@@ -294,6 +296,14 @@ private ProcessLauncher getTerraformLauncher(TerraformProcessData terraformProce
  break;
  case planDestroy:
  case plan:
+ if (!terraformProcessData.isRefresh()){
+ launcher.appendCommands(TERRAFORM_PLAN_REFRESH_FALSE);
+ }
+
+ if (terraformProcessData.isRefreshOnly()){
+ launcher.appendCommands(TERRAFORM_PLAN_REFRESH_ONLY);
+ }
+
  if (terraformProcessData.getVarFileName() == null)
  for (Map.Entry<String, String> entry : terraformProcessData.getTerraformVariables().entrySet()) {
  launcher.appendCommands(TERRAFORM_PARAM_VARIABLE, entry.getKey().concat("=").concat(entry.getValue()));

diff --git a/terraform-client/src/main/java/org/terrakube/terraform/TerraformProcessData.java b/terraform-client/src/main/java/org/terrakube/terraform/TerraformProcessData.java
@@ -15,6 +15,10 @@ public class TerraformProcessData {
  String terraformBackendConfigFileName;
  String varFileName;
  File sshFile;
+ @Builder.Default
+ boolean refresh = true;
+ @Builder.Default
+ boolean refreshOnly = false;
  @Singular Map<String, String> terraformVariables;
  @Singular Map<String, String> terraformEnvironmentVariables;
 }
diff --git a/terraform-spring-boot-autoconfigure/pom.xml b/terraform-spring-boot-autoconfigure/pom.xml
@@ -22,7 +22,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <lombok.version>1.18.30</lombok.version>
  <maven.compiler.source>11</maven.compiler.source>

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.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.deploy.skip>true</maven.deploy.skip>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>

diff --git a/terraform-spring-boot-samples/raw-client-library-sample/pom.xml b/terraform-spring-boot-samples/raw-client-library-sample/pom.xml
@@ -20,7 +20,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.deploy.skip>true</maven.deploy.skip>
- <revision>0.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  </properties>

diff --git a/terraform-spring-boot-samples/spring-starter-sample/pom.xml b/terraform-spring-boot-samples/spring-starter-sample/pom.xml
@@ -20,7 +20,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.deploy.skip>true</maven.deploy.skip>
- <revision>0.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  </properties>

diff --git a/terraform-spring-boot-starter/pom.xml b/terraform-spring-boot-starter/pom.xml
@@ -17,7 +17,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.11.1</revision>
+ <revision>0.11.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>