From 6b00ef5bcc6bc843a33f481ee5b2a3e2ca26084c Mon Sep 17 00:00:00 2001 From: Christoph Gysin Date: Wed, 26 Jun 2019 15:49:00 +0300 Subject: [PATCH] websockets: fix passing log group ARN The log group ARN contains a trailing ":*" that seems to cause deployment to fail. Instead, generate the ARN with the trailing wildcard. fixes #6304 --- lib/plugins/aws/package/compile/events/websockets/lib/stage.js | 2 +- .../aws/package/compile/events/websockets/lib/stage.test.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js index 71c3498e6..af5b81e1e 100644 --- a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js +++ b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js @@ -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', diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js b/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js index ab931abd3..5bc91404f 100644 --- a/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js +++ b/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js @@ -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',