Skip to content

Commit 198ffd6

Browse files
SWhyteAnswerSWhyteAnswer
committed
[PRMP-1215] adding ndr-test to lambda contains
1 parent 67d0e8b commit 198ffd6

22 files changed

+37
-37
lines changed

‎infrastructure/api.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ resource "aws_api_gateway_gateway_response" "unauthorised_response" {
145145
}
146146

147147
response_parameters = {
148-
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
148+
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
149149
"gatewayresponse.header.Access-Control-Allow-Methods" = "'*'"
150150
"gatewayresponse.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Auth,X-Api-Key,X-Amz-Security-Token,X-Auth-Cookie,Accept'"
151151
"gatewayresponse.header.Access-Control-Allow-Credentials" = "'true'"
@@ -165,7 +165,7 @@ resource "aws_api_gateway_gateway_response" "bad_gateway_response" {
165165
}
166166

167167
response_parameters = {
168-
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
168+
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
169169
"gatewayresponse.header.Access-Control-Allow-Methods" = "'*'"
170170
"gatewayresponse.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Auth,X-Api-Key,X-Amz-Security-Token,X-Auth-Cookie,Accept'"
171171
"gatewayresponse.header.Access-Control-Allow-Credentials" = "'true'"

‎infrastructure/api_mtls.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ resource "aws_api_gateway_gateway_response" "unauthorised_response_mtls" {
108108
}
109109

110110
response_parameters = {
111-
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
111+
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
112112
"gatewayresponse.header.Access-Control-Allow-Methods" = "'*'"
113113
"gatewayresponse.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Auth,X-Api-Key,X-Amz-Security-Token,X-Auth-Cookie,Accept'"
114114
"gatewayresponse.header.Access-Control-Allow-Credentials" = "'true'"
@@ -124,7 +124,7 @@ resource "aws_api_gateway_gateway_response" "bad_gateway_response_mtls" {
124124
}
125125

126126
response_parameters = {
127-
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
127+
"gatewayresponse.header.Access-Control-Allow-Origin" = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
128128
"gatewayresponse.header.Access-Control-Allow-Methods" = "'*'"
129129
"gatewayresponse.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Auth,X-Api-Key,X-Amz-Security-Token,X-Auth-Cookie,Accept'"
130130
"gatewayresponse.header.Access-Control-Allow-Credentials" = "'true'"

‎infrastructure/buckets.tf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ module "ndr-document-store" {
1818
{
1919
allowed_headers = ["*"]
2020
allowed_methods = ["POST", "PUT", "DELETE"]
21-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
21+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
2222
expose_headers = ["ETag"]
2323
max_age_seconds = 3000
2424
},
2525
{
2626
allowed_methods = ["GET"]
27-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
27+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
2828
}
2929
]
3030
}
@@ -41,7 +41,7 @@ module "ndr-zip-request-store" {
4141
cors_rules = [
4242
{
4343
allowed_methods = ["GET"]
44-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
44+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
4545
}
4646
]
4747
}
@@ -62,13 +62,13 @@ module "ndr-lloyd-george-store" {
6262
{
6363
allowed_headers = ["*"]
6464
allowed_methods = ["POST", "PUT", "DELETE"]
65-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
65+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
6666
expose_headers = ["ETag"]
6767
max_age_seconds = 3000
6868
},
6969
{
7070
allowed_methods = ["GET"]
71-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
71+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
7272
}
7373
]
7474
}
@@ -110,7 +110,7 @@ module "statistical-reports-store" {
110110
cors_rules = [
111111
{
112112
allowed_methods = ["GET"]
113-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
113+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
114114
}
115115
]
116116
}
@@ -131,13 +131,13 @@ module "ndr-bulk-staging-store" {
131131
{
132132
allowed_headers = ["*"]
133133
allowed_methods = ["POST", "PUT", "DELETE"]
134-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
134+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
135135
expose_headers = ["ETag"]
136136
max_age_seconds = 3000
137137
},
138138
{
139139
allowed_methods = ["GET"]
140-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
140+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
141141
}
142142
]
143143
}
@@ -174,7 +174,7 @@ module "ndr-document-pending-review-store" {
174174
cors_rules = [
175175
{
176176
allowed_methods = ["GET"]
177-
allowed_origins = [contains(["prod"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
177+
allowed_origins = [contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}" : "https://${terraform.workspace}.${var.domain}"]
178178
}
179179
]
180180
}

‎infrastructure/gateway-document-reference.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module "document_reference_gateway" {
1919
gateway_path = "DocumentReference"
2020
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
2121
require_credentials = true
22-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
22+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
2323
}
2424

2525
module "document_reference_id_gateway" {
@@ -31,7 +31,7 @@ module "document_reference_id_gateway" {
3131
gateway_path = "{id}"
3232
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
3333
require_credentials = true
34-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
34+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
3535

3636
request_parameters = {
3737
"method.request.path.id" = true

‎infrastructure/gateway-review-document.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "review_document_gateway" {
77
gateway_path = "DocumentReview"
88
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
99
require_credentials = true
10-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
10+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1111
}
1212

1313
resource "aws_api_gateway_resource" "review_document_id" {
@@ -25,7 +25,7 @@ module "review_document_version_gateway" {
2525
gateway_path = "{version}"
2626
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
2727
require_credentials = true
28-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
28+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
2929

3030
request_parameters = {
3131
"method.request.path.id" = true
@@ -42,5 +42,5 @@ module "review_document_status_gateway" {
4242
require_credentials = true
4343
authorization = "CUSTOM"
4444
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
45-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
45+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
4646
}

‎infrastructure/lambda-access-audit.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "access-audit-gateway" {
77
gateway_path = "AccessAudit"
88
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
99
require_credentials = true
10-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
10+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1111
}
1212

1313
module "access-audit-alarm" {

‎infrastructure/lambda-back-channel-logout.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module "back-channel-logout-gateway" {
66
authorization = "NONE"
77
gateway_path = "BackChannelLogout"
88
require_credentials = false
9-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
9+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1010
}
1111

1212
module "back_channel_logout_lambda" {
@@ -32,7 +32,7 @@ module "back_channel_logout_lambda" {
3232
ENVIRONMENT = var.environment
3333
AUTH_DYNAMODB_NAME = "${terraform.workspace}_${var.auth_session_dynamodb_table_name}"
3434
SSM_PARAM_JWT_TOKEN_PUBLIC_KEY = "jwt_token_public_key"
35-
OIDC_CALLBACK_URL = contains(["prod"], terraform.workspace) ? "https://${var.domain}/auth-callback" : "https://${terraform.workspace}.${var.domain}/auth-callback"
35+
OIDC_CALLBACK_URL = contains(["prod", "ndr-test"], terraform.workspace) ? "https://${var.domain}/auth-callback" : "https://${terraform.workspace}.${var.domain}/auth-callback"
3636
}
3737
depends_on = [
3838
aws_api_gateway_rest_api.ndr_doc_store_api,

‎infrastructure/lambda-delete-doc-ref.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "delete-doc-ref-gateway" {
77
gateway_path = "DocumentDelete"
88
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
99
require_credentials = true
10-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
10+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1111
}
1212

1313
module "delete_doc_alarm" {

‎infrastructure/lambda-document-manifest-job.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "document-manifest-job-gateway" {
77
gateway_path = "DocumentManifest"
88
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
99
require_credentials = true
10-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
10+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1111
}
1212

1313
module "document_manifest_alarm" {

‎infrastructure/lambda-document-status-check-result.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "document-status-check-gateway" {
77
gateway_path = "DocumentStatus"
88
authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
99
require_credentials = true
10-
origin = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
10+
origin = contains(["prod", "ndr-test"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
1111
}
1212

1313
module "document-status-check-alarm" {

0 commit comments

Comments
 (0)