@mbc-cqrs-serverless/cli 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "a CLI to get started with MBC CQRS serverless framework",
   "keywords": [
     "mbc",
@@ -58,5 +58,5 @@
     "@faker-js/faker": "^8.3.1",
     "copyfiles": "^2.4.1"
   },
-  "gitHead": "93b7187cfdf3999a1333bfd5cec90616faa04c3a"
+  "gitHead": "a2633ca2c02c4b0cbb86297d30110c39a7d2c502"
 }

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

@@ -887,9 +887,45 @@ export class InfraStack extends cdk.Stack {
       cdk.aws_stepfunctions.IntegrationPattern.REQUEST_RESPONSE,
     )
 
+    const importCsvSuccess = new cdk.aws_stepfunctions.Succeed(
+      this,
+      'ImportCsvSuccess',
+      {
+        stateName: 'success',
+      },
+    )
+
+    const finalizeParentJobInvoke = new cdk.aws_stepfunctions_tasks.LambdaInvoke(
+      this,
+      'finalize_parent_job',
+      {
+        lambdaFunction: lambdaApi,
+        payload: cdk.aws_stepfunctions.TaskInput.fromObject({
+          'input.$': '$',
+          'context.$': '$$',
+        }),
+        stateName: 'finalize_parent_job',
+        outputPath: '$.Payload[0][0]',
+        integrationPattern:
+          cdk.aws_stepfunctions.IntegrationPattern.REQUEST_RESPONSE,
+        retryOnServiceExceptions: false,
+      },
+    )
+    finalizeParentJobInvoke.addRetry({
+      errors: [
+        'Lambda.ServiceException',
+        'Lambda.AWSLambdaException',
+        'Lambda.SdkClientException',
+      ],
+      interval: cdk.Duration.seconds(2),
+      maxAttempts: 5,
+      backoffRate: 2,
+    })
+    const finalizeParentJobState = finalizeParentJobInvoke.next(importCsvSuccess)
+
     const sfnImportCsvDefinition = new DistributedMap(this, 'import-csv', {
       maxConcurrency: 50,
-      resultPath: cdk.aws_stepfunctions.JsonPath.DISCARD,
+      resultPath: '$.processingResults',
     })
       .setLabel('import-csv')
       .setItemReader({
@@ -903,8 +939,10 @@ export class InfraStack extends cdk.Stack {
           'Key.$': '$.key',
         },
       })
+      // For ImportPublishMode.SYNC tables, keep MaxItemsPerBatch low enough that sequential
+      // publishSync per row stays within the Lambda timeout (see import package import-publish.ts).
       .setItemBatcher({
-        MaxInputBytesPerBatch: 10,
+        MaxItemsPerBatch: 100,
         BatchInput: {
           'Attributes.$': '$',
         },
@@ -912,6 +950,7 @@ export class InfraStack extends cdk.Stack {
       .itemProcessor(csvRowsHandlerState, {
         executionType: cdk.aws_stepfunctions.ProcessorType.EXPRESS,
       })
+      .next(finalizeParentJobState)
 
     const sfnImportCsvLogGroup = new cdk.aws_logs.LogGroup(
       this,

package/templates/infra-local/serverless.yml

@@ -435,7 +435,76 @@ stepFunctions:
                 IntervalSeconds: 2
                 MaxAttempts: 5
                 BackoffRate: 2
-            OutputPath: $.Payload[0][0]
+            OutputPath: $.Payload
+            Next: finalize_parent_job
+          finalize_parent_job:
+            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
+            End: true
+    import-zip:
+      name: import-zip
+      definition:
+        Comment: 'Orchestrates the sequential processing of CSV files from a ZIP
+          archive.'
+        StartAt: ProcessFilesSequentially
+        States:
+          ProcessFilesSequentially:
+            Type: Map
+            ItemsPath: $.sortedS3Keys # The sorted array of S3 keys from the trigger
+            MaxConcurrency: 1 # Enforces sequential processing
+            Iterator:
+              StartAt: trigger_single_csv_and_wait
+              States:
+                trigger_single_csv_and_wait:
+                  Type: Task
+                  Resource: 'arn:aws:states:::lambda:invoke.waitForTaskToken'
+                  Parameters:
+                    FunctionName: 'arn:aws:lambda:ap-northeast-1:101010101010:function:serverless-example-dev-main'
+                    Payload:
+                      input.$: '$' # Passes the current S3 key to the Lambda
+                      context.$: '$$' # Passes the full state machine context
+                      taskToken.$: '$$.Task.Token'
+                  Retry:
+                    - ErrorEquals:
+                        - Lambda.ServiceException
+                        - Lambda.AWSLambdaException
+                        - Lambda.SdkClientException
+                      IntervalSeconds: 2
+                      MaxAttempts: 5
+                      BackoffRate: 2
+                  End: true
+            Next: finalize_zip_job
+          finalize_zip_job:
+            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
             End: true
 resources:
   Resources: