upgrade Terraform to 1.0, upgrade all providers

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>
This commit is contained in:
Jakub Sokołowski 2021-06-23 09:44:06 +02:00
parent 3a3d52a156
commit db456f7f5c
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
11 changed files with 20 additions and 18 deletions

View File

@ -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

View File

@ -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"])
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
}
}

View File

@ -1,5 +1,5 @@
terraform {
required_version = "~> 0.14.4"
required_version = "~> 1.0.0"
required_providers {
ansible = {
source = "nbering/ansible"
@ -7,7 +7,7 @@ terraform {
}
cloudflare = {
source = "cloudflare/cloudflare"
version = " = 2.10.1"
version = " = 2.21.0"
}
}
}

View File

@ -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"

View File

@ -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")

View File

@ -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"]
}

View File

@ -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"