From 9ebfd5d2058d3168aaf5bccb26b78d9065817bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Mon, 7 Sep 2020 23:25:32 +0200
Subject: [PATCH] upgrade to terraform 0.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 Makefile    | 16 ++--------------
 versions.tf | 12 +++++++++---
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 90d6d29..5e06e4a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,20 +10,15 @@ endif
 
 PLUGIN_DIR = ~/.terraform.d/plugins
 
-PROVIDER_NAME = terraform-provider-ansible
-PROVIDER_VERSION = v1.0.3
-PROVIDER_ARCHIVE = $(PROVIDER_NAME)-$(ARCH).zip
-PROVIDER_URL = https://github.com/nbering/terraform-provider-ansible/releases/download/$(PROVIDER_VERSION)/$(PROVIDER_ARCHIVE)
-
 PROVISIONER_NAME = terraform-provisioner-ansible
 PROVISIONER_VERSION = v2.3.0
 PROVISIONER_ARCHIVE = $(PROVISIONER_NAME)-$(subst _,-,$(ARCH))_$(PROVISIONER_VERSION)
 PROVISIONER_URL = https://github.com/radekg/terraform-provisioner-ansible/releases/download/$(PROVISIONER_VERSION)/$(PROVISIONER_ARCHIVE)
 
-all: requirements install-provider install-provisioner secrets init-terraform
+all: requirements install-provisioner secrets init-terraform
 	@echo "Success!"
 
-plugins: install-provider install-provisioner
+plugins: install-provisioner
 
 requirements:
 	ansible-galaxy install --ignore-errors --force -r ansible/requirements.yml
@@ -33,13 +28,6 @@ ifeq (, $(shell which unzip))
 	$(error "No unzip in PATH, consider doing apt install unzip")
 endif
 
-install-provider: check-unzip
-	if [ ! -e $(PLUGIN_DIR)/$(ARCH)/$(PROVIDER_NAME)_$(PROVIDER_VERSION) ]; then \
-		mkdir -p $(PLUGIN_DIR); \
-		wget $(PROVIDER_URL) -P $(PLUGIN_DIR); \
-		unzip -o $(PLUGIN_DIR)/$(PROVIDER_ARCHIVE) -d $(PLUGIN_DIR); \
-	fi
-
 install-provisioner:
 	if [ ! -e $(PLUGIN_DIR)/$(ARCH)/$(PROVISIONER_NAME)_$(PROVISIONER_VERSION) ]; then \
 		mkdir -p $(PLUGIN_DIR); \
diff --git a/versions.tf b/versions.tf
index 4925468..b038e4b 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,7 +1,13 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
   required_providers {
-    cloudflare = " = 2.3.0"
-    aws        = " = 2.46.0"
+    cloudflare = {
+      source  = "cloudflare/cloudflare"
+      version = " = 2.10.1"
+    }
+    aws = {
+      source  = "hashicorp/aws"
+      version = " = 2.46.0"
+    }
   }
 }