Change entry point to prod from test for contract test (#533)

* Change entry point to prod from test for contrcat test

* Update Model for Prod entry point

Author: anshikg

src/rpdk/core/contract/resource_client.py

@@ -317,22 +317,32 @@ def assert_failed(status, response):
         return error_code
 
     @staticmethod
+    # pylint: disable=R0913
     def make_request(
         desired_resource_state,
         previous_resource_state,
         region,
         account,
         partition,
+        action,
+        creds,
+        token,
+        callback_context=None,
         **kwargs
     ):
         return {
-            "desiredResourceState": desired_resource_state,
-            "previousResourceState": previous_resource_state,
-            "logicalResourceIdentifier": "test",
-            **kwargs,
+            "requestData": {
+                "callerCredentials": creds,
+                "resourceProperties": desired_resource_state,
+                "previousResourceProperties": previous_resource_state,
+                "logicalResourceIdentifier": token,
+            },
             "region": region,
             "awsPartition": partition,
             "awsAccountId": account,
+            "action": action,
+            "callbackContext": callback_context,
+            **kwargs,
         }
 
     @staticmethod
@@ -368,17 +378,30 @@ def is_primary_identifier_equal(
             for primary_identifier in primary_identifier_path
         )
 
-    def _make_payload(self, action, request, callback_context=None):
-        return {
-            "credentials": self._creds.copy(),
-            "action": action,
-            "request": {"clientRequestToken": self.generate_token(), **request},
-            "callbackContext": callback_context,
-        }
+    def _make_payload(self, action, current_model, previous_model=None, **kwargs):
+        return self.make_request(
+            current_model,
+            previous_model,
+            self.region,
+            self.account,
+            self.partition,
+            action,
+            self._creds.copy(),
+            self.generate_token(),
+            **kwargs
+        )
 
     def _call(self, payload):
         payload_to_log = {
-            key: payload[key] for key in ["callbackContext", "action", "request"]
+            key: payload[key]
+            for key in [
+                "callbackContext",
+                "action",
+                "requestData",
+                "region",
+                "awsPartition",
+                "awsAccountId",
+            ]
         }
         LOG.debug(
             "Sending request\n%s",
@@ -397,27 +420,19 @@ def call_and_assert(
     ):
         if assert_status not in [OperationStatus.SUCCESS, OperationStatus.FAILED]:
             raise ValueError("Assert status {} not supported.".format(assert_status))
-        request = self.make_request(
-            current_model,
-            previous_model,
-            self.region,
-            self.account,
-            self.partition,
-            **kwargs
-        )
 
-        status, response = self.call(action, request)
+        status, response = self.call(action, current_model, previous_model, **kwargs)
         if assert_status == OperationStatus.SUCCESS:
             self.assert_success(status, response)
             error_code = None
         else:
             error_code = self.assert_failed(status, response)
         return status, response, error_code
 
-    def call(self, action, request):
-        payload = self._make_payload(action, request)
+    def call(self, action, current_model, previous_model=None, **kwargs):
+        request = self._make_payload(action, current_model, previous_model, **kwargs)
         start_time = time.time()
-        response = self._call(payload)
+        response = self._call(request)
         self.assert_time(start_time, time.time(), action)
 
         # this throws a KeyError if status isn't present, or if it isn't a valid status
@@ -434,11 +449,10 @@ def call(self, action, request):
             )
             sleep(callback_delay_seconds)
 
-            request["desiredResourceState"] = response.get("resourceModel")
-            payload["callbackContext"] = response.get("callbackContext")
-            payload["request"] = request
+            request["requestData"]["resourceProperties"] = response.get("resourceModel")
+            request["callbackContext"] = response.get("callbackContext")
 
-            response = self._call(payload)
+            response = self._call(request)
             status = OperationStatus[response["status"]]
 
         # ensure writeOnlyProperties are not returned on final responses

src/rpdk/core/contract/suite/handler_delete.py

@@ -38,14 +38,7 @@ def deleted_resource(resource_client):
         assert "resourceModel" not in response
         yield model, request
     finally:
-        request = resource_client.make_request(
-            model,
-            None,
-            resource_client.region,
-            resource_client.account,
-            resource_client.partition,
-        )
-        status, response = resource_client.call(Action.DELETE, request)
+        status, response = resource_client.call(Action.DELETE, model)
 
         # a failed status is allowed if the error code is NotFound
         if status == OperationStatus.FAILED:

src/rpdk/core/test.py

@@ -28,7 +28,7 @@
 LOG = logging.getLogger(__name__)
 
 DEFAULT_ENDPOINT = "http://127.0.0.1:3001"
-DEFAULT_FUNCTION = "TestEntrypoint"
+DEFAULT_FUNCTION = "TypeFunction"
 DEFAULT_REGION = "us-east-1"
 DEFAULT_TIMEOUT = "30"
 INPUTS = "inputs"

tests/contract/test_resource_client.py

@@ -228,19 +228,25 @@ def test_make_request():
     request = ResourceClient.make_request(
         desired_resource_state,
         previous_resource_state,
-        "us-west-2",
-        "11111111",
+        "us-east-1",
+        ACCOUNT,
         "aws",
-        clientRequestToken=token,
+        "CREATE",
+        {},
+        token,
     )
     assert request == {
-        "desiredResourceState": desired_resource_state,
-        "previousResourceState": previous_resource_state,
-        "logicalResourceIdentifier": "test",
-        "clientRequestToken": token,
-        "region": "us-west-2",
+        "requestData": {
+            "callerCredentials": {},
+            "resourceProperties": desired_resource_state,
+            "previousResourceProperties": previous_resource_state,
+            "logicalResourceIdentifier": token,
+        },
+        "region": DEFAULT_REGION,
         "awsPartition": "aws",
-        "awsAccountId": "11111111",
+        "awsAccountId": ACCOUNT,
+        "action": "CREATE",
+        "callbackContext": None,
     }
 
 
@@ -495,17 +501,24 @@ def test_has_writable_identifier_compound_is_writeable(resource_client):
     assert resource_client.has_writable_identifier()
 
 
-def test__make_payload(resource_client):
+def test_make_payload(resource_client):
     resource_client._creds = {}
 
     token = "ecba020e-b2e6-4742-a7d0-8a06ae7c4b2f"
     with patch.object(resource_client, "generate_token", return_value=token):
         payload = resource_client._make_payload("CREATE", {"foo": "bar"})
 
     assert payload == {
-        "credentials": {},
+        "requestData": {
+            "callerCredentials": {},
+            "resourceProperties": {"foo": "bar"},
+            "previousResourceProperties": None,
+            "logicalResourceIdentifier": token,
+        },
+        "region": DEFAULT_REGION,
+        "awsPartition": "aws",
+        "awsAccountId": ACCOUNT,
         "action": "CREATE",
-        "request": {"clientRequestToken": token, "foo": "bar"},
         "callbackContext": None,
     }
 

tests/test_invoke.py

@@ -12,6 +12,7 @@
 from rpdk.core.project import Project
 
 ACTIONS = list(Action.__members__)
+ACCOUNT = "11111111"
 
 
 @pytest.fixture
@@ -20,9 +21,16 @@ def payload_path(tmp_path):
     with path.open("w", encoding="utf-8") as f:
         json.dump(
             {
-                "desiredResourceState": None,
-                "previousResourceState": None,
-                "logicalResourceIdentifier": None,
+                "requestData": {
+                    "resourceProperties": {},
+                    "previousResourceProperties": None,
+                    "logicalResourceIdentifier": None,
+                    "providerLogGroupName": "test_resource_contract_test",
+                },
+                "region": "us-west-2",
+                "awsPartition": "aws",
+                "awsAccountId": "11111111",
+                "resourceType": "test",
             },
             f,
         )
@@ -163,14 +171,22 @@ def _invoke_and_expect(status, payload_path, command, *args):
         autospec=True,
         return_value={},
     )
