apm-1865: terraform v14 upgrade

matt-mercer · matt-mercer · commit 862d8b4fb303 · 2021-02-20T01:18:30.000Z
diff --git a/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/.terraform.lock.hcl b/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/.terraform.lock.hcl
diff --git a/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/terraform.tf b/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/terraform.tf
@@ -10,7 +10,6 @@ terraform {
 
 provider "aws" {
   region  = "eu-west-2"
-  version = "~> 3.28"
   profile = var.profile
 }
 
diff --git a/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/versions.tf b/ansible/roles/create-api-deployment-pre-reqs/templates/terraform/versions.tf
@@ -2,7 +2,8 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.28"
     }
   }
-  required_version = ">= 0.13.6"
+  required_version = ">= 0.14.6"
 }
diff --git a/ansible/roles/deploy-ecs-proxies/templates/terraform/.terraform.lock.hcl b/ansible/roles/deploy-ecs-proxies/templates/terraform/.terraform.lock.hcl
diff --git a/ansible/roles/deploy-ecs-proxies/templates/terraform/terraform.tf b/ansible/roles/deploy-ecs-proxies/templates/terraform/terraform.tf
@@ -11,7 +11,6 @@ terraform {
 
 provider "aws" {
   region  = "eu-west-2"
-  version = "~> 3.28"
   profile = var.profile
 }
 
diff --git a/ansible/roles/deploy-ecs-proxies/templates/terraform/versions.tf b/ansible/roles/deploy-ecs-proxies/templates/terraform/versions.tf
@@ -2,7 +2,8 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.28"
     }
   }
-  required_version = ">= 0.13.6"
+  required_version = ">= 0.14.6"
 }
diff --git a/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/.terraform.lock.hcl b/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/.terraform.lock.hcl
diff --git a/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/terraform.tf b/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/terraform.tf
@@ -13,7 +13,6 @@ terraform {
 
 provider "aws" {
   region  = "eu-west-2"
-  version = "~> 3.28"
   profile = var.profile
 }
 
diff --git a/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/versions.tf b/ansible/roles/destroy-api-deployment-pre-reqs/templates/terraform/versions.tf
@@ -2,7 +2,8 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.28"
     }
   }
-  required_version = ">= 0.13.6"
+  required_version = ">= 0.14.6"
 }
diff --git a/ansible/roles/destroy-ecs-proxies/templates/terraform/.terraform.lock.hcl b/ansible/roles/destroy-ecs-proxies/templates/terraform/.terraform.lock.hcl
diff --git a/ansible/roles/destroy-ecs-proxies/templates/terraform/terraform.tf b/ansible/roles/destroy-ecs-proxies/templates/terraform/terraform.tf
@@ -14,7 +14,6 @@ terraform {
 
 provider "aws" {
   region  = "eu-west-2"
-  version = "~> 3.28"
   profile = var.profile
 }
 
diff --git a/ansible/roles/destroy-ecs-proxies/templates/terraform/versions.tf b/ansible/roles/destroy-ecs-proxies/templates/terraform/versions.tf
@@ -2,7 +2,8 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.28"
     }
   }
-  required_version = ">= 0.13.6"
+  required_version = ">= 0.14.6"
 }
diff --git a/azure/_deprecated-become-build-user.yml b/azure/_deprecated-become-build-user.yml
@@ -10,7 +10,7 @@ parameters:
 steps:
 
   - bash: |
-      tfenv use 0.13.6
+      tfenv use 0.14.6
     displayName: use terraform
 
   - bash: |
diff --git a/azure/build-prereqs.yml b/azure/build-prereqs.yml
@@ -9,7 +9,7 @@ steps:
       versionSpec: '3.8'
 
   - bash: |
-      tfenv use 0.13.6
+      tfenv use 0.14.6
     displayName: setup terraform
 
   - bash: |
diff --git a/azure/cleanup-ecs-pr-proxies.yml b/azure/cleanup-ecs-pr-proxies.yml
@@ -39,7 +39,7 @@ jobs:
            profile: "apm_ptl"
 
       - bash: |
-          tfenv use 0.13.6
+          tfenv use 0.14.6
         displayName: setup terraform
 
       - bash: |
diff --git a/azure/cleanup-pr-portal-apis-and-specs.yml b/azure/cleanup-pr-portal-apis-and-specs.yml
@@ -38,7 +38,7 @@ jobs:
           profile: "apm_ptl"
 
       - bash: |
-          tfenv use 0.13.6
+          tfenv use 0.14.6
         displayName: setup terraform
 
       - bash: |
diff --git a/azure/common/apigee-build.yml b/azure/common/apigee-build.yml
@@ -205,7 +205,7 @@ jobs:
         condition: and(succeeded(), eq(variables['build_containers'], 'true'))
 
       - bash: |
-          tfenv use 0.13.6
+          tfenv use 0.14.6
         displayName: use terraforn
         condition: and(succeeded(), eq(variables['build_containers'], 'true'))
 
diff --git a/azure/templates/deploy-service.yml b/azure/templates/deploy-service.yml
@@ -60,7 +60,7 @@ steps:
     displayName: "Install utils pre-requisites"
 
   - bash: |
-      tfenv use 0.13.6
+      tfenv use 0.14.6
     displayName: setup terraform
     condition: and(succeeded(), eq(variables['deploy_containers'], 'true'))
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ terraform {`
`10`	`10`
`11`	`11`	`provider "aws" {`
`12`	`12`	`region = "eu-west-2"`
`13`		`- version = "~> 3.28"`
`14`	`13`	`profile = var.profile`
`15`	`14`	`}`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`aws = {`
`4`	`4`	`source = "hashicorp/aws"`
	`5`	`+ version = "~> 3.28"`
`5`	`6`	`}`
`6`	`7`	`}`
`7`		`- required_version = ">= 0.13.6"`
	`8`	`+ required_version = ">= 0.14.6"`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ terraform {`
`11`	`11`
`12`	`12`	`provider "aws" {`
`13`	`13`	`region = "eu-west-2"`
`14`		`- version = "~> 3.28"`
`15`	`14`	`profile = var.profile`
`16`	`15`	`}`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ terraform {`
`13`	`13`
`14`	`14`	`provider "aws" {`
`15`	`15`	`region = "eu-west-2"`
`16`		`- version = "~> 3.28"`
`17`	`16`	`profile = var.profile`
`18`	`17`	`}`
`19`	`18`