upgrade Terraform to 1.0, upgrade all providers

jakubgs · jakubgs · commit db456f7f5c73 · 2021-06-23T11:48:43.000+02:00
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>
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
@@ -21,7 +21,7 @@
 
 - name: infra-role-bootstrap-windows
   src: git@github.com:status-im/infra-role-bootstrap.git
-  version: c1f535e4b2851f08b1013bd57ab42d0c1e31e3b2
+  version: eb6400281bd3183733691344191bd53b2eceaa49
   scm: git
 
 - name: oauth-proxy
diff --git a/common.tf b/common.tf
@@ -10,9 +10,9 @@ module "nimbus_network" {
 
   name  = "nimbus"
   stage = "test"
-  zones = [ "eu-central-1a" ]
+  zones = ["eu-central-1a"]
 
   /* Firewall */
   open_udp_ports = local.nimbus_ports
-  open_tcp_ports = concat(local.nimbus_ports, [ "22", "80", "443" ])
+  open_tcp_ports = concat(local.nimbus_ports, ["22", "80", "443"])
 }
diff --git a/dash.tf b/dash.tf
@@ -16,7 +16,7 @@ module "nimbus_dashboard" {
     "80",  /* HTTP */
     "443", /* HTTPS */
   ]
-  
+
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
   subnet_id    = module.nimbus_network.subnets[0].id
diff --git a/geth.tf b/geth.tf
@@ -15,7 +15,7 @@ module "nimbus_geth_mainnet" {
   host_count    = 1
 
   /* Firewall */
-  open_tcp_ports = [ 30303 ]
+  open_tcp_ports = [30303]
 
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
@@ -41,7 +41,7 @@ module "nimbus_geth_goerli" {
   host_count    = 1
 
   /* Firewall */
-  open_tcp_ports = [ 30303 ]
+  open_tcp_ports = [30303]
 
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
diff --git a/logs.tf b/logs.tf
@@ -18,7 +18,7 @@ module "nimbus_log_store" {
     "80",  /* HTTP */
     "443", /* HTTPS */
   ]
-  
+
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
   subnet_id    = module.nimbus_network.subnets[0].id
diff --git a/main.tf b/main.tf
@@ -25,8 +25,8 @@ 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/modules/hetzner/versions.tf b/modules/hetzner/versions.tf
@@ -1,13 +1,13 @@
 terraform {
-  required_version = "~> 0.14.4"
+  required_version = "~> 1.0.0"
   required_providers {
     ansible = {
       source  = "nbering/ansible"
       version = " = 1.0.4"
     }
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = " = 2.10.1"
+      version = " = 2.21.0"
     }
   }
 }
diff --git a/prater.tf b/prater.tf
@@ -158,7 +158,9 @@ module "nimbus_nodes_prater_unstable_windows" {
   zone   = "us-central1-a"
 
   /* System */
-  image            = "windows-cloud/windows-server-2019-dc-v20210608"
+  image = "windows-cloud/windows-server-2019-dc-v20210608"
+  #image = "windows-cloud/windows-server-2016-dc-v20210608"
+  #image = "windows-cloud/windows-server-2012-r2-dc-v20210608"
   win_password     = data.pass_password.windows_user_pass.password
   ansible_playbook = "${path.cwd}/ansible/bootstrap-win.yml"
 
diff --git a/users.tf b/users.tf
@@ -10,8 +10,8 @@ resource "aws_iam_group" "nimbus_team" {
 }
 
 resource "aws_iam_access_key" "nimbus_team" {
-  user    = aws_iam_user.nimbus_team[count.index].name
-  count   = length(aws_iam_user.nimbus_team)
+  user  = aws_iam_user.nimbus_team[count.index].name
+  count = length(aws_iam_user.nimbus_team)
 
   /* GPG key for encrypting the secret key */
   pgp_key = file("files/${aws_iam_user.nimbus_team[count.index].name}.gpg")
diff --git a/variables.tf b/variables.tf
@@ -27,5 +27,5 @@ variable "log_stores_count" {
 variable "nimbus_team_members" {
   description = "List of Nimbus team members with Console access."
   type        = list(string)
-  default     = [ "stefantalpalaru" ]
+  default     = ["stefantalpalaru"]
 }
diff --git a/versions.tf b/versions.tf
@@ -1,13 +1,13 @@
 terraform {
-  required_version = "~> 0.14.4"
+  required_version = "~> 1.0.0"
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = " = 2.10.1"
+      version = " = 2.21.0"
     }
     aws = {
       source  = "hashicorp/aws"
-      version = " = 2.46.0"
+      version = " = 3.46.0"
     }
     pass = {
       source  = "camptocamp/pass"

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ module "nimbus_dashboard" {`
`16`	`16`	`"80", /* HTTP */`
`17`	`17`	`"443", /* HTTPS */`
`18`	`18`	`]`
`19`		`-`
	`19`	`+`
`20`	`20`	`/* Plumbing */`
`21`	`21`	`vpc_id = module.nimbus_network.vpc.id`
`22`	`22`	`subnet_id = module.nimbus_network.subnets[0].id`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ module "nimbus_log_store" {`
`18`	`18`	`"80", /* HTTP */`
`19`	`19`	`"443", /* HTTPS */`
`20`	`20`	`]`
`21`		`-`
	`21`	`+`
`22`	`22`	`/* Plumbing */`
`23`	`23`	`vpc_id = module.nimbus_network.vpc.id`
`24`	`24`	`subnet_id = module.nimbus_network.subnets[0].id`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ data "cloudflare_zones" "active" {`
`25`	`25`	`/* For easier access to zone ID by domain name */`
`26`	`26`	`locals {`
`27`	`27`	`zones = {`
`28`		`- for zone in data.cloudflare_zones.active.zones:`
`29`		`- zone.name => zone.id`
	`28`	`+ for zone in data.cloudflare_zones.active.zones :`
	`29`	`+ zone.name => zone.id`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "~> 0.14.4"`
	`2`	`+ required_version = "~> 1.0.0"`
`3`	`3`	`required_providers {`
`4`	`4`	`ansible = {`
`5`	`5`	`source = "nbering/ansible"`
`6`	`6`	`version = " = 1.0.4"`
`7`	`7`	`}`
`8`	`8`	`cloudflare = {`
`9`	`9`	`source = "cloudflare/cloudflare"`
`10`		`- version = " = 2.10.1"`
	`10`	`+ version = " = 2.21.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ resource "aws_iam_group" "nimbus_team" {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`resource "aws_iam_access_key" "nimbus_team" {`
`13`		`- user = aws_iam_user.nimbus_team[count.index].name`
`14`		`- count = length(aws_iam_user.nimbus_team)`
	`13`	`+ user = aws_iam_user.nimbus_team[count.index].name`
	`14`	`+ count = length(aws_iam_user.nimbus_team)`
`15`	`15`
`16`	`16`	`/* GPG key for encrypting the secret key */`
`17`	`17`	`pgp_key = file("files/${aws_iam_user.nimbus_team[count.index].name}.gpg")`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ variable "log_stores_count" {`
`27`	`27`	`variable "nimbus_team_members" {`
`28`	`28`	`description = "List of Nimbus team members with Console access."`
`29`	`29`	`type = list(string)`
`30`		`- default = [ "stefantalpalaru" ]`
	`30`	`+ default = ["stefantalpalaru"]`
`31`	`31`	`}`