Skip to content

Commit

Permalink
Allow environment variables when running terraform init (#40)
Browse files Browse the repository at this point in the history 
* Allow environment variables when running terraform init
  • Loading branch information
@alfespa17
alfespa17 committed Dec 8, 2023
1 parent 452afdb commit 1c97560
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revision>0.11.0</revision>
<revision>0.11.1</revision>
<sonar.organization>azbuilder</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<maven.deploy.skip>true</maven.deploy.skip>
Expand Down
2 changes: 1 addition & 1 deletion terraform-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</revision>
<revision>0.11.1</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>
Expand Down
10 changes: 0 additions & 10 deletions terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public CompletableFuture<String> version() throws IOException {
public CompletableFuture<Boolean> show(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
checkVarFileParam(terraformProcessData);
checkTerraformVariablesParam(terraformProcessData);
checkTerraformEnvVariablesParam(terraformProcessData);
return this.run(
terraformProcessData,
outputListener,
Expand All @@ -82,7 +81,6 @@ public CompletableFuture<Boolean> show() throws IOException {
public CompletableFuture<Boolean> showPlan(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
checkVarFileParam(terraformProcessData);
checkTerraformVariablesParam(terraformProcessData);
checkTerraformEnvVariablesParam(terraformProcessData);
return this.run(
terraformProcessData,
outputListener,
Expand All @@ -98,7 +96,6 @@ public CompletableFuture<Boolean> showPlan() throws IOException {
public CompletableFuture<Boolean> init(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
checkVarFileParam(terraformProcessData);
checkTerraformVariablesParam(terraformProcessData);
checkTerraformEnvVariablesParam(terraformProcessData);
return this.run(
terraformProcessData,
outputListener,
Expand Down Expand Up @@ -163,7 +160,6 @@ public CompletableFuture<Boolean> output(TerraformProcessData terraformProcessDa
checkBackendConfigFile(terraformProcessData);
checkVarFileParam(terraformProcessData);
checkTerraformVariablesParam(terraformProcessData);
checkTerraformEnvVariablesParam(terraformProcessData);
return this.run(
terraformProcessData,
outputListener,
Expand Down Expand Up @@ -225,12 +221,6 @@ private void checkTerraformVariablesParam(TerraformProcessData terraformProcessD
}
}

private void checkTerraformEnvVariablesParam(TerraformProcessData terraformProcessData) {
if (!terraformProcessData.getTerraformEnvironmentVariables().isEmpty()) {
throw new IllegalArgumentException("terraform environment variables parameter should be empty for this terraform command");
}
}

private void checkBackendConfigFile(TerraformProcessData terraformProcessData) {
if (terraformProcessData.getTerraformBackendConfigFileName() != null) {
throw new IllegalArgumentException("terraform backend config file name should be null for this terraform command");
Expand Down
2 changes: 1 addition & 1 deletion terraform-spring-boot-autoconfigure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</revision>
<revision>0.11.1</revision>
<maven.deploy.skip>false</maven.deploy.skip>
<lombok.version>1.18.30</lombok.version>
<maven.compiler.source>11</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion terraform-spring-boot-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revision>0.11.0</revision>
<revision>0.11.1</revision>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion terraform-spring-boot-samples/raw-client-library-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip>
<revision>0.11.0</revision>
<revision>0.11.1</revision>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion terraform-spring-boot-samples/spring-starter-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip>
<revision>0.11.0</revision>
<revision>0.11.1</revision>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion terraform-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</revision>
<revision>0.11.1</revision>
<maven.deploy.skip>false</maven.deploy.skip>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down

0 comments on commit 1c97560

Please sign in to comment.