Skip to content

Commit d891f21

Browse files
authored
[PRMP-1718] Fix incorrect domain for api gateway and feedback (#276)
1 parent 95614e2 commit d891f21

5 files changed

Lines changed: 6 additions & 12 deletions

File tree

infrastructure/lambda-feature-flags.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module "feature-flags-gateway" {
88
gateway_path = "FeatureFlags"
99
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
1010
require_credentials = true
11-
origin = "'https://${terraform.workspace}.${var.domain}'"
11+
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1212

1313
# Lambda Variables
1414
api_execution_arn = aws_api_gateway_rest_api.ndr_doc_store_api.execution_arn

infrastructure/lambda-send-feedback.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
locals {
22
ses_feedback_sender_email_address = (
3-
local.is_production ? "feedback@${var.certificate_domain}" :
43
local.is_sandbox ? "feedback@ndr-dev.${var.domain}" :
54
"feedback@${terraform.workspace}.${var.domain}"
65
)
@@ -20,7 +19,7 @@ module "send-feedback-gateway" {
2019
gateway_path = "Feedback"
2120
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
2221
require_credentials = true
23-
origin = "'https://${terraform.workspace}.${var.domain}'"
22+
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
2423

2524
# Lambda Variables
2625
api_execution_arn = aws_api_gateway_rest_api.ndr_doc_store_api.execution_arn

infrastructure/lambda-upload-confirm-result.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module "upload_confirm_result_gateway" {
88
gateway_path = "UploadConfirm"
99
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
1010
require_credentials = true
11-
origin = "'https://${terraform.workspace}.${var.domain}'"
11+
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1212

1313
api_execution_arn = aws_api_gateway_rest_api.ndr_doc_store_api.execution_arn
1414
owner = var.owner

infrastructure/lambda-virus-scan-result.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module "virus_scan_result_gateway" {
88
gateway_path = "VirusScan"
99
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
1010
require_credentials = true
11-
origin = "'https://${terraform.workspace}.${var.domain}'"
11+
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1212

1313
# Lambda Variables
1414
api_execution_arn = aws_api_gateway_rest_api.ndr_doc_store_api.execution_arn

infrastructure/ses.tf

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
locals {
2-
domain_prefix = (
3-
local.is_production ? var.environment :
4-
local.is_sandbox ? "ndr-dev" :
5-
terraform.workspace
6-
)
7-
8-
domain = "${local.domain_prefix}.${var.domain}"
2+
domain_prefix = terraform.workspace
3+
domain = "${local.domain_prefix}.${var.domain}"
94
}
105

116
module "ndr-feedback-mailbox" {

0 commit comments

Comments
 (0)