VIA-579 AJ Upgrade infrastructure

ankur-jain-nhs · ankur-jain-nhs · commit 4289f5a5ac95 · 2025-12-10T18:51:43.000Z
- terraform: 1.11.2 -&gt; 1.14.1
- terraform-aws-modules/s3-bucket/aws: 4.11.0 -&gt; 5.x.y
- terraform-aws-modules/cloudwatch/aws//modules/metric-alarm: 5.7.1 -&gt; 5.x.y
- RJPearson94/open-next/aws//modules/tf-aws-open-next-zone: 3.6.1 -&gt; 3.6.2
- terraform-aws-modules/lambda/aws: 7.21.1 -&gt; 8.x.y
- terraform-aws-modules/sns/aws: 6.2.0 -&gt; 7.x.y
diff --git a/.tool-versions b/.tool-versions
@@ -1,6 +1,6 @@
 # This file is for you! Please, updated to the versions agreed by your team.
 
-terraform 1.11.2
+terraform 1.14.1
 pre-commit 3.6.0
 vale 3.6.0
 nodejs 22.13.1
diff --git a/infrastructure/environments/dev/.terraform.lock.hcl b/infrastructure/environments/dev/.terraform.lock.hcl
diff --git a/infrastructure/environments/dev/iam/provider.tf b/infrastructure/environments/dev/iam/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 
diff --git a/infrastructure/environments/dev/provider.tf b/infrastructure/environments/dev/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 
diff --git a/infrastructure/environments/dev/s3.tf b/infrastructure/environments/dev/s3.tf
@@ -1,9 +1,10 @@
 module "content_cache_s3_bucket" {
   source  = "terraform-aws-modules/s3-bucket/aws"
-  version = "~> 4.11.0"
+  version = "~> 5.0"
 
-  bucket        = local.content_cache_bucket_name
-  force_destroy = true
+  bucket                           = local.content_cache_bucket_name
+  force_destroy                    = true
+  skip_destroy_public_access_block = false
   versioning = {
     enabled = true
   }
diff --git a/infrastructure/modules/deploy_app/alarms_cloudfront.tf b/infrastructure/modules/deploy_app/alarms_cloudfront.tf
@@ -36,7 +36,7 @@ module "alarms_cloudfront" {
   for_each = local.alarms_cloudfront
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_app/alarms_lambda.tf b/infrastructure/modules/deploy_app/alarms_lambda.tf
@@ -81,7 +81,7 @@ module "alarms_lambda" {
   for_each = local.alarms_lambda
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_app/alarms_lambda_logs.tf b/infrastructure/modules/deploy_app/alarms_lambda_logs.tf
@@ -35,7 +35,7 @@ module "alarms_logs" {
   for_each = local.alarms_lambda_logs
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_app/main.tf b/infrastructure/modules/deploy_app/main.tf
@@ -1,6 +1,6 @@
 module "deploy_app" {
   source                = "RJPearson94/open-next/aws//modules/tf-aws-open-next-zone"
-  version               = "3.6.1"
+  version               = "3.6.2"
   open_next_version     = "v3.x.x"
   function_architecture = "arm64"
   prefix                = var.prefix
diff --git a/infrastructure/modules/deploy_lambda/alarms_lambda_logs.tf b/infrastructure/modules/deploy_lambda/alarms_lambda_logs.tf
@@ -35,7 +35,7 @@ module "alarms_logs" {
   for_each = local.alarms_lambda_logs
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_lambda/main.tf b/infrastructure/modules/deploy_lambda/main.tf
@@ -1,6 +1,6 @@
 module "content_cache_hydrator_lambda_function" {
   source  = "terraform-aws-modules/lambda/aws"
-  version = "~> 7.21.1"
+  version = "~> 8.0"
 
   function_name         = "${var.prefix}-content-cache-hydrator"
   description           = "Content cache hydrator lambda"
diff --git a/infrastructure/modules/deploy_monitoring/sns.tf b/infrastructure/modules/deploy_monitoring/sns.tf
@@ -1,6 +1,6 @@
 module "sns" {
   source  = "terraform-aws-modules/sns/aws"
-  version = "~> 6.2.0"
+  version = "~> 7.0"
 
   name         = "${var.prefix}-cloudwatch-alarms"
   display_name = "VitA Cloudwatch Alarms"
diff --git a/infrastructure/modules/deploy_splunk/cloudwatch_alarms.tf b/infrastructure/modules/deploy_splunk/cloudwatch_alarms.tf
@@ -42,7 +42,7 @@ module "alarms_cloudwatch" {
   for_each = local.alarms_cloudwatch
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_splunk/firehose_alarms.tf b/infrastructure/modules/deploy_splunk/firehose_alarms.tf
@@ -22,7 +22,7 @@ module "alarms_firehose" {
   for_each = local.alarms_firehose
 
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "~> 5.7.1"
+  version = "~> 5.0"
 
   alarm_name        = "${var.prefix}-${each.key}"
   alarm_description = each.value.alarm_description
diff --git a/infrastructure/modules/deploy_splunk/lambda.tf b/infrastructure/modules/deploy_splunk/lambda.tf
@@ -1,6 +1,6 @@
 module "firehose_transformer_lambda_function" {
   source  = "terraform-aws-modules/lambda/aws"
-  version = "~> 7.21.1"
+  version = "~> 8.0"
 
   function_name = "${var.prefix}-firehose-transformer"
   description   = "Firehose Lambda transformer for sending formatted logs to splunk"
diff --git a/infrastructure/modules/deploy_splunk/s3.tf b/infrastructure/modules/deploy_splunk/s3.tf
@@ -1,10 +1,12 @@
 module "failed_firehose_delivery_logs_s3_bucket" {
   source  = "terraform-aws-modules/s3-bucket/aws"
-  version = "~> 4.11.0"
+  version = "~> 5.0"
 
-  bucket        = "${var.prefix}-firehose-delivery-failures"
-  force_destroy = false
-  tags          = var.default_tags
+  bucket                           = "${var.prefix}-firehose-delivery-failures"
+  force_destroy                    = false
+  skip_destroy_public_access_block = false
+
+  tags = var.default_tags
 }
 
 resource "aws_s3_bucket_lifecycle_configuration" "failed_firehose_delivery_logs_s3_bucket_lifecycle_configuration" {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`aws = {`
`4`	`4`	`source = "hashicorp/aws"`
`5`		`- version = "~> 5.0"`
	`5`	`+ version = "~> 6.0"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`