Merge pull request #5927 from govuk-one-login/whi-tw/AUT-4030/un-spli…

…t-tfvars-10

AUT-4030: un-split utils tfvars

ci/terraform/utils/authdev1.tfvars

@@ -1,14 +1,19 @@
-environment                                       = "authdev1"
+shared_state_bucket = "di-auth-development-tfstate"
+
+# App-specific
 internal_sector_uri                               = "https://identity.authdev1.sandpit.account.gov.uk"
-shared_state_bucket                               = "di-auth-development-tfstate"
 allow_bulk_test_users                             = true
 bulk_user_email_send_schedule_enabled             = false
 bulk_user_email_send_schedule_expression          = "rate(5 minutes)"
 bulk_user_email_email_sending_enabled             = false
 bulk_user_email_included_terms_and_conditions     = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
 bulk_user_email_max_audience_load_user_batch_size = 5
 bulk_user_email_max_audience_load_user_count      = 10
-cloudwatch_log_retention                          = 30
+
+# Logging
+cloudwatch_log_retention = 30
+
+# Sizing
 performance_tuning = {
   bulk-user-email-send = {
     memory  = 512

ci/terraform/utils/authdev2.tfvars

@@ -1,14 +1,19 @@
-environment                                       = "authdev2"
+shared_state_bucket = "di-auth-development-tfstate"
+
+# App-specific
 internal_sector_uri                               = "https://identity.authdev2.sandpit.account.gov.uk"
-shared_state_bucket                               = "di-auth-development-tfstate"
 allow_bulk_test_users                             = true
 bulk_user_email_send_schedule_enabled             = false
 bulk_user_email_send_schedule_expression          = "rate(5 minutes)"
 bulk_user_email_email_sending_enabled             = false
 bulk_user_email_included_terms_and_conditions     = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
 bulk_user_email_max_audience_load_user_batch_size = 5
 bulk_user_email_max_audience_load_user_count      = 10
-cloudwatch_log_retention                          = 30
+
+# Logging
+cloudwatch_log_retention = 30
+
+# Sizing
 performance_tuning = {
   bulk-user-email-send = {
     memory  = 512

ci/terraform/utils/build.tfvars

@@ -1,4 +1,21 @@
 utils_release_zip_file = "./artifacts/utils.zip"
 shared_state_bucket    = "digital-identity-dev-tfstate"
-logging_endpoint_arn   = ""
-logging_endpoint_arns  = []
+
+# App Specific
+internal_sector_uri = "https://identity.build.account.gov.uk"
+
+allow_bulk_test_users = true
+
+bulk_user_email_audience_loader_schedule_enabled  = false
+bulk_user_email_included_terms_and_conditions     = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
+bulk_user_email_max_audience_load_user_batch_size = 1000
+bulk_user_email_max_audience_load_user_count      = 5000
+
+bulk_user_email_send_schedule_enabled = false
+bulk_user_email_email_sending_enabled = false
+bulk_user_email_batch_query_limit     = 25
+bulk_user_email_max_batch_count       = 100
+bulk_user_email_batch_pause_duration  = 0
+
+# Logging
+logging_endpoint_arns = ["arn:aws:logs:eu-west-2:885513274347:destination:csls_cw_logs_destination_prodpython"]

ci/terraform/utils/dev.tfvars

@@ -1,8 +1,7 @@
 utils_release_zip_file = "./artifacts/utils.zip"
 shared_state_bucket    = "di-auth-development-tfstate"
-logging_endpoint_arn   = ""
-logging_endpoint_arns  = []
 
+# App-specific
 internal_sector_uri = "https://identity.dev.account.gov.uk"
 
 allow_bulk_test_users = true
@@ -18,4 +17,5 @@ bulk_user_email_batch_query_limit     = 25
 bulk_user_email_max_batch_count       = 100
 bulk_user_email_batch_pause_duration  = 0
 
+# Sizing
 email_check_results_writer_provisioned_concurrency = 0

ci/terraform/utils/integration.tfvars

@@ -1,4 +1,9 @@
 utils_release_zip_file = "./artifacts/utils.zip"
 shared_state_bucket    = "digital-identity-dev-tfstate"
-logging_endpoint_arn   = ""
-logging_endpoint_arns  = []
+
+internal_sector_uri                           = "https://identity.integration.account.gov.uk"
+allow_bulk_test_users                         = true
+bulk_user_email_included_terms_and_conditions = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
+
+# Logging
+logging_endpoint_arns = ["arn:aws:logs:eu-west-2:885513274347:destination:csls_cw_logs_destination_prodpython"]

ci/terraform/utils/production.tfvars

@@ -1,4 +1,26 @@
 utils_release_zip_file = "./artifacts/utils.zip"
 shared_state_bucket    = "digital-identity-prod-tfstate"
-logging_endpoint_arn   = ""
-logging_endpoint_arns  = []
+
+# App-specific
+internal_sector_uri = "https://identity.account.gov.uk"
+notify_template_map = {
+  TERMS_AND_CONDITIONS_BULK_EMAIL_TEMPLATE_ID = "173418a1-c442-4c4b-a6d1-d23f473f3dd0"
+}
+
+bulk_user_email_audience_loader_schedule_enabled  = false
+bulk_user_email_included_terms_and_conditions     = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
+bulk_user_email_max_audience_load_user_batch_size = 0
+bulk_user_email_max_audience_load_user_count      = 0
+bulk_user_email_send_mode                         = "PENDING"
+
+bulk_user_email_send_schedule_enabled = true
+bulk_user_email_email_sending_enabled = true
+bulk_user_email_batch_query_limit     = 2500
+bulk_user_email_max_batch_count       = 1
+bulk_user_email_batch_pause_duration  = 0
+
+bulk_user_email_send_schedule_expression = "cron(0 10 5 OCT ? 2023)"
+
+# Logging
+logging_endpoint_arns    = ["arn:aws:logs:eu-west-2:885513274347:destination:csls_cw_logs_destination_prodpython"]
+cloudwatch_log_retention = 30

ci/terraform/utils/sandpit.tfvars

@@ -1,14 +1,19 @@
-environment                                       = "sandpit"
+shared_state_bucket = "digital-identity-dev-tfstate"
+
+# App-specific
 internal_sector_uri                               = "https://identity.sandpit.account.gov.uk"
-shared_state_bucket                               = "digital-identity-dev-tfstate"
 allow_bulk_test_users                             = true
 bulk_user_email_send_schedule_enabled             = false
 bulk_user_email_send_schedule_expression          = "rate(5 minutes)"
 bulk_user_email_email_sending_enabled             = false
 bulk_user_email_included_terms_and_conditions     = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
 bulk_user_email_max_audience_load_user_batch_size = 5
 bulk_user_email_max_audience_load_user_count      = 10
-cloudwatch_log_retention                          = 30
+
+# Logging
+cloudwatch_log_retention = 30
+
+# Sizing
 performance_tuning = {
   bulk-user-email-send = {
     memory  = 512

ci/terraform/utils/staging-overrides.tfvars

@@ -1,11 +0,0 @@
-logging_endpoint_arns = [
-  "arn:aws:logs:eu-west-2:885513274347:destination:csls_cw_logs_destination_prodpython"
-]
-
-internal_sector_uri = "https://identity.staging.account.gov.uk"
-
-allow_bulk_test_users = true
-
-shared_state_bucket = "di-auth-staging-tfstate"
-
-bulk_user_email_included_terms_and_conditions = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"

ci/terraform/utils/staging.tfvars

@@ -1,4 +1,11 @@
 utils_release_zip_file = "./artifacts/utils.zip"
 shared_state_bucket    = "di-auth-staging-tfstate"
-logging_endpoint_arn   = ""
-logging_endpoint_arns  = []
+
+# App-specific
+internal_sector_uri = "https://identity.staging.account.gov.uk"
+
+allow_bulk_test_users                         = true
+bulk_user_email_included_terms_and_conditions = "1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
+
+# Logging
+logging_endpoint_arns = ["arn:aws:logs:eu-west-2:885513274347:destination:csls_cw_logs_destination_prodpython"]

deploy-dev.sh

@@ -154,6 +154,8 @@ echo -n "Retrieving Terraform variables from Secrets Manager ... "
 source "${DIR}/scripts/read_secrets__main.sh" "${ENVIRONMENT}"
 echo "done!"
 
+export TF_VAR_environment="${ENVIRONMENT}"
+
 function run_terraform() {
   local component="${1}"
   echo "Running ${component} Terraform ..."