testing

Author: brianlaoaws

src/cloudformation_cli_python_lib/utils.py

@@ -219,7 +219,7 @@ def serialize(self) -> Mapping[str, Any]:
 
 
 @dataclass
-class HookRequestDataFooBar:
+class HookRequestData:
     targetName: str
     targetType: str
     targetLogicalId: str
@@ -236,10 +236,8 @@ def __init__(self, **kwargs: Any) -> None:
                 setattr(self, k, v)
 
     @classmethod
-    def deserialize(
-        cls, json_data: MutableMapping[str, Any]
-    ) -> "HookRequestDataFooBar":
-        req_data = HookRequestDataFooBar(**json_data)
+    def deserialize(cls, json_data: MutableMapping[str, Any]) -> "HookRequestData":
+        req_data = HookRequestData(**json_data)
         for key in json_data:
             if not key.endswith("Credentials"):
                 continue
@@ -290,12 +288,6 @@ def is_hook_invocation_payload_remote(self) -> bool:
             not self.targetModel and self.payload
         ):  # pylint: disable=simplifiable-if-statement
             return True
-        # return True
-        # if (
-        #     not hasattr(self, HOOK_REQUEST_DATA_TARGET_MODEL_FIELD_NAME)
-        #  and hasattr(self, HOOK_REQUEST_DATA_PAYLOAD_FIELD_NAME)
-        # ):  # pylint: disable=simplifiable-if-statement
-        #     return True
 
         return False
 
@@ -307,7 +299,7 @@ class HookInvocationRequest:
     hookTypeName: str
     hookTypeVersion: str
     actionInvocationPoint: str
-    requestData: HookRequestDataFooBar
+    requestData: HookRequestData
     clientRequestToken: str
     changeSetId: Optional[str] = None
     hookModel: Optional[Mapping[str, Any]] = None
@@ -322,7 +314,7 @@ def __init__(self, **kwargs: Any) -> None:
     @classmethod
     def deserialize(cls, json_data: MutableMapping[str, Any]) -> Any:
         event = HookInvocationRequest(**json_data)
-        event.requestData = HookRequestDataFooBar.deserialize(
+        event.requestData = HookRequestData.deserialize(
             json_data.get("requestData", {})
         )
         event.requestContext = HookRequestContext.deserialize(

tests/lib/hook_test.py

@@ -17,7 +17,7 @@
 from cloudformation_cli_python_lib.utils import (
     Credentials,
     HookInvocationRequest,
-    HookRequestDataFooBar,
+    HookRequestData,
 )
 
 import json
@@ -492,15 +492,15 @@ def test_get_hook_status(operation_status, hook_status):
 
 
 def test__hook_request_data_remote_payload():
-    non_remote_input = HookRequestDataFooBar(
+    non_remote_input = HookRequestData(
         targetName="someTargetName",
         targetType="someTargetModel",
         targetLogicalId="someTargetLogicalId",
         targetModel={"resourceProperties": {"propKeyA": "propValueA"}},
     )
     assert non_remote_input.is_hook_invocation_payload_remote() is False
 
-    non_remote_input_1 = HookRequestDataFooBar(
+    non_remote_input_1 = HookRequestData(
         targetName="someTargetName",
         targetType="someTargetModel",
         targetLogicalId="someTargetLogicalId",
@@ -509,7 +509,7 @@ def test__hook_request_data_remote_payload():
     )
     assert non_remote_input_1.is_hook_invocation_payload_remote() is False
 
-    remote_input = HookRequestDataFooBar(
+    remote_input = HookRequestData(
         targetName="someTargetName",
         targetType="someTargetModel",
         targetLogicalId="someTargetLogicalId",

tests/lib/log_delivery_test.py

@@ -8,7 +8,7 @@
 from cloudformation_cli_python_lib.utils import (
     HandlerRequest,
     HookInvocationRequest,
-    HookRequestDataFooBar,
+    HookRequestData,
     RequestData,
 )
 
@@ -60,7 +60,7 @@ def make_hook_payload() -> HookInvocationRequest:
         clientRequestToken=str(uuid4()),
         hookTypeName="AWS::Test::Hook",
         hookTypeVersion="3",
-        requestData=HookRequestDataFooBar(
+        requestData=HookRequestData(
             providerLogGroupName="test_group",
             targetName="AWS::Test::Resource",
             targetType="RESOURCE",