Rename table to be more generic

Author: stevebux

infrastructure/terraform/components/api/README.md

@@ -54,11 +54,11 @@ No requirements.
 | <a name="module_amendment_event_transformer"></a> [amendment\_event\_transformer](#module\_amendment\_event\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
 | <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
+| <a name="module_ddb_alarms_idempotency"></a> [ddb\_alarms\_idempotency](#module\_ddb\_alarms\_idempotency) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_letter_queue"></a> [ddb\_alarms\_letter\_queue](#module\_ddb\_alarms\_letter\_queue) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_letters"></a> [ddb\_alarms\_letters](#module\_ddb\_alarms\_letters) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_mi"></a> [ddb\_alarms\_mi](#module\_ddb\_alarms\_mi) | ../../modules/alarms-ddb | n/a |
 | <a name="module_ddb_alarms_suppliers"></a> [ddb\_alarms\_suppliers](#module\_ddb\_alarms\_suppliers) | ../../modules/alarms-ddb | n/a |
-| <a name="module_ddb_alarms_upsert_idempotency"></a> [ddb\_alarms\_upsert\_idempotency](#module\_ddb\_alarms\_upsert\_idempotency) | ../../modules/alarms-ddb | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-s3bucket.zip | n/a |
 | <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-eventpub.zip | n/a |
 | <a name="module_eventsub"></a> [eventsub](#module\_eventsub) | ../../modules/eventsub | n/a |

…ents/api/ddb_table_upsert_idempotency.tf …/components/api/ddb_table_idempotency.tfinfrastructure/terraform/components/api/ddb_table_upsert_idempotency.tf renamed to infrastructure/terraform/components/api/ddb_table_idempotency.tf infrastructure/terraform/components/api/ddb_table_upsert_idempotency.tf renamed to infrastructure/terraform/components/api/ddb_table_idempotency.tf

@@ -1,5 +1,5 @@
-resource "aws_dynamodb_table" "upsert_idempotency" {
-  name         = "${local.csi}-upsert-idempotency"
+resource "aws_dynamodb_table" "idempotency" {
+  name         = "${local.csi}-idempotency"
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "id"
   attribute {

…/module_ddb_alarms_upsert_idempotency.tf …nts/api/module_ddb_alarms_idempotency.tfinfrastructure/terraform/components/api/module_ddb_alarms_upsert_idempotency.tf renamed to infrastructure/terraform/components/api/module_ddb_alarms_idempotency.tf infrastructure/terraform/components/api/module_ddb_alarms_upsert_idempotency.tf renamed to infrastructure/terraform/components/api/module_ddb_alarms_idempotency.tf

@@ -1,7 +1,7 @@
-module "ddb_alarms_upsert_idempotency" {
+module "ddb_alarms_idempotency" {
   count        = local.alarms_enabled ? 1 : 0
   source       = "../../modules/alarms-ddb"
   alarm_prefix = local.csi
-  table_name   = aws_dynamodb_table.upsert_idempotency.name
+  table_name   = aws_dynamodb_table.idempotency.name
   tags         = local.default_tags
 }

infrastructure/terraform/components/api/module_lambda_upsert_letter.tf

@@ -35,8 +35,8 @@ module "upsert_letter" {
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   lambda_env_vars = merge(local.common_lambda_env_vars, {
-    VARIANT_MAP                   = jsonencode(var.letter_variant_map),
-    UPSERT_IDEMPOTENCY_TABLE_NAME = aws_dynamodb_table.upsert_idempotency.name
+    VARIANT_MAP            = jsonencode(var.letter_variant_map),
+    IDEMPOTENCY_TABLE_NAME = aws_dynamodb_table.idempotency.name
   })
 }
 
@@ -68,7 +68,7 @@ data "aws_iam_policy_document" "upsert_letter_lambda" {
 
     resources = [
       aws_dynamodb_table.letters.arn,
-      aws_dynamodb_table.upsert_idempotency.arn,
+      aws_dynamodb_table.idempotency.arn,
       "${aws_dynamodb_table.letters.arn}/index/supplierStatus-index"
     ]
   }

lambdas/upsert-letter/src/config/__tests__/env.test.ts

@@ -16,14 +16,14 @@ describe("lambdaEnv", () => {
 
   it("should load all environment variables successfully", () => {
     process.env.LETTERS_TABLE_NAME = "letters-table";
-    process.env.UPSERT_IDEMPOTENCY_TABLE_NAME = "idempotency-table";
+    process.env.IDEMPOTENCY_TABLE_NAME = "idempotency-table";
     process.env.LETTER_TTL_HOURS = "12960";
 
     const { envVars } = require("../env");
 
     expect(envVars).toEqual({
       LETTERS_TABLE_NAME: "letters-table",
-      UPSERT_IDEMPOTENCY_TABLE_NAME: "idempotency-table",
+      IDEMPOTENCY_TABLE_NAME: "idempotency-table",
       LETTER_TTL_HOURS: 12_960,
     });
   });

lambdas/upsert-letter/src/config/deps.ts

@@ -29,7 +29,7 @@ function createLetterRepository(log: Logger): LetterRepository {
 
 function createIdempotencyLayer(): DynamoDBPersistenceLayer {
   return new DynamoDBPersistenceLayer({
-    tableName: envVars.UPSERT_IDEMPOTENCY_TABLE_NAME,
+    tableName: envVars.IDEMPOTENCY_TABLE_NAME,
   });
 }
 

lambdas/upsert-letter/src/config/env.ts

@@ -4,7 +4,7 @@ const EnvVarsSchema = z.object({
   LETTERS_TABLE_NAME: z.string(),
   LETTER_TTL_HOURS: z.coerce.number().int(),
   PINO_LOG_LEVEL: z.coerce.string().optional(),
-  UPSERT_IDEMPOTENCY_TABLE_NAME: z.string(),
+  IDEMPOTENCY_TABLE_NAME: z.string(),
 });
 
 export type EnvVars = z.infer<typeof EnvVarsSchema>;