Skip to content

Fix IAM permissions if DLQ or X-Tray is enabled. Update list of supported runtimes. #22

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

Merged
michaelwittig merged 3 commits into from
Nov 25, 2019
Merged

Fix IAM permissions if DLQ or X-Tray is enabled. Update list of supported runtimes. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a93a83
Fix IAM permissions if DLQ or X-Tray is enabled.
michaelwittig Nov 25, 2019
b5227da
update linters
michaelwittig Nov 25, 2019
13690e0
fix linting errors
michaelwittig Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: python
python:
- '2.7'
install:
- 'pip install yamllint==1.15.0'
- 'pip install cfn-lint==0.20.2'
- 'pip install yamllint==1.19.0'
- 'pip install cfn-lint==0.25.3'
script:
- 'yamllint module.yml'
- 'cfn-lint -i W3002 -t module.yml'
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Resources:
Handler: 'example.handler' # required (file must be in the `lambda-src` folder)
MemorySize: '128' # optional
ReservedConcurrentExecutions: '-1' # optional
Runtime: 'nodejs10.x' # required
Runtime: 'nodejs12.x' # required
Timeout: '3' # optional
TracingConfigMode: PassThrough # optional
LogGroupRetentionInDays: '14' # optional
Expand Down Expand Up @@ -154,7 +154,7 @@ Resources:
<td>The runtime environment for the Lambda function that you are uploading</td>
<td></td>
<td>no</td>
<td>['dotnetcore1.0', 'dotnetcore2.1', 'go1.x', 'java8', 'nodejs10.x', 'nodejs8.10', 'python2.7', 'python3.6', 'python3.7', 'ruby2.5']</td>
<td>['nodejs12.x', 'nodejs10.x', 'nodejs8.10', 'python3.8', 'python3.7', 'python3.6', 'python2.7', 'ruby2.5', 'java11', 'java8', 'dotnetcore2.1', 'go1.x']</td>
</tr>
<tr>
<td>Timeout</td>
Expand Down
22 changes: 20 additions & 2 deletions module.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Parameters:
Runtime:
Description: 'The runtime environment for the Lambda function that you are uploading'
Type: String
AllowedValues: ['dotnetcore1.0', 'dotnetcore2.1', 'go1.x', 'java8', 'nodejs10.x', 'nodejs8.10', 'python2.7', 'python3.6', 'python3.7', 'ruby2.5']
AllowedValues: ['nodejs12.x', 'nodejs10.x', 'nodejs8.10', 'python3.8', 'python3.7', 'python3.6', 'python2.7', 'ruby2.5', 'java11', 'java8', 'dotnetcore2.1', 'go1.x']
Timeout:
Description: 'The function execution time at which Lambda should terminate the function'
Type: Number
Expand Down Expand Up @@ -145,6 +145,7 @@ Conditions:
HasClientSgModule1: !Not [!Equals [!Ref ClientSgModule1, '']]
HasClientSgModule2: !Not [!Equals [!Ref ClientSgModule2, '']]
HasClientSgModule3: !Not [!Equals [!Ref ClientSgModule3, '']]
HasTracingConfigModeActive: !Equals [!Ref TracingConfigMode, Active]
Resources:
Role:
Type: 'AWS::IAM::Role'
Expand Down Expand Up @@ -175,6 +176,23 @@ Resources:
- 'ec2:DeleteNetworkInterface'
Resource: '*'
- !Ref 'AWS::NoValue'
- !If
- HasDeadLetterQueueModule
- Effect: Allow
Action: 'sqs:SendMessage'
Resource: {'Fn::ImportValue': !Sub '${DeadLetterQueueModule}-Arn'}
- !Ref 'AWS::NoValue'
- !If
- HasTracingConfigModeActive
- Effect: Allow
Action:
- 'xray:PutTraceSegments'
- 'xray:PutTelemetryRecords'
- 'xray:GetSamplingRules'
- 'xray:GetSamplingTargets'
- 'xray:GetSamplingStatisticSummaries'
Resource: '*'
- !Ref 'AWS::NoValue'
- !If
- HasDependencyModule1
- Effect: Allow
Expand Down Expand Up @@ -284,7 +302,7 @@ Outputs:
ModuleId:
Value: 'lambda-function'
ModuleVersion:
Value: '2.5.0'
Value: '2.6.0'
StackName:
Value: !Ref 'AWS::StackName'
Arn:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cfn-modules/lambda-function",
"version": "2.5.0",
"version": "2.6.0",
"description": "AWS Lambda function with automated IAM policy generation, encryption, log group and alerting",
"author": "Michael Wittig <[email protected]>",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Resources:
Properties:
Parameters:
Handler: 'defaults.handler'
Runtime: 'nodejs10.x'
Runtime: 'nodejs12.x'
TemplateURL: './node_modules/@cfn-modules/lambda-function/module.yml'
2 changes: 1 addition & 1 deletion test/layer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Resources:
Properties:
Parameters:
Handler: 'defaults.handler'
Runtime: 'nodejs10.x'
Runtime: 'nodejs12.x'
LayerArns: !Ref Layer
TemplateURL: './node_modules/@cfn-modules/lambda-function/module.yml'
2 changes: 1 addition & 1 deletion test/named.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Resources:
Properties:
Parameters:
Handler: 'defaults.handler'
Runtime: 'nodejs10.x'
Runtime: 'nodejs12.x'
FunctionName: 'NamedLambda'
TemplateURL: './node_modules/@cfn-modules/lambda-function/module.yml'