Update AWS AMIs & lock tf provider versions

purpleteam-labs · Jun 6, 2021 · b2d86ff · b2d86ff
1 parent d120c7a
commit b2d86ff
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 96 deletions.
diff --git a/tf/modules/common/aws/network/apiGateway/apis/apis.tf b/tf/modules/common/aws/network/apiGateway/apis/apis.tf
@@ -192,10 +192,10 @@ resource "aws_api_gateway_deployment" "sut_deploy" {
   //   Doc: This issue (https://github.com/hashicorp/terraform/issues/6613) lead to the above one.
   lifecycle { create_before_destroy = true }
   triggers = {
-    redeployment = sha1(join(",", list(
+    redeployment = sha1(join(",", tolist([
       jsonencode(aws_api_gateway_integration.root_get),
       jsonencode(aws_api_gateway_integration.proxy_plus_any)
-    )))
+    ])))
   }
 }
 

diff --git a/tf/roots/1_static/.terraform.lock.hcl b/tf/roots/1_static/.terraform.lock.hcl
diff --git a/tf/roots/1_static/versions.tf b/tf/roots/1_static/versions.tf
@@ -1,8 +1,9 @@
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
+      source = "hashicorp/aws",
+      version = "~> 3.44.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.15"
 }
diff --git a/tf/roots/2_nw/.terraform.lock.hcl b/tf/roots/2_nw/.terraform.lock.hcl
diff --git a/tf/roots/2_nw/versions.tf b/tf/roots/2_nw/versions.tf
@@ -2,10 +2,16 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.44.0"
     }
     cloudflare = {
       source = "cloudflare/cloudflare"
+      version = "~> 2.21.0"
+    }
+    external = {
+      source = "hashicorp/external"
+      version = "~> 2.1.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.15"
 }
diff --git a/tf/roots/3_contOrc/.terraform.lock.hcl b/tf/roots/3_contOrc/.terraform.lock.hcl
diff --git a/tf/roots/3_contOrc/variables.tf b/tf/roots/3_contOrc/variables.tf
@@ -47,12 +47,11 @@ variable "aws_lb_target_groups" {
 //
 // ECS optimized AMIs per region
 // Amazon Linux 2
-// Updated Jan 14 2021
 // Once upgraded check the Container Agent Version again and that the AMI ID in the EC@ console has changed as specified.
 variable "ecs_image_id" {
   default = {
-    ap-southeast-1 = "ami-08ce8fab6f3298bec" // Singapore. Last modified date: Fri, 08 Jan 2021 21:47:53 GMT. Version 50
-    ap-southeast-2 = "ami-0e1f2642e8ed2b983" // Sydney. Last modified date: Fri, 08 Jan 2021 21:36:29 GMT. Version 50
+    ap-southeast-1 = "ami-01eadf33e58113fa2" // Singapore. Last modified date: Fri, 21 May 2021 23:08:18 GMT. Version 62
+    ap-southeast-2 = "ami-0ce714360ecb86a7b" // Sydney. Last modified date: Fri, 21 May 2021 22:58:26 GMT. Version 62
   }
 }
 

diff --git a/tf/roots/3_contOrc/versions.tf b/tf/roots/3_contOrc/versions.tf
@@ -2,7 +2,12 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.44.0"
+    }
+    template = {
+      source = "hashicorp/template",
+      version = "~> 2.2.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.15"
 }
diff --git a/tf/roots/4_api/.terraform.lock.hcl b/tf/roots/4_api/.terraform.lock.hcl
diff --git a/tf/roots/4_api/versions.tf b/tf/roots/4_api/versions.tf
@@ -2,10 +2,12 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
+      version = "~> 3.44.0"
     }
     cloudflare = {
       source = "cloudflare/cloudflare"
+      version = "~> 2.21.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.15"
 }