Merge pull request #258 from horike37/feature/mapstate

feat: support the new Map state

Author: horike37

lib/deploy/stepFunctions/compileIamRole.js

@@ -16,6 +16,10 @@ function getTaskStates(states) {
         const parallelStates = _.flatMap(state.Branches, branch => _.values(branch.States));
         return getTaskStates(parallelStates);
       }
+      case 'Map': {
+        const mapStates = state.Iterator.States;
+        return getTaskStates(mapStates);
+      }
       default: {
         return [];
       }

lib/deploy/stepFunctions/compileIamRole.test.js

@@ -33,6 +33,15 @@ describe('#compileIamRole', () => {
     expect(statements[0].Resource).to.equal('*');
   };
 
+  const getAlias = functionArn => ({
+    'Fn::Sub': [
+      '${functionArn}:*',
+      {
+        functionArn,
+      },
+    ],
+  });
+
   it('should do nothing when role property exists in all statmachine properties', () => {
     serverless.service.stepFunctions = {
       stateMachines: {
@@ -1429,19 +1438,9 @@ describe('#compileIamRole', () => {
 
     const expectedResources = [
       'arn:aws:lambda:region:accountId:function:with-alias',
-      {
-        'Fn::Sub': [
-          '${functionArn}:*',
-          { functionArn: 'arn:aws:lambda:region:accountId:function:with-alias' },
-        ],
-      },
+      getAlias('arn:aws:lambda:region:accountId:function:with-alias'),
       'arn:aws:lambda:region:accountId:function:no-alias',
-      {
-        'Fn::Sub': [
-          '${functionArn}:*',
-          { functionArn: 'arn:aws:lambda:region:accountId:function:no-alias' },
-        ],
-      },
+      getAlias('arn:aws:lambda:region:accountId:function:no-alias'),
     ];
     expect(lambdaPermissions[0].Resource).to.deep.include.members(expectedResources);
   });
@@ -1568,4 +1567,113 @@ describe('#compileIamRole', () => {
     expect(stateMachinePermissions).to.have.lengthOf(1);
     expect(stateMachinePermissions[0].Resource).to.equal('*');
   });
+
+  it('should support Map state type', () => {
+    const getStateMachine = (name, lambdaArn) => ({
+      name,
+      definition: {
+        StartAt: 'A',
+        States: {
+          A: {
+            Type: 'Map',
+            Iterator: {
+              StartAt: 'B',
+              States: {
+                B: {
+                  Type: 'Task',
+                  Resource: lambdaArn,
+                  End: true,
+                },
+              },
+            },
+            End: true,
+          },
+        },
+      },
+    });
+
+    serverless.service.stepFunctions = {
+      stateMachines: {
+        myStateMachine: getStateMachine('sm1', 'arn:aws:lambda:us-west-2:1234567890:function:foo'),
+      },
+    };
+
+    serverlessStepFunctions.compileIamRole();
+    const statements = serverlessStepFunctions.serverless.service
+      .provider.compiledCloudFormationTemplate.Resources.IamRoleStateMachineExecution
+      .Properties.Policies[0].PolicyDocument.Statement;
+
+    const lambdaPermissions = statements.filter(s => _.isEqual(s.Action, ['lambda:InvokeFunction']));
+    expect(lambdaPermissions).to.have.lengthOf(1);
+
+    const lambdaArns = [
+      'arn:aws:lambda:us-west-2:1234567890:function:foo',
+      getAlias('arn:aws:lambda:us-west-2:1234567890:function:foo'),
+    ];
+    expect(lambdaPermissions[0].Resource).to.deep.equal(lambdaArns);
+  });
+
+  it('should support nested Map state type', () => {
+    const getStateMachine = (name, lambdaArn1, lambdaArn2) => ({
+      name,
+      definition: {
+        StartAt: 'A',
+        States: {
+          A: {
+            Type: 'Map',
+            Iterator: {
+              StartAt: 'B',
+              States: {
+                B: {
+                  Type: 'Task',
+                  Resource: lambdaArn1,
+                  Next: 'C',
+                },
+                C: {
+                  Type: 'Map',
+                  Iterator: {
+                    StartAt: 'D',
+                    States: {
+                      D: {
+                        Type: 'Task',
+                        Resource: lambdaArn2,
+                        End: true,
+                      },
+                    },
+                  },
+                  End: true,
+                },
+              },
+            },
+            End: true,
+          },
+        },
+      },
+    });
+
+    const lambdaArn1 = 'arn:aws:lambda:us-west-2:1234567890:function:foo';
+    const lambdaArn2 = 'arn:aws:lambda:us-west-2:1234567890:function:bar';
+
+    serverless.service.stepFunctions = {
+      stateMachines: {
+        myStateMachine: getStateMachine('sm1', lambdaArn1, lambdaArn2),
+      },
+    };
+
+    serverlessStepFunctions.compileIamRole();
+    const statements = serverlessStepFunctions.serverless.service
+      .provider.compiledCloudFormationTemplate.Resources.IamRoleStateMachineExecution
+      .Properties.Policies[0].PolicyDocument.Statement;
+
+    const lambdaPermissions = statements.filter(s => _.isEqual(s.Action, ['lambda:InvokeFunction']));
+    expect(lambdaPermissions).to.have.lengthOf(1);
+
+    const lambdaArns = [
+      lambdaArn1,
+      getAlias(lambdaArn1),
+      lambdaArn2,
+      getAlias(lambdaArn2),
+    ];
+    expect(lambdaPermissions[0].Resource).to.deep.equal(lambdaArns);
+  });
 });