Skip to content

Commit 14f55b5

Browse files
NogaNHSNogaNHS
authored
[PRMP-881] Update upload review DynamoDB table (#514)
Signed-off-by: NogaNHS <[email protected]>
1 parent 504f15c commit 14f55b5

11 files changed

+31
-28
lines changed

‎infrastructure/dynamo_db_review.tf‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
module "document_review_dynamodb_table" {
2-
count = local.is_production ? 0 : 1
1+
module "document_upload_review_dynamodb_table" {
32
source = "./modules/dynamo_db"
43
table_name = var.document_review_table_name
54
hash_key = "ID"
5+
sort_key = "Version"
66
deletion_protection_enabled = local.is_production
77
stream_enabled = false
8-
ttl_enabled = true
9-
ttl_attribute_name = "TTL"
8+
ttl_enabled = false
109
point_in_time_recovery_enabled = !local.is_sandbox
1110

1211
attributes = [
@@ -36,11 +35,15 @@ module "document_review_dynamodb_table" {
3635
},
3736
{
3837
name = "ReviewDate"
39-
type = "S"
38+
type = "N"
4039
},
4140
{
4241
name = "UploadDate"
4342
type = "N"
43+
},
44+
{
45+
name = "Version"
46+
type = "N"
4447
}
4548

4649
]

‎infrastructure/lambda-document-review-processor.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module "document_review_processor_lambda" {
66
module.document_review_queue.sqs_read_policy_document,
77
module.document_review_queue.sqs_write_policy_document,
88
module.ndr-document-pending-review-store.s3_write_policy_document,
9-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
10-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
9+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
10+
module.document_upload_review_dynamodb_table.dynamodb_write_policy_document,
1111
module.ndr-bulk-staging-store.s3_read_policy_document,
1212
module.ndr-bulk-staging-store.s3_write_policy_document,
1313
]
@@ -21,7 +21,7 @@ module "document_review_processor_lambda" {
2121
lambda_environment_variables = {
2222
PENDING_REVIEW_BUCKET_NAME = module.ndr-document-pending-review-store.bucket_id
2323
STAGING_STORE_BUCKET_NAME = module.ndr-bulk-staging-store.bucket_id
24-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
24+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2525
WORKSPACE = terraform.workspace
2626
}
2727
}

‎infrastructure/lambda-document-upload-check.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ module "document_upload_check_lambda" {
1313
module.pdm_dynamodb_table.dynamodb_read_policy_document,
1414
module.pdm_dynamodb_table.dynamodb_write_policy_document,
1515
data.aws_iam_policy.aws_lambda_vpc_access_execution_role.policy,
16-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
17-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
16+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
17+
module.document_upload_review_dynamodb_table.dynamodb_write_policy_document,
1818
module.ndr-document-pending-review-store.s3_write_policy_document,
1919
module.core_dynamodb_table.dynamodb_read_policy_document,
2020
module.core_dynamodb_table.dynamodb_write_policy_document,
@@ -25,7 +25,7 @@ module "document_upload_check_lambda" {
2525
api_execution_arn = null
2626
lambda_environment_variables = {
2727
LLOYD_GEORGE_DYNAMODB_NAME = module.lloyd_george_reference_dynamodb_table.table_name
28-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
28+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2929
PDM_DYNAMODB_NAME = module.pdm_dynamodb_table.table_name
3030
STAGING_STORE_BUCKET_NAME = module.ndr-bulk-staging-store.bucket_id
3131
LLOYD_GEORGE_BUCKET_NAME = module.ndr-lloyd-george-store.bucket_id

‎infrastructure/lambda-get-document-review.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module "get_document_review_lambda" {
66
module.ndr-app-config.app_config_policy,
77
module.cloudfront_edge_dynamodb_table.dynamodb_read_policy_document,
88
module.cloudfront_edge_dynamodb_table.dynamodb_write_policy_document,
9-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
9+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
1010
aws_iam_policy.ssm_access_policy.policy,
1111
module.ndr-document-pending-review-store.s3_read_policy_document
1212
]
@@ -22,7 +22,7 @@ module "get_document_review_lambda" {
2222
APPCONFIG_APPLICATION = module.ndr-app-config.app_config_application_id
2323
APPCONFIG_ENVIRONMENT = module.ndr-app-config.app_config_environment_id
2424
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
25-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
25+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2626
EDGE_REFERENCE_TABLE = module.cloudfront_edge_dynamodb_table.table_name
2727
CLOUDFRONT_URL = module.cloudfront-distribution-lg.cloudfront_url
2828
PRESIGNED_ASSUME_ROLE = aws_iam_role.get_document_review_presign.arn

‎infrastructure/lambda-mns-notification.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module "mns-notification-lambda" {
88
module.sqs-mns-notification-queue[0].sqs_write_policy_document,
99
module.lloyd_george_reference_dynamodb_table.dynamodb_write_policy_document,
1010
module.lloyd_george_reference_dynamodb_table.dynamodb_read_policy_document,
11-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
12-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
11+
module.document_upload_review_dynamodb_table.dynamodb_write_policy_document,
12+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
1313
aws_iam_policy.ssm_access_policy.policy,
1414
module.ndr-app-config.app_config_policy,
1515
aws_iam_policy.kms_mns_lambda_access[0].policy,
@@ -23,7 +23,7 @@ module "mns-notification-lambda" {
2323
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
2424
WORKSPACE = terraform.workspace
2525
LLOYD_GEORGE_DYNAMODB_NAME = module.lloyd_george_reference_dynamodb_table.table_name
26-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
26+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2727
MNS_NOTIFICATION_QUEUE_URL = module.sqs-mns-notification-queue[0].sqs_url
2828
PDS_FHIR_IS_STUBBED = local.is_sandbox
2929
}

‎infrastructure/lambda-patch-document-review.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module "patch_document_review_lambda" {
44
handler = "handlers.patch_document_review_handler.lambda_handler"
55
iam_role_policy_documents = [
66
module.ndr-app-config.app_config_policy,
7-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
8-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
7+
module.document_upload_review_dynamodb_table.dynamodb_write_policy_document,
8+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
99
aws_iam_policy.ssm_access_policy.policy,
1010
module.ndr-document-pending-review-store.s3_write_policy_document
1111
]
@@ -21,7 +21,7 @@ module "patch_document_review_lambda" {
2121
APPCONFIG_APPLICATION = module.ndr-app-config.app_config_application_id
2222
APPCONFIG_ENVIRONMENT = module.ndr-app-config.app_config_environment_id
2323
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
24-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
24+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2525
WORKSPACE = terraform.workspace
2626
}
2727
depends_on = [

‎infrastructure/lambda-post-document-review.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module "post_document_review_lambda" {
44
handler = "handlers.post_document_review_handler.lambda_handler"
55
iam_role_policy_documents = [
66
module.ndr-app-config.app_config_policy,
7-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
8-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
7+
module.document_upload_review_dynamodb_table.dynamodb_write_policy_document,
8+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
99
aws_iam_policy.ssm_access_policy.policy,
1010
module.ndr-bulk-staging-store.s3_write_policy_document,
1111
module.cloudfront_edge_dynamodb_table.dynamodb_write_policy_document,
@@ -22,7 +22,7 @@ module "post_document_review_lambda" {
2222
APPCONFIG_APPLICATION = module.ndr-app-config.app_config_application_id
2323
APPCONFIG_ENVIRONMENT = module.ndr-app-config.app_config_environment_id
2424
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
25-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
25+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2626
PRESIGNED_ASSUME_ROLE = aws_iam_role.post_document_review_presign.arn
2727
WORKSPACE = terraform.workspace
2828
STAGING_STORE_BUCKET_NAME = module.ndr-bulk-staging-store.bucket_id

‎infrastructure/lambda-review-document-status.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module "review-document-status-check-lambda" {
55
iam_role_policy_documents = [
66
module.ndr-app-config.app_config_policy,
77
aws_iam_policy.ssm_access_policy.policy,
8-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document
8+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
99
]
1010
kms_deletion_window = var.kms_deletion_window
1111
rest_api_id = aws_api_gateway_rest_api.ndr_doc_store_api.id
@@ -16,7 +16,7 @@ module "review-document-status-check-lambda" {
1616
APPCONFIG_APPLICATION = module.ndr-app-config.app_config_application_id
1717
APPCONFIG_ENVIRONMENT = module.ndr-app-config.app_config_environment_id
1818
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
19-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
19+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2020
DOCUMENT_REVIEW_S3_BUCKET_NAME = module.ndr-document-pending-review-store.bucket_id
2121
WORKSPACE = terraform.workspace
2222
}

‎infrastructure/lambda-search-document-review.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module "search_document_review_lambda" {
44
handler = "handlers.search_document_review_handler.lambda_handler"
55
iam_role_policy_documents = [
66
module.ndr-app-config.app_config_policy,
7-
local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
7+
module.document_upload_review_dynamodb_table.dynamodb_read_policy_document,
88
aws_iam_policy.ssm_access_policy.policy
99
]
1010

@@ -19,7 +19,7 @@ module "search_document_review_lambda" {
1919
APPCONFIG_APPLICATION = module.ndr-app-config.app_config_application_id
2020
APPCONFIG_ENVIRONMENT = module.ndr-app-config.app_config_environment_id
2121
APPCONFIG_CONFIGURATION = module.ndr-app-config.app_config_configuration_profile_id
22-
DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
22+
DOCUMENT_REVIEW_DYNAMODB_NAME = module.document_upload_review_dynamodb_table.table_name
2323
WORKSPACE = terraform.workspace
2424
}
2525
depends_on = [

‎infrastructure/moved-resources.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ moved {
1212
moved {
1313
from = module.update_doc_ref_alarm_topic
1414
to = module.update-doc-ref-alarm-topic
15-
}
15+
}

0 commit comments

Comments
 (0)