[PRM-599] Upgrade aws provider to v6 (#92)

* [PRM-599] upgrade terraform aws provider to ~>6.0

* [PRM-599] newline

* [PRM-599] update from .name to .region

* [PRM-599] update all instances from .name to .region

* [PRM-599] remove unnecessary provider and added hard coded value.

* [PRM-599] remove unnecessary provider and added hard coded value.

Author: samfallowfield

stacks/base-networking/terraform/gateway-endpoint.tf

@@ -1,6 +1,6 @@
 resource "aws_vpc_endpoint" "s3" {
   vpc_id       = aws_vpc.vpc.id
-  service_name = "com.amazonaws.${data.aws_region.current.name}.s3"
+  service_name = "com.amazonaws.${data.aws_region.current.region}.s3"
 
   tags = merge(
     local.common_tags,

stacks/base-networking/terraform/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }

stacks/base-support/terraform/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }

stacks/container-repositories/terraform/provider.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }
 
 provider "aws" {
   region = "eu-west-2"
-}
+}

stacks/ecs-cluster/terraform/ecs-cluster.tf

@@ -56,7 +56,7 @@ resource "aws_iam_policy" "ecs_execution" {
 }
 
 locals {
-  ecr_arn_prefix = "arn:aws:ecr:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}"
+  ecr_arn_prefix = "arn:aws:ecr:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}"
 }
 
 data "aws_region" "current" {}

stacks/ecs-cluster/terraform/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }

stacks/email-and-alerting/terraform/gp2gp-dashboard-alert-lambda.tf

@@ -21,7 +21,7 @@ resource "aws_lambda_function" "gp2gp_dashboard_alert_lambda" {
   environment {
     variables = {
       LOG_ALERTS_GENERAL_WEBHOOK_URL_PARAM_NAME = var.log_alerts_general_webhook_url_param_name,
-      GP2GP_DASHBOARD_STEP_FUNCTION_URL         = "https://${data.aws_region.current.name}.console.aws.amazon.com/states/home#/statemachines/view/arn:aws:states:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:stateMachine:dashboard-pipeline",
+      GP2GP_DASHBOARD_STEP_FUNCTION_URL         = "https://${data.aws_region.current.region}.console.aws.amazon.com/states/home#/statemachines/view/arn:aws:states:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:stateMachine:dashboard-pipeline",
       GP2GP_DASHBOARD_NATIONAL_STATISTICS_URL   = var.gp2gp_dashboard_national_statistics_url,
       ENVIRONMENT                               = var.environment,
     }

stacks/email-and-alerting/terraform/iam.tf

@@ -62,10 +62,10 @@ data "aws_iam_policy_document" "email_report_lambda_ssm_access" {
     ]
 
     resources = [
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_sender_email_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_recipient_email_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_recipient_internal_email_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_sender_email_key_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_sender_email_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_recipient_email_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_recipient_internal_email_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.email_report_sender_email_key_param_name}",
     ]
   }
 }
@@ -128,7 +128,7 @@ data "aws_iam_policy_document" "email_report_send_raw_email" {
     ]
 
     resources = [
-      "arn:aws:ses:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:identity/${data.aws_ssm_parameter.email_report_sender_email.value}",
+      "arn:aws:ses:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:identity/${data.aws_ssm_parameter.email_report_sender_email.value}",
     ]
   }
 }
@@ -200,10 +200,10 @@ data "aws_iam_policy_document" "log_alerts_ssm_access" {
     ]
 
     resources = [
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_webhook_url_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_above_threshold_webhook_url_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_general_webhook_url_param_name}",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_above_threshold_rate_param_name}"
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_webhook_url_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_above_threshold_webhook_url_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_general_webhook_url_param_name}",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter${var.log_alerts_technical_failures_above_threshold_rate_param_name}"
     ]
   }
 }
@@ -324,8 +324,8 @@ data "aws_iam_policy_document" "store_asid_lookup_lambda_access" {
       "ssm:GetParameter"
     ]
     resources = [
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/registrations/${var.environment}/data-pipeline/gp2gp-dashboard/permitted-emails",
-      "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/registrations/${var.environment}/data-pipeline/gp2gp-dashboard/email-storage-bucket-name"
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter/registrations/${var.environment}/data-pipeline/gp2gp-dashboard/permitted-emails",
+      "arn:aws:ssm:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:parameter/registrations/${var.environment}/data-pipeline/gp2gp-dashboard/email-storage-bucket-name"
     ]
   }
 
@@ -342,7 +342,7 @@ data "aws_iam_policy_document" "store_asid_lookup_lambda_access" {
     actions = [
       "states:StartExecution"
     ]
-    resources = ["arn:aws:states:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:stateMachine:ods-downloader-pipeline"]
+    resources = ["arn:aws:states:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:stateMachine:ods-downloader-pipeline"]
   }
 }
 

stacks/email-and-alerting/terraform/log-alerts-lambda.tf

@@ -33,8 +33,8 @@ resource "aws_lambda_permission" "log_alerts_technical_failures_above_threshold_
   statement_id  = "log-alerts-technical-failures-above-threshold-lambda-allow-cloudwatch"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.log_alerts_technical_failures_above_threshold_lambda.function_name
-  principal     = "logs.${data.aws_region.current.name}.amazonaws.com"
-  source_arn    = "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:log-group:${data.aws_ssm_parameter.cloud_watch_log_group.value}:*"
+  principal     = "logs.${data.aws_region.current.region}.amazonaws.com"
+  source_arn    = "arn:aws:logs:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:log-group:${data.aws_ssm_parameter.cloud_watch_log_group.value}:*"
 }
 
 resource "aws_cloudwatch_log_subscription_filter" "log_alerts_technical_failures_above_threshold" {
@@ -79,8 +79,8 @@ resource "aws_lambda_permission" "log_alerts_pipeline_error_lambda_allow_cloudwa
   statement_id  = "log-alerts-pipeline-error-lambda-allow-cloudwatch"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.log_alerts_pipeline_error_lambda.function_name
-  principal     = "logs.${data.aws_region.current.name}.amazonaws.com"
-  source_arn    = "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:log-group:${data.aws_ssm_parameter.cloud_watch_log_group.value}:*"
+  principal     = "logs.${data.aws_region.current.region}.amazonaws.com"
+  source_arn    = "arn:aws:logs:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:log-group:${data.aws_ssm_parameter.cloud_watch_log_group.value}:*"
 }
 
 resource "aws_cloudwatch_log_subscription_filter" "log_alerts_pipeline_error" {

stacks/email-and-alerting/terraform/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }