@mbc-cqrs-serverless/cli 0.1.43-beta.0 → 0.1.45-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "0.1.43-beta.0",
+  "version": "0.1.45-beta.0",
   "description": "a CLI to get started with MBC CQRS serverless framework",
   "keywords": [
     "mbc",
@@ -49,5 +49,5 @@
   "devDependencies": {
     "@faker-js/faker": "^8.3.1"
   },
-  "gitHead": "ba6fe38347775dddd091df2fe8b5a27e83006bd6"
+  "gitHead": "6dfc72e062a7c97915aca77c3f2438e198785d1f"
 }

package/templates/.env.local

@@ -30,6 +30,7 @@ SFN_COMMAND_ARN=arn:aws:states:ap-northeast-1:101010101010:stateMachine:command
 SNS_ENDPOINT=http://localhost:4002
 SNS_REGION=ap-northeast-1
 SNS_TOPIC_ARN=arn:aws:sns:ap-northeast-1:101010101010:CqrsSnsTopic
+SNS_ALARM_TOPIC_ARN=arn:aws:sns:ap-northeast-1:101010101010:AlarmSnsTopic
 # Cognito endpoint, useful for local development
 COGNITO_URL=http://localhost:9229
 COGNITO_USER_POOL_ID=local_2G7noHgW

package/templates/infra/libs/infra-stack.ts

