Merge pull request #154 from ACSchott526/function-regex

Add dollar sign to function arn regex

Author: horike37

lib/deploy/stepFunctions/compileIamRole.js

@@ -12,7 +12,7 @@ module.exports = {
       customRolesProvided.push('role' in stateMachineObj);
 
       const stateMachineJson = JSON.stringify(stateMachineObj);
-      const regex = new RegExp(/"Resource":"([\w\-:*#{}.]*)"/gi);
+      const regex = new RegExp(/"Resource":"([\w\-:*#{}.$]*)"/gi);
       let match = regex.exec(stateMachineJson);
       while (match !== null) {
         functionArns.push(match[1]);

lib/deploy/stepFunctions/compileIamRole.test.js

@@ -91,6 +91,7 @@ describe('#compileIamRole', () => {
     const worldLambda = 'arn:aws:lambda:*:*:function:world';
     const fooLambda = 'arn:aws:lambda:us-west-2::function:foo_';
     const barLambda = 'arn:aws:lambda:#{AWS::Region}:#{AWS::AccountId}:function:bar';
+    const bazLambda = 'arn:aws:lambda:#{AWS::Region}:#{AWS::AccountId}:function:${baz}';
     serverless.service.stepFunctions = {
       stateMachines: {
         myStateMachine1: {
@@ -145,6 +146,19 @@ describe('#compileIamRole', () => {
             },
           },
         },
+        myStateMachine5: {
+          name: 'stateMachineBeta5',
+          definition: {
+            StartAt: 'Baz',
+            States: {
+              Hello: {
+                Type: 'Task',
+                Resource: bazLambda,
+                End: true,
+              },
+            },
+          },
+        },
       },
     };
 
@@ -153,6 +167,6 @@ describe('#compileIamRole', () => {
       .provider.compiledCloudFormationTemplate.Resources.IamRoleStateMachineExecution
       .Properties.Policies[0];
     expect(policy.PolicyDocument.Statement[0].Resource)
-      .to.be.deep.equal([helloLambda, worldLambda, fooLambda, barLambda]);
+      .to.be.deep.equal([helloLambda, worldLambda, fooLambda, barLambda, bazLambda]);
   });
 });