fix: Enhance CompatibleRuntimes property of AWS::Serverless::LayerVersion (#1683)

wchengru · web-flow · commit ed2f24ef11cb · 2020-08-21T10:21:07.000-05:00
diff --git a/samtranslator/model/lambda_.py b/samtranslator/model/lambda_.py
@@ -107,7 +107,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()),
     }
 
diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py
@@ -66,7 +66,7 @@ class SamFunction(SamResourceMacro):
         "VpcConfig": PropertyType(False, is_type(dict)),
         "Role": PropertyType(False, is_str()),
         "AssumeRolePolicyDocument": PropertyType(False, is_type(dict)),
-        "Policies": PropertyType(False, one_of(is_str(), list_of(one_of(is_str(), is_type(dict), is_type(dict))))),
+        "Policies": PropertyType(False, one_of(is_str(), is_type(dict), list_of(one_of(is_str(), is_type(dict))))),
         "PermissionsBoundary": PropertyType(False, is_str()),
         "Environment": PropertyType(False, dict_of(is_str(), is_type(dict))),
         "Events": PropertyType(False, dict_of(is_str(), is_type(dict))),
@@ -1015,7 +1015,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()),
     }
@@ -1120,7 +1120,7 @@ class SamStateMachine(SamResourceMacro):
         "Name": PropertyType(False, is_str()),
         "Type": PropertyType(False, is_str()),
         "Tags": PropertyType(False, is_type(dict)),
-        "Policies": PropertyType(False, one_of(is_str(), list_of(one_of(is_str(), is_type(dict), is_type(dict))))),
+        "Policies": PropertyType(False, one_of(is_str(), is_type(dict), list_of(one_of(is_str(), is_type(dict))))),
     }
     event_resolver = ResourceTypeResolver(samtranslator.model.stepfunctions.events,)
 
diff --git a/tests/translator/input/layers_with_intrinsics.yaml b/tests/translator/input/layers_with_intrinsics.yaml
@@ -7,6 +7,9 @@ Parameters:
     Default: MIT-0 License
   LayerRuntimeList:
     Type: CommaDelimitedList
+  LayerRuntimeRefString:
+    Type: String
+    Default: SomeRuntimeName
 
 Resources:
   LayerWithLicenseIntrinsic:
@@ -22,6 +25,21 @@ Resources:
       CompatibleRuntimes:
         Ref: LayerRuntimeList
 
+  LayerWithSingleListRefRuntimesIntrinsic:
+    Type: 'AWS::Serverless::LayerVersion'
+    Properties:
+      ContentUri: s3://sam-demo-bucket/layer.zip
+      CompatibleRuntimes:
+        - Ref: LayerRuntimeRefString
+
+  LayerWithMixedListRefRuntimesIntrinsic:
+    Type: 'AWS::Serverless::LayerVersion'
+    Properties:
+      ContentUri: s3://sam-demo-bucket/layer.zip
+      CompatibleRuntimes:
+        - Ref: LayerRuntimeString
+        - 'SomeRuntimeNameString'
+
   LayerWithNameIntrinsic:
     Type: AWS::Serverless::LayerVersion
     Properties:
@@ -46,3 +64,4 @@ Resources:
       ContentUri: s3://sam-demo-bucket/layer.zip
       LayerName: !Sub 'layer-${AWS::Region}'
 
+
diff --git a/tests/translator/output/aws-cn/layers_with_intrinsics.json b/tests/translator/output/aws-cn/layers_with_intrinsics.json
@@ -10,6 +10,10 @@
     "LayerNameParam": {
       "Default": "SomeLayerName",
       "Type": "String"
+    },
+    "LayerRuntimeRefString": {
+      "Default": "SomeRuntimeName",
+      "Type": "String"
     }
   },
   "Resources": {
@@ -62,6 +66,39 @@
         }
       }
     },
+    "LayerWithSingleListRefRuntimesIntrinsic9d7a72f24a": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeRefString"
+          }
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithSingleListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
+    "LayerWithMixedListRefRuntimesIntrinsic71fd80f592": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeString"
+          },
+          "SomeRuntimeNameString"
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithMixedListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
     "LayerWithLicenseIntrinsic965c8d0c9b": {
       "DeletionPolicy": "Retain",
       "Type": "AWS::Lambda::LayerVersion",
diff --git a/tests/translator/output/aws-us-gov/layers_with_intrinsics.json b/tests/translator/output/aws-us-gov/layers_with_intrinsics.json
@@ -10,6 +10,10 @@
     "LayerNameParam": {
       "Default": "SomeLayerName",
       "Type": "String"
+    },
+    "LayerRuntimeRefString": {
+      "Default": "SomeRuntimeName",
+      "Type": "String"
     }
   },
   "Resources": {
@@ -62,6 +66,39 @@
         }
       }
     },
+    "LayerWithSingleListRefRuntimesIntrinsic9d7a72f24a": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeRefString"
+          }
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithSingleListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
+    "LayerWithMixedListRefRuntimesIntrinsic71fd80f592": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeString"
+          },
+          "SomeRuntimeNameString"
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithMixedListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
     "LayerWithLicenseIntrinsic965c8d0c9b": {
       "DeletionPolicy": "Retain",
       "Type": "AWS::Lambda::LayerVersion",
diff --git a/tests/translator/output/layers_with_intrinsics.json b/tests/translator/output/layers_with_intrinsics.json
@@ -10,6 +10,10 @@
     "LayerNameParam": {
       "Default": "SomeLayerName",
       "Type": "String"
+    },
+    "LayerRuntimeRefString": {
+      "Default": "SomeRuntimeName",
+      "Type": "String"
     }
   },
   "Resources": {
@@ -62,6 +66,39 @@
         }
       }
     },
+    "LayerWithSingleListRefRuntimesIntrinsic9d7a72f24a": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeRefString"
+          }
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithSingleListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
+    "LayerWithMixedListRefRuntimesIntrinsic71fd80f592": {
+      "DeletionPolicy": "Retain",
+      "Properties": {
+        "CompatibleRuntimes": [
+          {
+            "Ref": "LayerRuntimeString"
+          },
+          "SomeRuntimeNameString"
+        ],
+        "Content": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "layer.zip"
+        },
+        "LayerName": "LayerWithMixedListRefRuntimesIntrinsic"
+      },
+      "Type": "AWS::Lambda::LayerVersion"
+    },
     "LayerWithLicenseIntrinsic965c8d0c9b": {
       "DeletionPolicy": "Retain",
       "Type": "AWS::Lambda::LayerVersion",

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class LambdaLayerVersion(Resource):`
`107`	`107`	`"Content": PropertyType(True, is_type(dict)),`
`108`	`108`	`"Description": PropertyType(False, is_str()),`
`109`	`109`	`"LayerName": PropertyType(False, is_str()),`
`110`		`- "CompatibleRuntimes": PropertyType(False, list_of(is_str())),`
	`110`	`+ "CompatibleRuntimes": PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),`
`111`	`111`	`"LicenseInfo": PropertyType(False, is_str()),`
`112`	`112`	`}`
`113`	`113`