Skip to content

Enhance CompatibleRuntimes property of AWS::Serverless::LayerVersion #810

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

Closed
wants to merge 4 commits into from
+92 −63
Closed

Enhance CompatibleRuntimes property of AWS::Serverless::LayerVersion #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ba02e3
Enhance CompatibleRuntimes property of AWS::Serverless::LayerVersion
systemdesignpartners Feb 13, 2019
9c9eda0
Fix PR Review items and add a further test
systemdesignpartners Feb 20, 2019
b97ec4f
Minor linter bugfix
Feb 27, 2019
c67f9b5
Merge branch 'develop' of github.com:awslabs/serverless-application-m…
Jun 13, 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
2 changes: 1 addition & 1 deletion samtranslator/model/lambda_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class LambdaLayerVersion(Resource):
'Content': PropertyType(True, is_type(dict)),
'Description': PropertyType(False, is_str()),
'LayerName': PropertyType(False, is_str()),
'CompatibleRuntimes': PropertyType(False, list_of(is_str())),
'CompatibleRuntimes': PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),
'LicenseInfo': PropertyType(False, is_str())
}

Expand Down
2 changes: 1 addition & 1 deletion samtranslator/model/sam_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ class SamLayerVersion(SamResourceMacro):
'LayerName': PropertyType(False, one_of(is_str(), is_type(dict))),
'Description': PropertyType(False, is_str()),
'ContentUri': PropertyType(True, one_of(is_str(), is_type(dict))),
'CompatibleRuntimes': PropertyType(False, list_of(is_str())),
'CompatibleRuntimes': PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),
'LicenseInfo': PropertyType(False, is_str()),
'RetentionPolicy': PropertyType(False, is_str())
}
Expand Down
6 changes: 6 additions & 0 deletions tests/translator/input/layers_with_intrinsics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ Parameters:
Default: MIT-0 License
LayerRuntimeList:
Type: CommaDelimitedList
LayerRuntimeString1:
Type: String
Default: nodejs6.10
LayerRuntimeString2:
Type: String
Default: nodejs8.10

Resources:
LayerWithLicenseIntrinsic:
Expand Down
49 changes: 28 additions & 21 deletions tests/translator/output/aws-cn/layers_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
{
"Parameters": {
"LayerLicenseInfo": {
"Default": "MIT-0 License",
"Default": "MIT-0 License",
"Type": "String"
},
},
"LayerRuntimeList": {
"Type": "CommaDelimitedList"
},
},
"LayerNameParam": {
"Default": "SomeLayerName",
"Default": "SomeLayerName",
"Type": "String"
},
"LayerRuntimeString1": {
"Default": "nodejs6.10",
"Type": "String"
},
"LayerRuntimeString2": {
"Default": "nodejs8.10",
"Type": "String"
}
},
},
"Resources": {
"LayerWithNameIntrinsiccf8baed8b9": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
},
"LayerName": "SomeLayerName"
}
},
Expand Down Expand Up @@ -49,28 +57,28 @@
}
},
"LayerWithRuntimesIntrinsic1a006faa85": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithRuntimesIntrinsic",
},
"LayerName": "LayerWithRuntimesIntrinsic",
"CompatibleRuntimes": {
"Ref": "LayerRuntimeList"
}
}
},
},
"LayerWithLicenseIntrinsic965c8d0c9b": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithLicenseIntrinsic",
},
"LayerName": "LayerWithLicenseIntrinsic",
"LicenseInfo": "MIT-0 License"
}
},
Expand All @@ -89,4 +97,3 @@
}
}
}

48 changes: 28 additions & 20 deletions tests/translator/output/aws-us-gov/layers_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
{
"Parameters": {
"LayerLicenseInfo": {
"Default": "MIT-0 License",
"Default": "MIT-0 License",
"Type": "String"
},
},
"LayerRuntimeList": {
"Type": "CommaDelimitedList"
},
},
"LayerNameParam": {
"Default": "SomeLayerName",
"Default": "SomeLayerName",
"Type": "String"
},
"LayerRuntimeString1": {
"Default": "nodejs6.10",
"Type": "String"
},
"LayerRuntimeString2": {
"Default": "nodejs8.10",
"Type": "String"
}
},
},
"Resources": {
"LayerWithNameIntrinsiccf8baed8b9": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
},
"LayerName": "SomeLayerName"
}
},
Expand Down Expand Up @@ -49,28 +57,28 @@
}
},
"LayerWithRuntimesIntrinsic1a006faa85": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithRuntimesIntrinsic",
},
"LayerName": "LayerWithRuntimesIntrinsic",
"CompatibleRuntimes": {
"Ref": "LayerRuntimeList"
}
}
},
},
"LayerWithLicenseIntrinsic965c8d0c9b": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithLicenseIntrinsic",
},
"LayerName": "LayerWithLicenseIntrinsic",
"LicenseInfo": "MIT-0 License"
}
},
Expand Down
48 changes: 28 additions & 20 deletions tests/translator/output/layers_with_intrinsics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
{
"Parameters": {
"LayerLicenseInfo": {
"Default": "MIT-0 License",
"Default": "MIT-0 License",
"Type": "String"
},
},
"LayerRuntimeList": {
"Type": "CommaDelimitedList"
},
},
"LayerNameParam": {
"Default": "SomeLayerName",
"Default": "SomeLayerName",
"Type": "String"
},
"LayerRuntimeString1": {
"Default": "nodejs6.10",
"Type": "String"
},
"LayerRuntimeString2": {
"Default": "nodejs8.10",
"Type": "String"
}
},
},
"Resources": {
"LayerWithNameIntrinsiccf8baed8b9": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
},
"LayerName": "SomeLayerName"
}
},
Expand Down Expand Up @@ -49,28 +57,28 @@
}
},
"LayerWithRuntimesIntrinsic1a006faa85": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithRuntimesIntrinsic",
},
"LayerName": "LayerWithRuntimesIntrinsic",
"CompatibleRuntimes": {
"Ref": "LayerRuntimeList"
}
}
},
},
"LayerWithLicenseIntrinsic965c8d0c9b": {
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"DeletionPolicy": "Retain",
"Type": "AWS::Lambda::LayerVersion",
"Properties": {
"Content": {
"S3Bucket": "sam-demo-bucket",
"S3Bucket": "sam-demo-bucket",
"S3Key": "layer.zip"
},
"LayerName": "LayerWithLicenseIntrinsic",
},
"LayerName": "LayerWithLicenseIntrinsic",
"LicenseInfo": "MIT-0 License"
}
},
Expand Down