@mbc-cqrs-serverless/cli 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "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": "89a28b1fdcd20b731a0c02be92a2194634451209"
+  "gitHead": "1a47757dc1d91b650d413d1e414895abf0af8dc9"
 }

package/templates/infra/libs/distributed-map.ts

@@ -16,6 +16,17 @@ export type DistributedMapS3Parameter =
       readonly Key: JsonPath | string
     }
 
+/** ResultWriter uses Bucket + Prefix (not Key). See distributed Map ResultWriter. */
+export type DistributedMapResultWriterParameters =
+  | {
+      readonly 'Bucket.$': string
+      readonly 'Prefix.$': string
+    }
+  | {
+      readonly Bucket: JsonPath | string
+      readonly Prefix: JsonPath | string
+    }
+
 export interface DistributedMapItemReader {
   readonly Resource:
     | 'arn:aws:states:::s3:getObject'
@@ -31,7 +42,7 @@ export interface DistributedMapItemReader {
 
 export interface DistributedMapResultWriter {
   readonly Resource: 'arn:aws:states:::s3:putObject'
-  readonly Parameters: DistributedMapS3Parameter
+  readonly Parameters: DistributedMapResultWriterParameters
 }
 
 export interface DistributedMapItemBatcher {

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

@@ -402,6 +402,7 @@ export class InfraStack extends cdk.Stack {
       DATABASE_URL: `postgresql://${props.config.rds.accountSsmKey}@${props.config.rds.endpoint}/${props.config.rds.dbName}?schema=public`,
       S3_PUBLIC_BUCKET_NAME: publicBucket.bucketName,
       FRONT_BASE_URL: props.config.frontBaseUrl,
+      IMPORT_QUEUE_URL: importActionSqs.queueUrl,
     }
     const lambdaApi = new cdk.aws_lambda.Function(this, 'lambda-api', {
       vpc,
@@ -895,22 +896,23 @@ export class InfraStack extends cdk.Stack {
       },
     )
 
-    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,
-      },
-    )
+    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',
@@ -921,11 +923,12 @@ export class InfraStack extends cdk.Stack {
       maxAttempts: 5,
       backoffRate: 2,
     })
-    const finalizeParentJobState = finalizeParentJobInvoke.next(importCsvSuccess)
+    const finalizeParentJobState =
+      finalizeParentJobInvoke.next(importCsvSuccess)
 
     const sfnImportCsvDefinition = new DistributedMap(this, 'import-csv', {
       maxConcurrency: 50,
-      resultPath: '$.processingResults',
+      resultPath: '$.mapOutput', // Captures the MapRunArn and ResultWriterDetails
     })
       .setLabel('import-csv')
       .setItemReader({
@@ -939,18 +942,32 @@ 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({
         MaxItemsPerBatch: 100,
         BatchInput: {
           'Attributes.$': '$',
         },
       })
+      .setResultWriter({
+        Resource: 'arn:aws:states:::s3:putObject',
+        Parameters: {
+          // Replace this with your actual CDK bucket reference (e.g., props.bucket.bucketName)
+          Bucket: 'your-import-bucket-name',
+          Prefix: 'sfn-results/import-csv',
+        },
+      })
       .itemProcessor(csvRowsHandlerState, {
-        executionType: cdk.aws_stepfunctions.ProcessorType.EXPRESS,
+        executionType: aws_stepfunctions.ProcessorType.STANDARD,
       })
-      .next(finalizeParentJobState)
+
+    // Catch ALL Map state errors and route them to finalizeParentJobState
+    sfnImportCsvDefinition.addCatch(finalizeParentJobState, {
+      errors: ['States.ALL'],
+      resultPath: '$.errorOutput',
+    })
+
+    // Normal successful flow
+    sfnImportCsvDefinition.next(finalizeParentJobState)
 
     const sfnImportCsvLogGroup = new cdk.aws_logs.LogGroup(
       this,
@@ -1081,6 +1098,7 @@ export class InfraStack extends cdk.Stack {
     taskSqs.grantSendMessages(lambdaApi)
     notifySqs.grantSendMessages(lambdaApi)
     appSyncApi.grantMutation(lambdaApi)
+    importActionSqs.grantSendMessages(lambdaApi)
 
     // Define an IAM policy for full DynamoDB access
     const dynamoDbTablePrefixArn = cdk.Arn.format({