Update

Author: GavinZZ

requirements/base.txt

@@ -1,3 +1,6 @@
 boto3>=1.19.5,==1.*
 jsonschema<5,>=3.2  # TODO: evaluate risk of removing jsonschema 3.x support
 typing_extensions>=4.4,<5 # 3.7 doesn't have Literal
+
+# resource validation & schema generation, requiring features in >=1.10
+pydantic~=1.10

requirements/dev.txt

@@ -29,6 +29,3 @@ mypy~=1.0.0
 boto3-stubs[appconfig,serverlessrepo]>=1.19.5,==1.*
 types-PyYAML~=5.4
 types-jsonschema~=3.2
-
-# resource validation & schema generation, requiring features in >=1.10
-pydantic~=1.10

samtranslator/validator/resource_validator.py

@@ -20,18 +20,21 @@ def get(self, attr: str, default_value: Any = None) -> Any:
             return ResourceModel(attr_value)
         return attr_value
 
+    def __getitem__(self, attr):
+        attr_value = self.model.__dict__[attr]
+        if isinstance(attr_value, BaseModel):
+            if "__root__" in attr_value.__dict__:
+                return attr_value.__dict__["__root__"]
+            return ResourceModel(attr_value)
+        return attr_value
+
 
-def to_resource_model(
-    input_properties: Dict[Any, Any], class_properties: Dict[Any, Any], cls: Type[BaseModel]
-) -> ResourceModel:
+def to_resource_model(resource_properties: Dict[Any, Any], cls: Type[BaseModel]) -> ResourceModel:
     """
-    Given properties of a SAM resource, filter for resource specific properties, then
-    return a typed object from the definitions of SAM schema model
+    Given properties of a SAM resource return a typed object from the definitions of SAM schema model
 
     param:
-        input_properties: properties from input template, may contain resource attributes like RetainPolicy
-        class_properties: resource properties defined in SAM property_types
+        resource_properties: properties from input template
         cls: SAM schema models
     """
-    resource_properties = {k: v for (k, v) in input_properties.items() if k in class_properties}
     return ResourceModel(cls(**resource_properties))

tests/validator/test_resource_validator.py

@@ -25,14 +25,19 @@ def setUp(self) -> None:
     def test_resource_model_get(self):
         connector_model = to_resource_model(
             self.connector_template,
-            SamConnector.property_types,
             ConnectorProperties,
         )
         self.assertEqual(connector_model.get("Source").get("Arn"), "random-arn")
         self.assertEqual(connector_model.get("Source").get("Type"), "random-type")
         self.assertEqual(connector_model.get("Source").get("Id"), None)
         self.assertEqual(connector_model.get("Destination").get("Id"), "MyTable")
         self.assertEqual(connector_model.get("Permissions"), ["Read"])
+        self.assertEqual(connector_model.get("FakeProperty"), None)
+
+        self.assertEqual(connector_model["Source"]["Arn"], "random-arn")
+        self.assertEqual(connector_model["Source"]["Type"], "random-type")
+        self.assertEqual(connector_model["Destination"]["Id"], "MyTable")
+        self.assertEqual(connector_model["Permissions"], ["Read"])
 
 
 class TestResourceValidatorFailure(TestCase):
@@ -45,4 +50,4 @@ def test_to_resource_model_error_connector_template(self):
                 ValidationError,
                 "[1-9] validation error for Properties(.|\n)+(Source|Destination|Permissions)(.|\n)*(field required)|(unexpected value)|(str type expected)|(value is not a valid list).+",
             ):
-                to_resource_model(properties, SamConnector.property_types, ConnectorProperties)
+                to_resource_model(properties, ConnectorProperties)