Merge branch 'master' into distributed_map_support

Author: akshaydk

lib/deploy/stepFunctions/compileIamRole.js

@@ -27,6 +27,8 @@ function getTaskStates(states, stateMachineName) {
             Mode: 'DISTRIBUTED',
             StateMachineName: stateMachineName,
           });
+        if (state.ItemReader) {
+          taskStates.push(state.ItemReader);
         }
         return taskStates;
       }
@@ -410,10 +412,21 @@ function getEventBridgePermissions(state) {
 }
 
 function getS3GetObjectPermissions(state) {
+  const bucket = state.Parameters['Bucket.$'] ? state.Parameters['Bucket.$'] : state.Parameters.Bucket;
+  const key = state.Parameters['Key.$'] ? state.Parameters['Key.$'] : state.Parameters.Key;
+
+  if (bucket.startsWith('$') && key.startsWith('$')) {
+    return [{
+      action: 's3:GetObject',
+      resource: [
+        '*',
+      ],
+    }];
+  }
   return [{
     action: 's3:GetObject',
     resource: [
-      `arn:aws:s3:::${state.Parameters.Bucket}/${state.Parameters.Key}`,
+      `arn:aws:s3:::${bucket}/${key}`,
     ],
   }];
 }
@@ -529,6 +542,7 @@ function getIamPermissions(taskStates) {
       case 'arn:aws:states:::events:putEvents.waitForTaskToken':
         return getEventBridgePermissions(state);
 
+      case 'arn:aws:states:::s3:getObject':
       case 'arn:aws:states:::aws-sdk:s3:getObject':
         return getS3GetObjectPermissions(state);
 

lib/deploy/stepFunctions/compileIamRole.test.js

@@ -1363,6 +1363,60 @@ describe('#compileIamRole', () => {
       .to.be.deep.equal([`arn:aws:s3:::${testBucket}/${world}`]);
   });
 
+  it('should give s3:GetObject permission for only objects referenced by state machine with ItemReader', () => {
+    const testBucket = 'test-bucket';
+    const testKey = 'test-key';
+
+    const genStateMachine = (id, lambdaArn, bucket, key) => ({
+      id,
+      definition: {
+        StartAt: 'A',
+        States: {
+          A: {
+            Type: 'Map',
+            ItemProcessor: {
+              StartAt: 'B',
+              States: {
+                B: {
+                  Type: 'Task',
+                  Resource: lambdaArn,
+                  End: true,
+                },
+              },
+            },
+            ItemReader: {
+              Resource: 'arn:aws:states:::s3:getObject',
+              Parameters: {
+                'Bucket.$': bucket,
+                'Key.$': key,
+              },
+            },
+            End: true,
+          },
+        },
+      },
+    });
+
+    serverless.service.stepFunctions = {
+      stateMachines: {
+        myStateMachine1: genStateMachine('StateMachine1',
+          'arn:aws:lambda:us-west-2:1234567890:function:foo', '$.testBucket', '$.testKey'),
+        myStateMachine2: genStateMachine('StateMachine2',
+          'arn:aws:lambda:us-west-2:1234567890:function:foo', testBucket, testKey),
+      },
+    };
+
+    serverlessStepFunctions.compileIamRole();
+    const resources = serverlessStepFunctions.serverless.service
+      .provider.compiledCloudFormationTemplate.Resources;
+    const policy1 = resources.StateMachine1Role.Properties.Policies[0];
+    const policy2 = resources.StateMachine2Role.Properties.Policies[0];
+    expect(policy1.PolicyDocument.Statement[1].Resource)
+      .to.be.deep.equal('*');
+    expect(policy2.PolicyDocument.Statement[1].Resource)
+      .to.be.deep.equal([`arn:aws:s3:::${testBucket}/${testKey}`]);
+  });
+
   it('should not generate any permissions for Task states not yet supported', () => {
     const genStateMachine = id => ({
       id,

package-lock.json

@@ -46,7 +46,7 @@
   "dependencies": {
     "@hapi/joi": "^15.0.2",
     "@serverless/utils": "^6.7.0",
-    "asl-validator": "^3.0.8",
+    "asl-validator": "^3.1.0",
     "bluebird": "^3.4.0",
     "chalk": "^4.1.2",
     "lodash": "^4.17.11"