From f5574fc845788079cea277bca8a04fda661f87fc Mon Sep 17 00:00:00 2001 From: Amit Sagtani Date: Fri, 13 Oct 2023 14:23:57 -0700 Subject: [PATCH] bump terrafrom version (#666) --- default.nix | 2 +- offline/cd.sh | 2 +- terraform/environment/terraform.tf | 5 ++--- terraform/examples/create-infrastructure.tf | 2 +- .../examples/wire-server-deploy-offline-hetzner/versions.tf | 2 +- .../aws-brig-prekey-lock-event-queue-email-sending/main.tf | 2 +- terraform/modules/aws-cargohold-asset-storage/main.tf | 2 +- terraform/modules/aws-dns-records/main.tf | 2 +- terraform/modules/aws-network-load-balancer/main.tf | 2 +- terraform/modules/aws-terraform-state-share/main.tf | 2 +- terraform/modules/aws-vpc/main.tf | 2 +- terraform/modules/hetzner-kubernetes/versions.tf | 4 ++-- terraform/modules/sft/versions.tf | 4 ++-- 13 files changed, 16 insertions(+), 17 deletions(-) diff --git a/default.nix b/default.nix index 1e3999b1d..aa31a195f 100644 --- a/default.nix +++ b/default.nix @@ -43,7 +43,7 @@ rec { moreutils skopeo sops - terraform_0_13 + terraform_1 yq create-container-dump list-helm-containers diff --git a/offline/cd.sh b/offline/cd.sh index 4626ebfc1..bf9898ec4 100755 --- a/offline/cd.sh +++ b/offline/cd.sh @@ -7,9 +7,9 @@ function cleanup { echo done } trap cleanup EXIT - (cd terraform/examples/wire-server-deploy-offline-hetzner ; terraform init ; terraform apply -auto-approve ) adminhost=$(cd terraform/examples/wire-server-deploy-offline-hetzner ; terraform output adminhost) +adminhost="${adminhost//\"/}" # remove extra quotes around the returned string ssh_private_key=$(cd terraform/examples/wire-server-deploy-offline-hetzner ; terraform output ssh_private_key) eval `ssh-agent` diff --git a/terraform/environment/terraform.tf b/terraform/environment/terraform.tf index ffe5a4b04..79f3bb7c8 100644 --- a/terraform/environment/terraform.tf +++ b/terraform/environment/terraform.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 0.13" + required_version = "~> 1.1" required_providers { aws = { @@ -7,8 +7,7 @@ terraform { version = "~> 2.58" } hcloud = { - source = "terraform-providers/hcloud" - version = "~> 1.19" + source = "hetznercloud/hcloud" } } diff --git a/terraform/examples/create-infrastructure.tf b/terraform/examples/create-infrastructure.tf index 0ae495884..5b754d4a9 100644 --- a/terraform/examples/create-infrastructure.tf +++ b/terraform/examples/create-infrastructure.tf @@ -1,7 +1,7 @@ # Example terraform script to create virtual machines on the hetzner cloud provider # and an ansible-compatible inventory file terraform { - required_version = ">= 0.12.1" + required_version = "~> 1.1" # Recommended: configure a backend to share terraform state # See terraform documentation diff --git a/terraform/examples/wire-server-deploy-offline-hetzner/versions.tf b/terraform/examples/wire-server-deploy-offline-hetzner/versions.tf index d9b5e574d..b047ba54e 100644 --- a/terraform/examples/wire-server-deploy-offline-hetzner/versions.tf +++ b/terraform/examples/wire-server-deploy-offline-hetzner/versions.tf @@ -4,5 +4,5 @@ terraform { source = "hetznercloud/hcloud" } } - required_version = ">= 0.13" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-brig-prekey-lock-event-queue-email-sending/main.tf b/terraform/modules/aws-brig-prekey-lock-event-queue-email-sending/main.tf index ec900db26..9fc0f400c 100644 --- a/terraform/modules/aws-brig-prekey-lock-event-queue-email-sending/main.tf +++ b/terraform/modules/aws-brig-prekey-lock-event-queue-email-sending/main.tf @@ -1,3 +1,3 @@ terraform { - required_version = "~> 0.12" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-cargohold-asset-storage/main.tf b/terraform/modules/aws-cargohold-asset-storage/main.tf index ec900db26..9fc0f400c 100644 --- a/terraform/modules/aws-cargohold-asset-storage/main.tf +++ b/terraform/modules/aws-cargohold-asset-storage/main.tf @@ -1,3 +1,3 @@ terraform { - required_version = "~> 0.12" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-dns-records/main.tf b/terraform/modules/aws-dns-records/main.tf index ec900db26..9fc0f400c 100644 --- a/terraform/modules/aws-dns-records/main.tf +++ b/terraform/modules/aws-dns-records/main.tf @@ -1,3 +1,3 @@ terraform { - required_version = "~> 0.12" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-network-load-balancer/main.tf b/terraform/modules/aws-network-load-balancer/main.tf index ec900db26..9fc0f400c 100644 --- a/terraform/modules/aws-network-load-balancer/main.tf +++ b/terraform/modules/aws-network-load-balancer/main.tf @@ -1,3 +1,3 @@ terraform { - required_version = "~> 0.12" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-terraform-state-share/main.tf b/terraform/modules/aws-terraform-state-share/main.tf index ec900db26..9fc0f400c 100644 --- a/terraform/modules/aws-terraform-state-share/main.tf +++ b/terraform/modules/aws-terraform-state-share/main.tf @@ -1,3 +1,3 @@ terraform { - required_version = "~> 0.12" + required_version = "~> 1.1" } diff --git a/terraform/modules/aws-vpc/main.tf b/terraform/modules/aws-vpc/main.tf index 56365e07b..ac4136d65 100644 --- a/terraform/modules/aws-vpc/main.tf +++ b/terraform/modules/aws-vpc/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.12.0" + required_version = "~> 1.1" } # In AWS, (eu-central-1) diff --git a/terraform/modules/hetzner-kubernetes/versions.tf b/terraform/modules/hetzner-kubernetes/versions.tf index 218393986..c80dfa990 100644 --- a/terraform/modules/hetzner-kubernetes/versions.tf +++ b/terraform/modules/hetzner-kubernetes/versions.tf @@ -4,8 +4,8 @@ terraform { source = "hashicorp/aws" } hcloud = { - source = "terraform-providers/hcloud" + source = "hetznercloud/hcloud" } } - required_version = ">= 0.13" + required_version = "~> 1.1" } diff --git a/terraform/modules/sft/versions.tf b/terraform/modules/sft/versions.tf index 218393986..c80dfa990 100644 --- a/terraform/modules/sft/versions.tf +++ b/terraform/modules/sft/versions.tf @@ -4,8 +4,8 @@ terraform { source = "hashicorp/aws" } hcloud = { - source = "terraform-providers/hcloud" + source = "hetznercloud/hcloud" } } - required_version = ">= 0.13" + required_version = "~> 1.1" }