Merge pull request #2 from AzBuilder/macos-support

Add support for macOS in TerraformDownloader class
AzBuilder · Jul 3, 2021 · d947a37 · d947a37
2 parents 5d3f9c2 + 7a06abd
commit d947a37
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Simply add the following dependency to your project's `pom.xml` will enable you
 <dependency>
     <groupId>org.azbuilder.terraform</groupId>
     <artifactId>terraform-client</artifactId>
-    <version>0.2.1</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 
@@ -81,7 +81,7 @@ Let's still use the terraform file `storage.tf` under `/some/local/path/` folder
 <dependency>
     <groupId>org.azbuilder.terraform</groupId>
     <artifactId>terraform-spring-boot-starter</artifactId>
-    <version>0.2.1</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.2.1</revision>
+    <revision>0.3.0</revision>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 

diff --git a/terraform-client/pom.xml b/terraform-client/pom.xml
@@ -19,11 +19,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>0.2.1</revision>
+        <revision>0.3.0</revision>
         <maven.deploy.skip>false</maven.deploy.skip>
         <okhttp.version>4.9.1</okhttp.version>
         <commons-io.version>2.8.0</commons-io.version>
         <maven-artifact.version>3.8.1</maven-artifact.version>
+        <lombok.version>1.18.20</lombok.version>
     </properties>
 
     <licenses>
@@ -111,6 +112,12 @@
             <version>${maven-artifact.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/terraform-client/src/main/java/org/azbuilder/terraform/TerraformDownloader.java b/terraform-client/src/main/java/org/azbuilder/terraform/TerraformDownloader.java
@@ -85,7 +85,11 @@ public String downloadTerraformVersion(String terraformVersion) throws IOExcepti
         String terraformFilePath = "";
         if (version != null) {
             for (TerraformBuild terraformBuild : version.getBuilds()) {
-                if (terraformBuild.getArch().equals(SystemUtils.OS_ARCH) && (SystemUtils.IS_OS_WINDOWS && terraformBuild.getOs().equals("windows") || SystemUtils.IS_OS_LINUX && terraformBuild.getOs().equals("linux"))) {
+                if (terraformBuild.getArch().equals(SystemUtils.OS_ARCH) && (
+                        SystemUtils.IS_OS_WINDOWS && terraformBuild.getOs().equals("windows") ||
+                        SystemUtils.IS_OS_LINUX && terraformBuild.getOs().equals("linux")) ||
+                        SystemUtils.IS_OS_MAC && terraformBuild.getOs().equals("darwin")
+                ) {
                     String terraformZipReleaseURL = terraformBuild.getUrl();
                     String fileName = terraformBuild.getFilename();
 
@@ -172,7 +176,7 @@ private String unzipTerraformVersion(String terraformVersion, File terraformZipF
                 }
                 fos.close();
 
-                if(SystemUtils.IS_OS_LINUX){
+                if(SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC){
                     File updateAccess = new File(newFilePath);
                     updateAccess.setExecutable(true,true);
                 }

diff --git a/terraform-spring-boot-autoconfigure/pom.xml b/terraform-spring-boot-autoconfigure/pom.xml
@@ -18,8 +18,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>0.2.1</revision>
+    <revision>0.3.0</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
+    <lombok.version>1.18.20</lombok.version>
   </properties>
 
   <licenses>
@@ -84,5 +85,12 @@
       <artifactId>terraform-client</artifactId>
       <version>${revision}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>${lombok.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
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.2.1</revision>
+        <revision>0.3.0</revision>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 

diff --git a/...es/spring-starter-sample/src/test/java/org/azbuilder/samples/SpringStarterSampleTest.java b/...es/spring-starter-sample/src/test/java/org/azbuilder/samples/SpringStarterSampleTest.java
@@ -1,6 +1,7 @@
 package org.azbuilder.samples;
 
 import org.azbuilder.terraform.TerraformClient;
+import org.azbuilder.terraform.TerraformDownloader;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -18,5 +19,7 @@ public class SpringStarterSampleTest {
     @Test
     void contextLoads() throws IOException, ExecutionException, InterruptedException {
         Assert.notNull(terraformClient,"TerraformClient is null");
+        //TerraformDownloader terraformDownloader = new TerraformDownloader();
+        //terraformDownloader.downloadTerraformVersion("0.15.0");
     }
 }
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.2.1</revision>
+    <revision>0.3.0</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
   </properties>