Release Hotfix 3.2 (DI-653) (#556)

JackPlowman · mabe13 · web-flow · commit 850b27aad624 · 2022-10-31T12:38:20.000Z
* Add us-east-1 terraform provider

* Affix AWS power tools version to 1.31.1

Co-authored-by: Matthew Begley &lt;matthewbegley@nhs.net&gt;
diff --git a/application/change_event_dlq_handler/requirements.txt b/application/change_event_dlq_handler/requirements.txt
@@ -1,2 +1,2 @@
 aws-embedded-metrics
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
diff --git a/application/dos_db_handler/requirements.txt b/application/dos_db_handler/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
 psycopg2-binary
diff --git a/application/dos_db_update_dlq_handler/requirements.txt b/application/dos_db_update_dlq_handler/requirements.txt
@@ -1,2 +1,2 @@
 aws-embedded-metrics
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
diff --git a/application/event_replay/requirements.txt b/application/event_replay/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
 simplejson
diff --git a/application/orchestrator/requirements.txt b/application/orchestrator/requirements.txt
@@ -1,2 +1,2 @@
 aws-embedded-metrics
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
diff --git a/application/service_matcher/requirements.txt b/application/service_matcher/requirements.txt
@@ -1,3 +1,3 @@
 aws-embedded-metrics
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
 psycopg2-binary
diff --git a/application/service_sync/requirements.txt b/application/service_sync/requirements.txt
@@ -1,4 +1,4 @@
 aws-embedded-metrics
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
 psycopg2-binary
 pytz
diff --git a/application/slack_messenger/requirements.txt b/application/slack_messenger/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools
+aws-lambda-powertools == 1.31.1
 requests
diff --git a/build/automation/var/project.mk b/build/automation/var/project.mk
@@ -39,6 +39,8 @@ DOS_TRANSACTIONS_PER_SECOND = 6
 # ==============================================================================
 # Infrastructure variables (Terraform, Serverless, etc)
 
+TF_VAR_route53_health_check_alarm_region = us-east-1
+
 # DI Endpoint API Gateway API Keys
 TF_VAR_api_gateway_api_key_name := $(PROJECT_ID)-$(ENVIRONMENT)-api-key
 TF_VAR_nhs_uk_api_key_key := NHS_UK_API_KEY
diff --git a/infrastructure/stacks/common/common-provider.tf b/infrastructure/stacks/common/common-provider.tf
@@ -2,19 +2,37 @@ provider "aws" {
   region = var.aws_region
   default_tags {
     tags = {
-      "Profile"            = var.profile
-      "Owner"              = "TODO"
-      "TagVersion"         = "2.0"
-      "DataClassification" = "TODO"
-      "Programme"          = var.programme
-      "Service"            = var.project_id
-      "Product"            = var.project_id
-      "Environment"        = var.environment
-      "Environment_Type"   = var.aws_account_name
-      "PublicFacing"       = "No"
-      "ServiceCategory"    = ""
-      "Tool"               = "Terraform"
-      "Project"            = var.project_display_name
+      "Environment"     = var.environment
+      "EnvironmentType" = var.aws_account_name
+      "Product"         = var.project_id
+      "Profile"         = var.profile
+      "Programme"       = var.programme
+      "Project"         = var.project_display_name
+      "ProviderRegion"  = var.aws_region
+      "PublicFacing"    = "No"
+      "Service"         = var.project_id
+      "TagVersion"      = "2.0"
+      "Tool"            = "Terraform"
+    }
+  }
+}
+
+provider "aws" {
+  region = var.route53_health_check_alarm_region
+  alias  = "route53_health_check_alarm_region"
+  default_tags {
+    tags = {
+      "Environment"     = var.environment
+      "EnvironmentType" = var.aws_account_name
+      "Product"         = var.project_id
+      "Profile"         = var.profile
+      "Programme"       = var.programme
+      "Project"         = var.project_display_name
+      "ProviderRegion"  = var.route53_health_check_alarm_region
+      "PublicFacing"    = "No"
+      "Service"         = var.project_id
+      "TagVersion"      = "2.0"
+      "Tool"            = "Terraform"
     }
   }
 }
diff --git a/infrastructure/stacks/common/common-variables.tf b/infrastructure/stacks/common/common-variables.tf
@@ -10,6 +10,10 @@ variable "aws_region" {
   description = "The AWS region"
 }
 
+variable "route53_health_check_alarm_region" {
+  description = "The AWS region for the CloudWatch global alarms"
+}
+
 variable "aws_account_name" {
   description = "Current AWS account name"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`aws-embedded-metrics`
`2`		`-aws-lambda-powertools`
	`2`	`+aws-lambda-powertools == 1.31.1`