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.

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

Remove custom Serverless variable syntax #350

Merged
merged 1 commit into from Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/popular-drinks-remember.md
@@ -0,0 +1,7 @@
---
'skuba': patch
---

**template/lambda-sqs-worker:** Remove custom Serverless variable syntax

`serverless@2.3.0` bundled native support for CloudFormation pseudo parameters. This even works with arbitrary logical IDs like `!Sub ${WorkerLambdaFunctionDeploymentGroup}`.
7 changes: 1 addition & 6 deletions template/lambda-sqs-worker/serverless.yml
Expand Up @@ -26,7 +26,6 @@ provider:
runtime: nodejs14.x
stackName: ${self:service}
stage: ${env:ENVIRONMENT}
variableSyntax: "\\${((?!AWS)[ ~:a-zA-Z0-9._@'\",\\-\\/\\(\\)]+?)}"
versionFunctions: true
deploymentBucket:
# Use a shared account-level bucket for Lambda bundles and other artefacts.
Expand All @@ -35,11 +34,7 @@ provider:
iamRoleStatements:
- Action: codedeploy:PutLifecycleEventHookExecutionStatus
Effect: Allow
Resource: !Join
- ''
- - !Sub arn:aws:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup
- ':*/'
- !Ref WorkerLambdaFunctionDeploymentGroup
Resource: !Sub arn:aws:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup:*/${WorkerLambdaFunctionDeploymentGroup}
- Action:
- kms:Decrypt
- kms:GenerateDataKey*
Expand Down