+    patch_account = patch(
+        "rpdk.core.contract.resource_client.get_account",
+        autospec=True,
+        return_value=ACCOUNT,
+    )
 
     with patch_project, patch_session as mock_session, patch_creds as mock_creds:
-        mock_client = mock_session.return_value.client.return_value
-        mock_client.invoke.side_effect = lambda **_kwargs: {
-            "Payload": StringIO(json.dumps({"status": status}))
-        }
-        main(args_in=["invoke", command, str(payload_path), *args])
-
+        with patch_account as mock_account:
+            mock_client = mock_session.return_value.client.return_value
+            mock_client.invoke.side_effect = lambda **_kwargs: {
+                "Payload": StringIO(json.dumps({"status": status}))
+            }
+            mock_account.return_value = ACCOUNT
+            main(args_in=["invoke", command, str(payload_path), *args])
+
+    # mock_account.assert_called_once_with(mock_client)
     mock_creds.assert_called_once()
 
     return mock_project, mock_client.invoke

tests/test_project.py

@@ -42,7 +42,7 @@
 ENDPOINT = "cloudformation.beta.com"
 RUNTIME = random.choice(list(LAMBDA_RUNTIMES))
 BLANK_CLIENT_ERROR = {"Error": {"Code": "", "Message": ""}}
-
+LOG = logging.getLogger(__name__)
 REGISTRATION_TOKEN = "foo"
 TYPE_ARN = "arn:aws:cloudformation:us-east-1:123456789012:type/resource/Foo-Bar-Foo"
 TYPE_VERSION_ARN = (
@@ -277,6 +277,9 @@ def test_generate_docs_with_multityped_property(project, tmp_path_factory):
     read_me_stripped = readme_contents.strip().replace(" ", "")
     read_me_target_stripped = readme_contents_target.read().strip().replace(" ", "")
 
+    LOG.debug("read_me_stripped %s", read_me_stripped)
+    LOG.debug("read_me_target_stripped %s", read_me_target_stripped)
+
     assert project.type_name in readme_contents
     assert read_me_stripped == read_me_target_stripped