Skip to content

Commit 2a3def1

Browse files
committed
feat: use pseudo region in role template
1 parent 0b0a1b9 commit 2a3def1

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

lib/deploy/stepFunctions/compileIamRole.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ module.exports = {
547547
);
548548

549549
const iamRoleJson = iamRoleStateMachineExecutionTemplate
550-
.replace('[region]', this.options.region)
551550
.replace('[PolicyName]', this.getStateMachinePolicyName())
552551
.replace('[Statements]', JSON.stringify(iamStatements));
553552

lib/deploy/stepFunctions/compileIamRole.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ describe('#compileIamRole', () => {
8484

8585
const iamRole = resources[0];
8686
expect(iamRole.Properties.AssumeRolePolicyDocument.Statement[0].Principal.Service)
87-
.to.be.equal('states.ap-northeast-1.amazonaws.com');
87+
.to.deep.eq({ 'Fn::Sub': 'states.${AWS::Region}.amazonaws.com' });
8888
expect(iamRole.Properties.Policies[0].PolicyName)
89-
.to.be.equal('dev-us-east-1-step-functions-statemachine');
89+
.to.be.equal('dev-step-functions-statemachine');
9090
});
9191

9292
it('should create corresponding resources when role property are not given', () => {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
{
88
"Effect": "Allow",
99
"Principal": {
10-
"Service": "states.[region].amazonaws.com"
10+
"Service": {
11+
"Fn::Sub": "states.${AWS::Region}.amazonaws.com"
12+
}
1113
},
1214
"Action": "sts:AssumeRole"
1315
}

lib/naming.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ module.exports = {
3636
getStateMachinePolicyName() {
3737
return [
3838
this.provider.getStage(),
39-
this.provider.getRegion(),
4039
this.provider.serverless.service.service,
4140
'statemachine',
4241
].join('-');

lib/naming.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('#naming', () => {
9999
describe('#getStateMachinePolicyName()', () => {
100100
it('should use the stage and service name', () => {
101101
expect(serverlessStepFunctions.getStateMachinePolicyName()).to
102-
.equal('dev-us-east-1-step-functions-statemachine');
102+
.equal('dev-step-functions-statemachine');
103103
});
104104
});
105105

0 commit comments

Comments
 (0)