@@ -72,7 +72,7 @@ export class InfraStack extends cdk.Stack {
         mfa: cdk.aws_cognito.Mfa.OFF,
         accountRecovery: cdk.aws_cognito.AccountRecovery.NONE,
         customAttributes: {
-          tenant_code: new cdk.aws_cognito.StringAttribute({
+          tenant: new cdk.aws_cognito.StringAttribute({
             mutable: true,
             maxLen: 50,
           }),
@@ -334,6 +334,7 @@ export class InfraStack extends cdk.Stack {
       S3_BUCKET_NAME: ddbBucket.bucketName,
       SFN_COMMAND_ARN: commandSfnArn,
       SNS_TOPIC_ARN: mainSns.topicArn,
+      SNS_ALARM_TOPIC_ARN: alarmSns.topicArn,
       COGNITO_USER_POOL_ID: userPool.userPoolId,
       APPSYNC_ENDPOINT: appSyncApi.graphqlUrl,
       SES_FROM_EMAIL: props.config.fromEmailAddress,
@@ -697,9 +698,15 @@ export class InfraStack extends cdk.Stack {
       transformData,
       cdk.aws_stepfunctions.IntegrationPattern.REQUEST_RESPONSE,
     )
+    const setTtlCommand = lambdaInvoke(
+      'set_ttl_command',
+      historyCopy,
+      cdk.aws_stepfunctions.IntegrationPattern.REQUEST_RESPONSE,
+    )
+
     const waitPrevCommand = lambdaInvoke(
       'wait_prev_command',
-      historyCopy,
+      setTtlCommand,
       cdk.aws_stepfunctions.IntegrationPattern.WAIT_FOR_TASK_TOKEN,
     )
 
@@ -713,7 +720,7 @@ export class InfraStack extends cdk.Stack {
     )
       .when(
         cdk.aws_stepfunctions.Condition.numberEquals('$.result', 0),
-        historyCopy,
+        setTtlCommand,
       )
       .when(
         cdk.aws_stepfunctions.Condition.numberEquals('$.result', 1),
@@ -832,6 +839,7 @@ export class InfraStack extends cdk.Stack {
     ddbBucket.grantReadWrite(lambdaApi)
     publicBucket.grantReadWrite(lambdaApi)
     mainSns.grantPublish(lambdaApi)
+    alarmSns.grantPublish(lambdaApi)
     taskSqs.grantSendMessages(lambdaApi)
     notifySqs.grantSendMessages(lambdaApi)
     appSyncApi.grantMutation(lambdaApi)
@@ -906,6 +914,7 @@ export class InfraStack extends cdk.Stack {
       ddbBucket.grantReadWrite(taskRole)
       publicBucket.grantReadWrite(taskRole)
       mainSns.grantPublish(taskRole)
+      alarmSns.grantPublish(taskRole)
       taskSqs.grantSendMessages(taskRole)
       notifySqs.grantSendMessages(taskRole)
       appSyncApi.grantMutation(taskRole)

package/templates/infra/test/__snapshots__/infra.test.ts.snap

@@ -242,7 +242,7 @@ exports[`snapshot test for InfraStack 1`] = `
                   "Arn",
                 ],
               },
-              "","Payload":{"input.$":"$","context.$":"$$"}}},"check_version_result":{"Type":"Choice","Choices":[{"Variable":"$.result","NumericEquals":0,"Next":"history_copy"},{"Variable":"$.result","NumericEquals":1,"Next":"wait_prev_command"},{"Variable":"$.result","NumericEquals":-1,"Next":"fail"}],"Default":"wait_prev_command"},"wait_prev_command":{"Next":"history_copy","Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2}],"Type":"Task","OutputPath":"$.Payload[0][0]","Resource":"arn:",
+              "","Payload":{"input.$":"$","context.$":"$$"}}},"check_version_result":{"Type":"Choice","Choices":[{"Variable":"$.result","NumericEquals":0,"Next":"set_ttl_command"},{"Variable":"$.result","NumericEquals":1,"Next":"wait_prev_command"},{"Variable":"$.result","NumericEquals":-1,"Next":"fail"}],"Default":"wait_prev_command"},"wait_prev_command":{"Next":"set_ttl_command","Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2}],"Type":"Task","OutputPath":"$.Payload[0][0]","Resource":"arn:",
               {
                 "Ref": "AWS::Partition",
               },
@@ -253,7 +253,18 @@ exports[`snapshot test for InfraStack 1`] = `
                   "Arn",
                 ],
               },
-              "","Payload":{"input.$":"$","context.$":"$$","taskToken.$":"$$.Task.Token"}}},"history_copy":{"Next":"transform_data","Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2}],"Type":"Task","OutputPath":"$.Payload[0][0]","Resource":"arn:",
+              "","Payload":{"input.$":"$","context.$":"$$","taskToken.$":"$$.Task.Token"}}},"set_ttl_command":{"Next":"history_copy","Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2}],"Type":"Task","OutputPath":"$.Payload[0][0]","Resource":"arn:",
+              {
+                "Ref": "AWS::Partition",
+              },
+              ":states:::lambda:invoke","Parameters":{"FunctionName":"",
+              {
+                "Fn::GetAtt": [
+                  "lambdaapi893CD94E",
+                  "Arn",
+                ],
+              },
+              "","Payload":{"input.$":"$","context.$":"$$"}}},"history_copy":{"Next":"transform_data","Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2}],"Type":"Task","OutputPath":"$.Payload[0][0]","Resource":"arn:",
               {
                 "Ref": "AWS::Partition",
               },
@@ -631,6 +642,9 @@ exports[`snapshot test for InfraStack 1`] = `
             },
             "SES_FROM_EMAIL": "noreply@mbc-cqrs-serverless.mbc-net.com",
             "SFN_COMMAND_ARN": "arn:aws:states:ap-northeast-1:101010101010:stateMachine:dev-cdk-test-deploy-command-handler",
+            "SNS_ALARM_TOPIC_ARN": {
+              "Ref": "alarmsnsFB7BBC3B",
+            },
             "SNS_TOPIC_ARN": {
               "Ref": "mainsnsC0381B34",
             },
@@ -983,6 +997,13 @@ exports[`snapshot test for InfraStack 1`] = `
                 "Ref": "mainsnsC0381B34",
               },
             },
+            {
+              "Action": "sns:Publish",
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "alarmsnsFB7BBC3B",
+              },
+            },
             {
               "Action": [
                 "sqs:SendMessage",

package/templates/infra-local/cognito-local/db/local_2G7noHgW.json

@@ -11,7 +11,7 @@
           "Value": "admin@test.com"
         },
         {
-          "Name": "custom:tenant_code",
+          "Name": "custom:tenant",
           "Value": "mbc"
         },
         {
@@ -261,7 +261,7 @@
         }
       },
       {
-        "Name": "custom:tenant_code",
+        "Name": "custom:tenant",
         "AttributeDataType": "String",
         "DeveloperOnlyAttribute": false,
         "Mutable": true,

package/templates/infra-local/cognito-local/package-lock.json

@@ -919,10 +919,9 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
-      "license": "MIT",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -943,7 +942,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -958,6 +957,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/fast-redact": {
@@ -1854,10 +1857,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
-      "license": "MIT"
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",

package/templates/infra-local/elasticmq.conf

@@ -15,6 +15,11 @@ queues {
         delay = 5 seconds
         receiveMessageWait = 0 seconds
     }
+    alarm-queue {
+        defaultVisibilityTimeout = 60 seconds
+        delay = 5 seconds
+        receiveMessageWait = 0 seconds
+    }
 }
 
 aws {

package/templates/infra-local/serverless.yml

@@ -40,6 +40,10 @@ custom:
                 ['notification-action', 'command-status', 'task-status'],
             }
         queue: http://localhost:9324/101010101010/notification-queue
+      - topic:
+          topicName: AlarmSnsTopic
+          rawMessageDelivery: 'true'
+        queue: http://localhost:9324/101010101010/alarm-queue
     # host: 0.0.0.0 # Optional, defaults to 127.0.0.1 if not provided to serverless-offline
     # sns-endpoint: http://127.0.0.1:4567 # Optional. Only if you want to use a custom SNS provider endpoint
     # sns-subscribe-endpoint: http://127.0.0.1:3000 # Optional. Only if you want to use a custom subscribe endpoint from SNS to send messages back to
@@ -187,7 +191,7 @@ stepFunctions:
             Choices:
               - Variable: $.result
                 NumericEquals: 0
-                Next: history_copy
+                Next: set_ttl_command
               - Variable: $.result
                 NumericEquals: 1
                 Next: wait_prev_command
@@ -213,6 +217,24 @@ stepFunctions:
                 MaxAttempts: 5
                 BackoffRate: 2
             OutputPath: $.Payload[0][0]
+            Next: set_ttl_command
+          set_ttl_command:
+            Type: Task
+            Resource: arn:aws:states:::lambda:invoke
+            Parameters:
+              FunctionName: arn:aws:lambda:ap-northeast-1:101010101010:function:serverless-example-dev-main
+              Payload:
+                input.$: $
+                context.$: $$
+            Retry:
+              - ErrorEquals:
+                  - Lambda.ServiceException
+                  - Lambda.AWSLambdaException
+                  - Lambda.SdkClientException
+                IntervalSeconds: 2
+                MaxAttempts: 5
+                BackoffRate: 2
+            OutputPath: $.Payload[0][0]
             Next: history_copy
           history_copy:
             Type: Task