From ff045efd4c4c79c373d66ad11c5bdefc4a05e750 Mon Sep 17 00:00:00 2001 From: samchungy Date: Wed, 17 Apr 2024 16:19:24 +1000 Subject: [PATCH 1/4] Align dlq naming --- .../infra/__snapshots__/appStack.test.ts.snap | 4 ++-- template/lambda-sqs-worker-cdk/infra/appStack.ts | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap index e113863f4..8d6d80ec3 100644 --- a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +++ b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap @@ -1006,7 +1006,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = ` "Arn", ], }, - "QueueName": "serviceName-dlq", + "QueueName": "serviceName-dead-letters", }, "Type": "AWS::SQS::Queue", "UpdateReplacePolicy": "Delete", @@ -2048,7 +2048,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = ` "Arn", ], }, - "QueueName": "serviceName-dlq", + "QueueName": "serviceName-dead-letters", }, "Type": "AWS::SQS::Queue", "UpdateReplacePolicy": "Delete", diff --git a/template/lambda-sqs-worker-cdk/infra/appStack.ts b/template/lambda-sqs-worker-cdk/infra/appStack.ts index 3dcfba533..eeec477f1 100644 --- a/template/lambda-sqs-worker-cdk/infra/appStack.ts +++ b/template/lambda-sqs-worker-cdk/infra/appStack.ts @@ -32,10 +32,14 @@ export class AppStack extends Stack { kmsKey.grantEncrypt(accountPrincipal); - const deadLetterQueue = new aws_sqs.Queue(this, 'worker-queue-dlq', { - queueName: '<%- serviceName %>-dlq', - encryptionMasterKey: kmsKey, - }); + const deadLetterQueue = new aws_sqs.Queue( + this, + 'worker-queue-dead-letters', + { + queueName: '<%- serviceName %>-dead-letters', + encryptionMasterKey: kmsKey, + }, + ); const queue = new aws_sqs.Queue(this, 'worker-queue', { queueName: '<%- serviceName %>', From 427c77cfe4442158dfae844d516d14800a70dd98 Mon Sep 17 00:00:00 2001 From: samchungy Date: Wed, 17 Apr 2024 16:21:09 +1000 Subject: [PATCH 2/4] Add changeset --- .changeset/heavy-apples-applaud.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/heavy-apples-applaud.md diff --git a/.changeset/heavy-apples-applaud.md b/.changeset/heavy-apples-applaud.md new file mode 100644 index 000000000..970e08bd5 --- /dev/null +++ b/.changeset/heavy-apples-applaud.md @@ -0,0 +1,5 @@ +--- +'skuba': patch +--- + +template/lambda-sqs-worker-cdk: Align dead letter queue naming From 4cd96c63e91154a22e154301e3f35ff36115a94f Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Wed, 17 Apr 2024 16:22:07 +1000 Subject: [PATCH 3/4] Update heavy-apples-applaud.md --- .changeset/heavy-apples-applaud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/heavy-apples-applaud.md b/.changeset/heavy-apples-applaud.md index 970e08bd5..676b2a1e4 100644 --- a/.changeset/heavy-apples-applaud.md +++ b/.changeset/heavy-apples-applaud.md @@ -2,4 +2,4 @@ 'skuba': patch --- -template/lambda-sqs-worker-cdk: Align dead letter queue naming +template/lambda-sqs-worker-cdk: Align dead letter queue naming with Serverless template From 5186e170a2ff2db45cb270a9c043bddd291c8850 Mon Sep 17 00:00:00 2001 From: samchungy Date: Wed, 17 Apr 2024 16:24:52 +1000 Subject: [PATCH 4/4] update snap --- .../infra/__snapshots__/appStack.test.ts.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap index 8d6d80ec3..6b39e637e 100644 --- a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +++ b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap @@ -934,7 +934,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = ` "RedrivePolicy": { "deadLetterTargetArn": { "Fn::GetAtt": [ - "workerqueuedlq42262778", + "workerqueuedeadletters83F3505C", "Arn", ], }, @@ -997,7 +997,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = ` }, "Type": "AWS::SNS::Subscription", }, - "workerqueuedlq42262778": { + "workerqueuedeadletters83F3505C": { "DeletionPolicy": "Delete", "Properties": { "KmsMasterKeyId": { @@ -1976,7 +1976,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = ` "RedrivePolicy": { "deadLetterTargetArn": { "Fn::GetAtt": [ - "workerqueuedlq42262778", + "workerqueuedeadletters83F3505C", "Arn", ], }, @@ -2039,7 +2039,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = ` }, "Type": "AWS::SNS::Subscription", }, - "workerqueuedlq42262778": { + "workerqueuedeadletters83F3505C": { "DeletionPolicy": "Delete", "Properties": { "KmsMasterKeyId": {