From 67256b0d4391faef14863cc16b27873b78c644df Mon Sep 17 00:00:00 2001
From: Paul B <paul@bonaud.fr>
Date: Sat, 3 Oct 2020 17:13:08 +0200
Subject: [PATCH 1/2] Bump version of terraform to 0.12.29

---
 Dockerfile   | 2 +-
 Makefile     | 4 ++--
 README.md    | 2 +-
 VERSION      | 2 +-
 terraform.sh | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8173599..9a4b8fe 100644
--- 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
index e7c1aee..e72529c 100644
--- 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
index 23bdbc2..193c36b 100644
--- 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
index 84bb609..58828a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12.27
+0.12.29
diff --git a/terraform.sh b/terraform.sh
index 4d8d0a1..40e4182 100755
--- 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.

From 08113275eb9860c580d967c0e204ede09b7a68b0 Mon Sep 17 00:00:00 2001
From: Paul B <paul@bonaud.fr>
Date: Sat, 3 Oct 2020 17:14:02 +0200
Subject: [PATCH 2/2] providers: add Gandi as provider with their  ENV
 Variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The gandi providers expects two env variables (cf
https://github.com/go-gandi/terraform-provider-gandi/blob/master/gandi/provider.go)

- GANDI_SHARING_ID its a uuid found in the URL of your dashbaord (when
  you are logged in to your organisation)
  e.g. if you dashboard is available at
  https://admin.gandi.net/dashboard/00000000-1111-2222-3333-444444444444/
  then your sharing id is `00000000-1111-2222-3333-444444444444`
- GANDI_KEY found in the “security” section of the account page
  https://account.gandi.net/
---
 terraform.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/terraform.sh b/terraform.sh
index 40e4182..b8ef684 100755
--- a/terraform.sh
+++ b/terraform.sh
@@ -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