Upgraded to TF 0.14 (#47)

* Upgraded to TF 0.14 * Added null provider Co-authored-by: Lars Tobias Skjong-Børsting <[email protected]>
telia-oss · Mar 29, 2021 · 3452015 · 3452015
1 parent 763c9bb
commit 3452015
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,10 +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
@@ -2,12 +2,11 @@
 # Create a ecs service using fargate
 # ----------------------------------------
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }
 
 provider "aws" {
-  version = ">= 2.17"
-  region  = var.region
+  region = var.region
 }
 
 data "aws_vpc" "main" {

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/secrets/.terraform.lock.hcl b/examples/secrets/.terraform.lock.hcl
diff --git a/examples/secrets/main.tf b/examples/secrets/main.tf
@@ -6,8 +6,8 @@ terraform {
 }
 
 provider "aws" {
-  version = ">= 2.17"
-  region  = var.region
+
+  region = var.region
 }
 
 data "aws_vpc" "main" {

diff --git a/examples/secrets/versions.tf b/examples/secrets/versions.tf
@@ -0,0 +1,15 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.1.0"
+    }
+
+  }
+  required_version = ">= 0.14"
+
+}
diff --git a/versions.tf b/versions.tf
@@ -1,9 +1,13 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 
   required_providers {
     aws = {
       version = ">= 3.34.0"
     }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.1.0"
+    }
   }
 }