Merge pull request #485 from laardee/use-parameterized-region-in-role

feat: use pseudo region in role template

Author: horike37

lib/deploy/stepFunctions/compileIamRole.js

@@ -547,7 +547,6 @@ module.exports = {
       );
 
       const iamRoleJson = iamRoleStateMachineExecutionTemplate
-        .replace('[region]', this.options.region)
         .replace('[PolicyName]', this.getStateMachinePolicyName())
         .replace('[Statements]', JSON.stringify(iamStatements));
 

lib/deploy/stepFunctions/compileIamRole.test.js

@@ -84,9 +84,9 @@ describe('#compileIamRole', () => {
 
     const iamRole = resources[0];
     expect(iamRole.Properties.AssumeRolePolicyDocument.Statement[0].Principal.Service)
-      .to.be.equal('states.ap-northeast-1.amazonaws.com');
+      .to.deep.eq({ 'Fn::Sub': 'states.${AWS::Region}.amazonaws.com' });
     expect(iamRole.Properties.Policies[0].PolicyName)
-      .to.be.equal('dev-us-east-1-step-functions-statemachine');
+      .to.be.equal('dev-step-functions-statemachine');
   });
 
   it('should create corresponding resources when role property are not given', () => {

lib/iam-role-statemachine-execution-template.txt

@@ -7,7 +7,9 @@
         {
           "Effect": "Allow",
           "Principal": {
-            "Service": "states.[region].amazonaws.com"
+            "Service": {
+              "Fn::Sub": "states.${AWS::Region}.amazonaws.com"
+            }
           },
           "Action": "sts:AssumeRole"
         }

lib/naming.js

@@ -36,7 +36,6 @@ module.exports = {
   getStateMachinePolicyName() {
     return [
       this.provider.getStage(),
-      this.provider.getRegion(),
       this.provider.serverless.service.service,
       'statemachine',
     ].join('-');

lib/naming.test.js

@@ -99,7 +99,7 @@ describe('#naming', () => {
   describe('#getStateMachinePolicyName()', () => {
     it('should use the stage and service name', () => {
       expect(serverlessStepFunctions.getStateMachinePolicyName()).to
-        .equal('dev-us-east-1-step-functions-statemachine');
+        .equal('dev-step-functions-statemachine');
     });
   });