archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

websockets: fix passing log group ARN

Browse Source 
The log group ARN contains a trailing ":*" that seems to cause
deployment to fail. Instead, generate the ARN with the trailing
wildcard.

fixes #6304
This commit is contained in:
Christoph Gysin 2019-06-26 15:49:00 +03:00
parent 9b9c9e2641
commit 6b00ef5bcc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plugins/aws/package/compile/events/websockets/lib/stage.js
View File

@ -34,7 +34,7 @@ module.exports = {
Object.assign(stageResource.Properties, {
AccessLogSettings: {
DestinationArn: {
'Fn::GetAtt': [logGroupLogicalId, 'Arn'],
'Fn::Sub': `arn:aws:logs:\${AWS::Region}:\${AWS::AccountId}:log-group:\${${logGroupLogicalId}}`,
},
Format: [
'$context.identity.sourceIp',

3
lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
View File

@ -81,7 +81,8 @@ describe('#compileStage()', () => {
Description: 'Serverless Websockets',
AccessLogSettings: {
DestinationArn: {
'Fn::GetAtt': [logGroupLogicalId, 'Arn'],
'Fn::Sub':
'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${WebsocketsLogGroup}',
},
Format: [
'$context.identity.sourceIp',