Merge pull request #51 from paulRbr/multi-provider

Add Gandi provider and bump TF to 0.12.29
paulRbr · Oct 15, 2020 · 5c476ea · 5c476ea
2 parents 1a0b110 + 0811327
commit 5c476ea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hashicorp/terraform:0.12.27
+FROM hashicorp/terraform:0.12.29
 
 RUN \
 apk add --no-cache make bash ca-certificates jq curl ruby ruby-json;\

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # ------------------
 # TERRAFORM-MAKEFILE
-# v0.12.27
+# v0.12.29
 # ------------------
 #
 # Terraform makefile is a helper to run terraform commands
@@ -29,7 +29,7 @@
 ##
 # TERRAFORM INSTALL
 ##
-version  ?= "0.12.27"
+version  ?= "0.12.29"
 os       ?= $(shell uname|tr A-Z a-z)
 ifeq ($(shell uname -m),x86_64)
   arch   ?= "amd64"

diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ List of commands made available
 
 ~~~bash
 > make
-Terraform-makefile v0.12.27
+Terraform-makefile v0.12.29
 
 console                        Console infra resources
 destroy                        Destroy resources

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.12.27
+0.12.29
diff --git a/terraform.sh b/terraform.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ------------------
 # TERRAFORM-MAKEFILE
-# v0.12.27
+# v0.12.29
 # ------------------
 #
 # This Makefile is maintained on Github.com.
@@ -158,6 +158,11 @@ while IFS=',' read -ra providers; do
                     declare -x "OVH_CONSUMER_KEY=${!token}"
                 fi
                 ;;
+            gandi)
+                if [ -z "${GANDI_SHARING_ID}" ]; then
+                    declare -x "GANDI_SHARING_ID=${!key}"
+                    declare -x "GANDI_KEY=${!secret}"
+                fi
         esac
 
     done