From 080563f30c3baf6b4e17d830b2d8582dd2f878ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 23 Jun 2021 12:53:26 +0200
Subject: [PATCH] upgrade Terraform to 1.0, upgrade all providers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.terraform.io/upgrade-guides/0-15.html
https://www.terraform.io/upgrade-guides/1-0.html

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/requirements.yml |  4 ++--
 main.tf                  |  8 ++++----
 secrets.tf               |  2 +-
 versions.tf              | 11 +++++------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 4e29c18..85049dc 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -6,12 +6,12 @@
 
 - name: infra-role-bootstrap
   src: git@github.com:status-im/infra-role-bootstrap.git
-  version: 4dfd3e0b32a93e1f07a73c6794684bae21f2e556
+  version: c1f535e4b2851f08b1013bd57ab42d0c1e31e3b2
   scm: git
 
 - name: consul-service
   src: git@github.com:status-im/infra-role-consul-service.git
-  version: b1d5ad5caa7d7a036fd175292fa497175bb7c54c
+  version: 87f4498f90f0cbb66a1ddb425e8953b04ced1891
   scm: git
 
 - name: swap-file
diff --git a/main.tf b/main.tf
index e41c3ec..fc90e50 100644
--- a/main.tf
+++ b/main.tf
@@ -3,8 +3,8 @@
 terraform {
   backend "consul" {
     address = "https://consul.statusim.net:8400"
-    lock = true /* Lock to avoid syncing issues */
-    gzip = true /* KV store has a limit of 512KB */
+    lock    = true /* Lock to avoid syncing issues */
+    gzip    = true /* KV store has a limit of 512KB */
     /* WARNING This needs to be changed for every repo. */
     path      = "terraform/avalanche/"
     ca_file   = "ansible/files/consul-ca.crt"
@@ -23,7 +23,7 @@ data "cloudflare_zones" "active" {
 /* For easier access to zone ID by domain name */
 locals {
   zones = {
-    for zone in data.cloudflare_zones.active.zones:
-      zone.name => zone.id
+    for zone in data.cloudflare_zones.active.zones :
+    zone.name => zone.id
   }
 }
diff --git a/secrets.tf b/secrets.tf
index 9f4c79d..9e49268 100644
--- a/secrets.tf
+++ b/secrets.tf
@@ -1,5 +1,5 @@
 # Uses PASSWORD_STORE_DIR environment variable
-provider "pass" { }
+provider "pass" {}
 
 /* Token for interacting with Cloudflare API. */
 data "pass_password" "cloudflare_token" {
diff --git a/versions.tf b/versions.tf
index 5d8570b..6f71b68 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,17 +1,16 @@
 terraform {
-  required_version = "~> 0.14.4"
+  required_version = "~> 1.0.0"
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = " = 2.10.1"
-    }
-    digitalocean = {
-      source  = "digitalocean/digitalocean"
-      version = " = 2.5.1"
+      version = " = 2.21.0"
     }
     pass = {
       source  = "camptocamp/pass"
       version = " = 2.0.0"
     }
+    digitalocean = {
+      source = "digitalocean/digitalocean"
+    }
   }
 }