Merge pull request #32 from SadriG91/master

upgraded to Terraform 0.14
telia-oss · Feb 11, 2021 · c52d516 · c52d516
2 parents c08f3e1 + 6508450
commit c52d516
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,9 +14,8 @@ jobs:
       with: { go-version: 1.14 }
 
     - name: Install Terraform
-      run: |
-        curl -sL https://releases.hashicorp.com/terraform/0.12.21/terraform_0.12.21_linux_amd64.zip -o terraform.zip
-        sudo unzip terraform.zip -d /usr/bin && rm -f terraform.zip
+      uses: hashicorp/setup-terraform@v1 
+      with: { terraform_version: 0.14.6 }
 
     - name: Install Taskfile
       run: curl -sL https://taskfile.dev/install.sh | sh

diff --git a/examples/basic/.terraform.lock.hcl b/examples/basic/.terraform.lock.hcl
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }
 
 provider "aws" {
-  version = ">= 2.17"
-  region  = var.region
+  #version = ">= 3.27" This is moved into required_providers block on TF 0.14
+  region = var.region
 }
 
 module "vpc" {

diff --git a/examples/basic/versions.tf b/examples/basic/versions.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    aws = {
+      version = "~> 3.0"
+      source  = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 0.14"
+}
diff --git a/examples/complete/.terraform.lock.hcl b/examples/complete/.terraform.lock.hcl
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }
 
 provider "aws" {
-  version = ">= 2.17"
-  region  = var.region
+  #version = ">= 3.27" ##This is moved to required_providers block on TF 0.14
+  region = var.region
 }
 
 module "vpc" {

diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    aws = {
+      version = "~> 3.0"
+      source  = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 0.14"
+}
diff --git a/examples/interface-endpoint/.terraform.lock.hcl b/examples/interface-endpoint/.terraform.lock.hcl
diff --git a/examples/interface-endpoint/main.tf b/examples/interface-endpoint/main.tf
@@ -1,6 +1,6 @@
 provider "aws" {
-  version = ">= 2.17"
-  region  = var.region
+  #version = ">= 3.27" ##This is moved to required_providers block on TF 0.14
+  region = var.region
 }
 
 data "aws_availability_zones" "main" {}

diff --git a/examples/interface-endpoint/versions.tf b/examples/interface-endpoint/versions.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    aws = {
+      version = "~> 3.0"
+      source  = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 0.14"
+}
diff --git a/versions.tf b/versions.tf
@@ -1,4 +1,9 @@
-
 terraform {
-  required_version = ">= 0.12"
-}
+  required_providers {
+    aws = {
+      version = "~> 3.0"
+      source  = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 0.14"
+}