bump terrafrom version (#666)

default.nix

@@ -43,7 +43,7 @@ rec {
       moreutils
       skopeo
       sops
-      terraform_0_13
+      terraform_1
       yq
       create-container-dump
       list-helm-containers

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`

terraform/environment/terraform.tf

@@ -1,14 +1,13 @@
 terraform {
-  required_version = "~> 0.13"
+  required_version = "~> 1.1"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
       version = "~> 2.58"
     }
     hcloud = {
-      source  = "terraform-providers/hcloud"
-      version = "~> 1.19"
+      source  = "hetznercloud/hcloud"
     }
   }
 

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

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

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

terraform/modules/aws-cargohold-asset-storage/main.tf

@@ -1,3 +1,3 @@
 terraform {
-  required_version = "~> 0.12"
+  required_version = "~> 1.1"
 }

terraform/modules/aws-dns-records/main.tf

@@ -1,3 +1,3 @@
 terraform {
-  required_version = "~> 0.12"
+  required_version = "~> 1.1"
 }

terraform/modules/aws-network-load-balancer/main.tf

@@ -1,3 +1,3 @@
 terraform {
-  required_version = "~> 0.12"
+  required_version = "~> 1.1"
 }

terraform/modules/aws-terraform-state-share/main.tf

@@ -1,3 +1,3 @@
 terraform {
-  required_version = "~> 0.12"
+  required_version = "~> 1.1"
 }

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)

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

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