[NDR-181] Variable tidy up (#355)

* [NDR-181] removing current_account_id

* [NDR-181] poll_frequency removed

* [NDR-181] removing unused base var vars

* [NDR-181] remove certificate_domain var from route 53

* [NDR-]

* [NDR-181] remove lamba_edge lambda_timeout

* [NDR-181] moving data blocks to the top

* [NDR-181] re-adding over zealous parameter removal

* [NDR-181] lambdalayerbug

* [NDR-181] removing acount id var

* [NDR-181] removing current_account_id

---------

Co-authored-by: Sam Whyte <[email protected]>

Author: SWhyteAnswer

infrastructure/README.md

@@ -4,9 +4,6 @@ domain                            = "access-request-fulfilment.patient-deduction
 certificate_domain                = "access-request-fulfilment.patient-deductions.nhs.uk"
 certificate_subdomain_name_prefix = "api-"
 
-cloudwatch_alarm_evaluation_periods = 5
-poll_frequency                      = "3600"
-
 standalone_vpc_tag    = "ndr-dev"
 standalone_vpc_ig_tag = "ndr-dev"
 

infrastructure/dev.tfvars

@@ -1,16 +1,13 @@
 module "ndr-docker-ecr-ui" {
-  source             = "./modules/ecr/"
-  app_name           = "ndr-${terraform.workspace}-app"
-  current_account_id = data.aws_caller_identity.current.account_id
-
+  source      = "./modules/ecr/"
+  app_name    = "ndr-${terraform.workspace}-app"
   environment = var.environment
   owner       = var.owner
 }
 module "ndr-docker-ecr-data-collection" {
-  count              = local.is_sandbox ? 0 : 1
-  source             = "./modules/ecr/"
-  app_name           = "${terraform.workspace}-data-collection"
-  current_account_id = data.aws_caller_identity.current.account_id
-  environment        = var.environment
-  owner              = var.owner
+  count       = local.is_sandbox ? 0 : 1
+  source      = "./modules/ecr/"
+  app_name    = "${terraform.workspace}-data-collection"
+  environment = var.environment
+  owner       = var.owner
 }

infrastructure/ecr.tf

@@ -2,8 +2,7 @@ module "sns_encryption_key" {
   source              = "./modules/kms"
   kms_key_name        = "alias/alarm-notification-encryption-key-kms-${terraform.workspace}"
   kms_key_description = "Custom KMS Key to enable server side encryption for sns subscriptions"
-  current_account_id  = data.aws_caller_identity.current.account_id
   environment         = var.environment
   owner               = var.owner
   service_identifiers = ["sns.amazonaws.com", "cloudwatch.amazonaws.com"]
-}
+}

infrastructure/kms_sns.tf

@@ -25,7 +25,6 @@ module "access-audit-alarm" {
 module "access-audit-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "access-audit-alarms-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.access-audit-lambda.lambda_arn

infrastructure/lambda-access-audit.tf

@@ -45,7 +45,6 @@ module "authoriser-alarm" {
 module "authoriser-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "create_doc-alarms-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.authoriser-lambda.lambda_arn

infrastructure/lambda-authoriser.tf

@@ -57,7 +57,6 @@ module "back_channel_logout_alarm" {
 module "back_channel_logout_alarm_topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "back-channel-logout-alarms-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.back_channel_logout_lambda.lambda_arn

infrastructure/lambda-back-channel-logout.tf

@@ -41,7 +41,6 @@ module "bulk-upload-metadata-alarm" {
 module "bulk-upload-metadata-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "bulk-upload-metadata-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.bulk-upload-metadata-lambda.lambda_arn
@@ -67,4 +66,4 @@ module "bulk-upload-metadata-alarm-topic" {
   })
 
   depends_on = [module.bulk-upload-metadata-lambda, module.sns_encryption_key]
-}
+}

infrastructure/lambda-bulk-upload-metadata.tf

@@ -62,7 +62,6 @@ module "bulk-upload-report-alarm" {
 module "bulk-upload-report-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "bulk-upload-report-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.bulk-upload-report-lambda.lambda_arn
@@ -88,4 +87,4 @@ module "bulk-upload-report-alarm-topic" {
   })
 
   depends_on = [module.bulk-upload-report-lambda, module.sns_encryption_key]
-}
+}

infrastructure/lambda-bulk-upload-report.tf

@@ -84,7 +84,6 @@ module "bulk-upload-alarm" {
 module "bulk-upload-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
-  current_account_id    = data.aws_caller_identity.current.account_id
   topic_name            = "bulk-upload-topic"
   topic_protocol        = "lambda"
   topic_endpoint        = module.bulk-upload-lambda.lambda_arn
@@ -110,4 +109,4 @@ module "bulk-upload-alarm-topic" {
   })
 
   depends_on = [module.bulk-upload-lambda, module.sns_encryption_key]
-}
+}