From bc8bfed88a444b56fe94e287b53c524acd04eca5 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 27 Sep 2024 09:34:12 -0500 Subject: [PATCH 1/2] fix(infra): use new site names --- infra/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/main.tf b/infra/main.tf index 90c2ba9c5..0966d2d10 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -13,7 +13,7 @@ module "fastly_production" { fastly_header_token = var.FASTLY_HEADER_TOKEN s3_logging_keys = var.fastly_s3_logging - ngwaf_site_name = "prod" + ngwaf_site_name = "pythondotorg-prod" ngwaf_email = "infrastructure-staff@python.org" ngwaf_token = var.ngwaf_token activate_ngwaf_service = false @@ -35,7 +35,7 @@ module "fastly_staging" { fastly_header_token = var.FASTLY_HEADER_TOKEN s3_logging_keys = var.fastly_s3_logging - ngwaf_site_name = "test" + ngwaf_site_name = "pythondotorg-test" ngwaf_email = "infrastructure-staff@python.org" ngwaf_token = var.ngwaf_token activate_ngwaf_service = true From ceb601b721297df02c198d76a099a4e72afc1108 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 27 Sep 2024 09:37:20 -0500 Subject: [PATCH 2/2] fix(infra): update validation regex --- infra/cdn/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/cdn/variables.tf b/infra/cdn/variables.tf index ec0a11a83..969d51e77 100644 --- a/infra/cdn/variables.tf +++ b/infra/cdn/variables.tf @@ -62,8 +62,8 @@ variable "ngwaf_site_name" { description = "Site SHORT name for NGWAF" validation { - condition = can(regex("^(test|stage|prod)$", var.ngwaf_site_name)) - error_message = "'ngwaf_site_name' must be one of the following: test, stage, or prod" + condition = can(regex("^(pythondotorg-test|pythondotorg-prod)$", var.ngwaf_site_name)) + error_message = "'ngwaf_site_name' must be one of the following: pythondotorg-test, or pythondotorg-prod" } } variable "ngwaf_email" {