Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove hard-coded AWS partitions #7175

Merged
merged 2 commits into from Jan 7, 2020
Merged

Remove hard-coded AWS partitions #7175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fc6555
Remove hard-coded AWS partitions
maafk Jan 6, 2020
62e9de1
Prettify update
maafk Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/plugins/aws/package/compile/events/alb/lib/validate.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ const _ = require('lodash');
const CIDR_IPV6_PATTERN = /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$/;
const CIDR_IPV4_PATTERN = /^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))$/;
// see https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-elb-application
const ALB_LISTENER_PATTERN = /^arn:aws:elasticloadbalancing:.+:listener\/app\/[\w-]+\/([\w-]+)\/([\w-]+)$/;
const ALB_LISTENER_PATTERN = /^arn:aws[\w-]*:elasticloadbalancing:.+:listener\/app\/[\w-]+\/([\w-]+)\/([\w-]+)$/;

module.exports = {
validate() {
Expand Down
9 changes: 9 additions & 0 deletions lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
View file
Open in desktop
Expand Up @@ -182,6 +182,15 @@ describe('#validate()', () => {
});
});

it('returns the alb ID when given a valid listener ARN using non-standard partition', () => {
const listenerArn =
'arn:aws-us-gov:elasticloadbalancing:us-east-1:123456789012:listener/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2';
expect(awsCompileAlbEvents.validateListenerArn(listenerArn, 'functionname')).to.deep.equal({
albId: '50dc6c495c0c9188',
listenerId: 'f2f7dc8efc522ab2',
});
});

it('returns the ref when given an object for the listener ARN', () => {
const listenerArn = { Ref: 'HTTPListener1' };
expect(awsCompileAlbEvents.validateListenerArn(listenerArn, 'functionname')).to.deep.equal({
Expand Down
6 changes: 4 additions & 2 deletions lib/plugins/aws/package/compile/events/cloudFront/index.js
View file
Open in desktop
Expand Up @@ -263,7 +263,9 @@ class AwsCompileCloudFrontEvents {
'',
[
'',
'arn:aws:cloudfront::',
'arn:',
{ Ref: 'AWS::Partition' },
':cloudfront::',
{ Ref: 'AWS::AccountId' },
':distribution/',
{ Ref: this.provider.naming.getCloudFrontDistributionLogicalId() },
Expand Down Expand Up @@ -308,7 +310,7 @@ class AwsCompileCloudFrontEvents {
Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement.push({
Effect: 'Allow',
Action: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
Resource: ['arn:aws:logs:*:*:*'],
Resource: [{ 'Fn::Sub': 'arn:${AWS::Partition}:logs:*:*:*' }],
});
}

Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/aws/package/compile/events/cloudFront/index.test.js
View file
Open in desktop
Expand Up @@ -547,7 +547,7 @@ describe('AwsCompileCloudFrontEvents', () => {
).to.eql({
Effect: 'Allow',
Action: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
Resource: ['arn:aws:logs:*:*:*'],
Resource: [{ 'Fn::Sub': 'arn:${AWS::Partition}:logs:*:*:*' }],
});
expect(
awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/aws/package/compile/events/websockets/lib/stage.js
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ module.exports = {
Object.assign(stageResource.Properties, {
AccessLogSettings: {
DestinationArn: {
'Fn::Sub': `arn:aws:logs:\${AWS::Region}:\${AWS::AccountId}:log-group:\${${logGroupLogicalId}}`,
'Fn::Sub': `arn:\${AWS::Partition}:logs:\${AWS::Region}:\${AWS::AccountId}:log-group:\${${logGroupLogicalId}}`,
},
Format: [
'$context.identity.sourceIp',
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
View file
Open in desktop
Expand Up @@ -110,7 +110,7 @@ describe('#compileStage()', () => {
AccessLogSettings: {
DestinationArn: {
'Fn::Sub':
'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${WebsocketsLogGroup}',
'arn:${AWS::Partition}:logs:${AWS::Region}:${AWS::AccountId}:log-group:${WebsocketsLogGroup}',
},
Format: [
'$context.identity.sourceIp',
Expand Down
9 changes: 0 additions & 9 deletions lib/plugins/aws/provider/awsProvider.js
View file
Open in desktop
Expand Up @@ -556,15 +556,6 @@ class AwsProvider {
return undefined;
}

getMethodArn(accountId, apiId, method, pathParam) {
const region = this.getRegion();
let path = pathParam;
if (pathParam.startsWith('/')) {
path = pathParam.replace(/^\/+/g, '');
}
return `arn:aws:execute-api:${region}:${accountId}:${apiId}/*/${method.toUpperCase()}/${path}`;
}

/**
* Get Rest API Root Resource ID from serverless config
*/
Expand Down