Merge branch 'main' into ecs-patterns-docs-fix

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions/test/integ.map-distributed.js.snapshot/cdk-stepfunctions-map-distributed-stack.template.json

@@ -20,7 +20,7 @@
   "StateMachine2E01A3A5": {
    "Type": "AWS::StepFunctions::StateMachine",
    "Properties": {
-    "DefinitionString": "{\"StartAt\":\"My-Map-State\",\"States\":{\"My-Map-State\":{\"Type\":\"Map\",\"End\":true,\"Parameters\":{\"foo\":\"foo\",\"bar.$\":\"$.bar\"},\"ItemsPath\":\"$.inputForMap\",\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass State\",\"States\":{\"Pass State\":{\"Type\":\"Pass\",\"End\":true}}},\"MaxConcurrency\":1}},\"TimeoutSeconds\":30}",
+    "DefinitionString": "{\"StartAt\":\"My-Map-State\",\"States\":{\"My-Map-State\":{\"Type\":\"Map\",\"End\":true,\"Parameters\":{\"foo\":\"foo\",\"bar.$\":\"$.bar\"},\"ItemsPath\":\"$.inputForMap\",\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass State\",\"States\":{\"Pass State\":{\"Type\":\"Pass\",\"End\":true}}},\"MaxConcurrencyPath\":\"$.maxConcurrency\"}},\"TimeoutSeconds\":30}",
     "RoleArn": {
      "Fn::GetAtt": [
       "StateMachineRoleB840431D",

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions/test/integ.map-distributed.ts

@@ -12,7 +12,7 @@ const stack = new cdk.Stack(app, 'cdk-stepfunctions-map-distributed-stack');
 
 const map = new sfn.Map(stack, 'Map', {
   stateName: 'My-Map-State',
-  maxConcurrency: 1,
+  maxConcurrencyPath: sfn.JsonPath.stringAt('$.maxConcurrency'),
   itemsPath: sfn.JsonPath.stringAt('$.inputForMap'),
   parameters: {
     foo: 'foo',

packages/aws-cdk-lib/aws-stepfunctions/lib/states/map-base.ts

@@ -90,9 +90,24 @@ export interface MapBaseProps {
    *
    * An upper bound on the number of iterations you want running at once.
    *
+   * @see
+   * https://docs.aws.amazon.com/step-functions/latest/dg/concepts-asl-use-map-state-inline.html#map-state-inline-additional-fields
+   *
    * @default - full concurrency
    */
   readonly maxConcurrency?: number;
+
+  /**
+   * MaxConcurrencyPath
+   *
+   * A JsonPath that specifies the maximum concurrency dynamically from the state input.
+   *
+   * @see
+   * https://docs.aws.amazon.com/step-functions/latest/dg/concepts-asl-use-map-state-inline.html#map-state-inline-additional-fields
+   *
+   * @default - full concurrency
+   */
+  readonly maxConcurrencyPath?: string;
 }
 
 /**
@@ -122,13 +137,15 @@ export abstract class MapBase extends State implements INextable {
   public readonly endStates: INextable[];
 
   private readonly maxConcurrency?: number;
+  private readonly maxConcurrencyPath?: string;
   protected readonly itemsPath?: string;
   protected readonly itemSelector?: { [key: string]: any };
 
   constructor(scope: Construct, id: string, props: MapBaseProps = {}) {
     super(scope, id, props);
     this.endStates = [this];
     this.maxConcurrency = props.maxConcurrency;
+    this.maxConcurrencyPath = props.maxConcurrencyPath;
     this.itemsPath = props.itemsPath;
     this.itemSelector = props.itemSelector;
   }
@@ -156,7 +173,8 @@ export abstract class MapBase extends State implements INextable {
       ...this.renderItemsPath(),
       ...this.renderItemSelector(),
       ...this.renderItemProcessor(),
-      MaxConcurrency: this.maxConcurrency,
+      ...(this.maxConcurrency && { MaxConcurrency: this.maxConcurrency }),
+      ...(this.maxConcurrencyPath && { MaxConcurrencyPath: renderJsonPath(this.maxConcurrencyPath) }),
     };
   }
 
@@ -174,6 +192,10 @@ export abstract class MapBase extends State implements INextable {
       errors.push('maxConcurrency has to be a positive integer');
     }
 
+    if (this.maxConcurrency && this.maxConcurrencyPath) {
+      errors.push('Provide either `maxConcurrency` or `maxConcurrencyPath`, but not both');
+    }
+
     return errors;
   }
 

packages/aws-cdk-lib/aws-stepfunctions/test/map.test.ts

@@ -45,6 +45,49 @@ describe('Map State', () => {
     });
   }),
 
+  test('State Machine With Map State and MaxConcurrencyPath', () => {
+    // GIVEN
+    const stack = new cdk.Stack();
+
+    // WHEN
+    const map = new stepfunctions.Map(stack, 'Map State', {
+      stateName: 'My-Map-State',
+      maxConcurrencyPath: stepfunctions.JsonPath.stringAt('$.maxConcurrencyPath'),
+      itemsPath: stepfunctions.JsonPath.stringAt('$.inputForMap'),
+      parameters: {
+        foo: 'foo',
+        bar: stepfunctions.JsonPath.stringAt('$.bar'),
+      },
+    });
+    map.iterator(new stepfunctions.Pass(stack, 'Pass State'));
+
+    // THEN
+    expect(render(map)).toStrictEqual({
+      StartAt: 'My-Map-State',
+      States: {
+        'My-Map-State': {
+          Type: 'Map',
+          End: true,
+          Parameters: {
+            'foo': 'foo',
+            'bar.$': '$.bar',
+          },
+          Iterator: {
+            StartAt: 'Pass State',
+            States: {
+              'Pass State': {
+                Type: 'Pass',
+                End: true,
+              },
+            },
+          },
+          ItemsPath: '$.inputForMap',
+          MaxConcurrencyPath: '$.maxConcurrencyPath',
+        },
+      },
+    });
+  }),
+
   test('State Machine With Map State and ResultSelector', () => {
     // GIVEN
     const stack = new cdk.Stack();
@@ -395,6 +438,21 @@ describe('Map State', () => {
     expect(() => app.synth()).toThrow(/maxConcurrency has to be a positive integer/);
   }),
 
+  test('fails in synthesis when maxConcurrency and maxConcurrencyPath are both defined', () => {
+    const app = createAppWithMap((stack) => {
+      const map = new stepfunctions.Map(stack, 'Map State', {
+        maxConcurrency: 1,
+        maxConcurrencyPath: stepfunctions.JsonPath.stringAt('$.maxConcurrencyPath'),
+        itemsPath: stepfunctions.JsonPath.stringAt('$.inputForMap'),
+      });
+      map.iterator(new stepfunctions.Pass(stack, 'Pass State'));
+
+      return map;
+    });
+
+    expect(() => app.synth()).toThrow(/Provide either `maxConcurrency` or `maxConcurrencyPath`, but not both/);
+  }),
+
   test('does not fail synthesis when maxConcurrency is a jsonPath', () => {
     const app = createAppWithMap((stack) => {
       const map = new stepfunctions.Map(stack, 'Map State', {