diff --git a/.changeset/popular-drinks-remember.md b/.changeset/popular-drinks-remember.md new file mode 100644 index 000000000..34ddcf07e --- /dev/null +++ b/.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}`. diff --git a/template/lambda-sqs-worker/serverless.yml b/template/lambda-sqs-worker/serverless.yml index 2596a30ea..14edb2b17 100644 --- a/template/lambda-sqs-worker/serverless.yml +++ b/template/lambda-sqs-worker/serverless.yml @@ -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. @@ -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*