update aws providers core (#2335)

timburke-hackit · web-flow · commit 69f22376e7ad · 2025-07-14T12:18:34.000+01:00
* change aws provider version to ~> 5.0 * update required providers in modules * replace deprecated ebs_volume_size with storage_info https://registry.terraform.io/providers/hashicorp/aws/latest/docs/guides/version-5-upgrade#resourceaws_msk_cluster
diff --git a/terraform/core/00-init.tf b/terraform/core/00-init.tf
@@ -1,8 +1,8 @@
 # Core Infrastructure
 provider "aws" {
   region = var.aws_deploy_region
-  
-  dynamic assume_role {
+
+  dynamic "assume_role" {
     for_each = local.is_live_environment ? [1] : []
 
     content {
@@ -15,7 +15,7 @@ provider "aws" {
 provider "aws" {
   alias  = "aws_api_account"
   region = var.aws_deploy_region
-  
+
   assume_role {
     role_arn     = "arn:aws:iam::${var.aws_api_account_id}:role/${var.aws_deploy_iam_role_name}"
     session_name = "Terraform"
@@ -25,10 +25,10 @@ provider "aws" {
 provider "aws" {
   alias  = "aws_hackit_account"
   region = "eu-west-1"
-  
-  dynamic assume_role {
+
+  dynamic "assume_role" {
     for_each = local.is_live_environment ? [1] : []
-    
+
     content {
       role_arn     = "arn:aws:iam::${var.aws_hackit_account_id}:role/${var.aws_deploy_iam_role_name}"
       session_name = "DataPlatform"
@@ -40,13 +40,13 @@ provider "aws" {
 provider "aws" {
   alias  = "aws_sandbox_account"
   region = var.aws_deploy_region
-  
-  dynamic assume_role {
+
+  dynamic "assume_role" {
     for_each = local.is_live_environment ? [] : [1]
 
     content {
-        role_arn     = "arn:aws:iam::${var.aws_sandbox_account_id}:role/${var.aws_deploy_iam_role_name}"
-        session_name = "Terraform"
+      role_arn     = "arn:aws:iam::${var.aws_sandbox_account_id}:role/${var.aws_deploy_iam_role_name}"
+      session_name = "Terraform"
     }
   }
 }
@@ -65,7 +65,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/terraform/modules/api-ingestion-lambda/00-init.tf b/terraform/modules/api-ingestion-lambda/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-ecs-autoscaling-group/00-init.tf b/terraform/modules/aws-ecs-autoscaling-group/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-ecs-docker-service/00-init.tf b/terraform/modules/aws-ecs-docker-service/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-ecs-fargate-task/00-init.tf b/terraform/modules/aws-ecs-fargate-task/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-glue-job-with-crawler/00-init.tf b/terraform/modules/aws-glue-job-with-crawler/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-glue-job/00-init.tf b/terraform/modules/aws-glue-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-lambda-folder-ingestion/00-init.tf b/terraform/modules/aws-lambda-folder-ingestion/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-lambda-layers/00-init.tf b/terraform/modules/aws-lambda-layers/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-lambda/00-init.tf b/terraform/modules/aws-lambda/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/aws-step-functions/00-init.tf b/terraform/modules/aws-step-functions/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/copy-from-s3-to-s3/00-init.tf b/terraform/modules/copy-from-s3-to-s3/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/aws-glue-job/00-init.tf b/terraform/modules/data-sources/aws-glue-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/department/00-init.tf b/terraform/modules/data-sources/department/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
       configuration_aliases = [
         aws.aws_hackit_account
       ]
diff --git a/terraform/modules/data-sources/g-drive-to-s3/00-init.tf b/terraform/modules/data-sources/g-drive-to-s3/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/google-service-account/00-init.tf b/terraform/modules/data-sources/google-service-account/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/google-sheets-glue-job/00-init.tf b/terraform/modules/data-sources/google-sheets-glue-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/import-data-from-spreadsheet-job/00-init.tf b/terraform/modules/data-sources/import-data-from-spreadsheet-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/import-spreadsheet-file-from-g-drive/00-init.tf b/terraform/modules/data-sources/import-spreadsheet-file-from-g-drive/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/data-sources/s3-bucket/00-init.tf b/terraform/modules/data-sources/s3-bucket/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/database-ingestion-via-jdbc-connection/00-init.tf b/terraform/modules/database-ingestion-via-jdbc-connection/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/datahub/00-init.tf b/terraform/modules/datahub/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/db-snapshot-to-s3-sandbox-resources/00-init.tf b/terraform/modules/db-snapshot-to-s3-sandbox-resources/00-init.tf
@@ -8,10 +8,10 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
       configuration_aliases = [
         aws.aws_sandbox_account
-     ]
+      ]
     }
   }
 }
diff --git a/terraform/modules/db-snapshot-to-s3/00-init.tf b/terraform/modules/db-snapshot-to-s3/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/department/00-init.tf b/terraform/modules/department/00-init.tf
@@ -8,10 +8,10 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
-      configuration_aliases = [ 
+      version = ">=4.0, <6.0"
+      configuration_aliases = [
         aws.aws_hackit_account
-       ]
+      ]
     }
   }
 }
diff --git a/terraform/modules/dynamodb/00-init.tf b/terraform/modules/dynamodb/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/electrical-mechnical-fire-safety-cleaning-job/00-init.tf b/terraform/modules/electrical-mechnical-fire-safety-cleaning-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/g-drive-to-s3/00-init.tf b/terraform/modules/g-drive-to-s3/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/glue-failure-alert-notifications/00-init.tf b/terraform/modules/glue-failure-alert-notifications/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/google-service-account/00-init.tf b/terraform/modules/google-service-account/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/google-sheets-glue-job/00-init.tf b/terraform/modules/google-sheets-glue-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/housing-repairs-google-sheets-cleaning/00-init.tf b/terraform/modules/housing-repairs-google-sheets-cleaning/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/import-data-from-spreadsheet-job/00-init.tf b/terraform/modules/import-data-from-spreadsheet-job/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/import-spreadsheet-file-from-g-drive/00-init.tf b/terraform/modules/import-spreadsheet-file-from-g-drive/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/kafka-event-streaming/50-cluster.tf b/terraform/modules/kafka-event-streaming/50-cluster.tf
@@ -5,9 +5,14 @@ resource "aws_msk_cluster" "kafka_cluster" {
 
   broker_node_group_info {
     instance_type   = "kafka.t3.small"
-    ebs_volume_size = 200
     client_subnets  = var.subnet_ids
     security_groups = [aws_security_group.kafka.id]
+
+    storage_info {
+      ebs_storage_info {
+        volume_size = 200
+      }
+    }
   }
 
   encryption_info {
@@ -24,4 +29,4 @@ resource "aws_msk_cluster" "kafka_cluster" {
   }
 
   tags = var.tags
-}
+}
diff --git a/terraform/modules/kafka-test-lambda/00-init.tf b/terraform/modules/kafka-test-lambda/00-init.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = ">=4.0, <6.0"
     }
   }
 }
diff --git a/terraform/modules/lambda-alarms-and-monitoring/00-init.tf b/terraform/modules/lambda-alarms-and-monitoring/00-init.tf
diff --git a/terraform/modules/lambda-alarms-handler/00-init.tf b/terraform/modules/lambda-alarms-handler/00-init.tf
diff --git a/terraform/modules/lambda-monitoring-dashboard/00-init.tf b/terraform/modules/lambda-monitoring-dashboard/00-init.tf
diff --git a/terraform/modules/qlik-sense-server/00-init.tf b/terraform/modules/qlik-sense-server/00-init.tf
diff --git a/terraform/modules/rds-snapshot-to-s3/00-init.tf b/terraform/modules/rds-snapshot-to-s3/00-init.tf
diff --git a/terraform/modules/redshift-serverless/00-init.tf b/terraform/modules/redshift-serverless/00-init.tf
diff --git a/terraform/modules/redshift/00-init.tf b/terraform/modules/redshift/00-init.tf
diff --git a/terraform/modules/s3-bucket-notification-emails/00-init.tf b/terraform/modules/s3-bucket-notification-emails/00-init.tf
diff --git a/terraform/modules/s3-bucket/00-init.tf b/terraform/modules/s3-bucket/00-init.tf
diff --git a/terraform/modules/set-budget-limit-amount/00-init.tf b/terraform/modules/set-budget-limit-amount/00-init.tf
diff --git a/terraform/modules/sql-to-rds-snapshot/00-init.tf b/terraform/modules/sql-to-rds-snapshot/00-init.tf

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ terraform {`
`8`	`8`	`required_providers {`
`9`	`9`	`aws = {`
`10`	`10`	`source = "hashicorp/aws"`
`11`		`- version = "~> 4.0"`
	`11`	`+ version = ">4.0, <6.0"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`