Restructure request to match handlers (#565)

* Restructure request to match handlers

* RequestContext -> callbackContext

* Bumping for release

Author: John Tompkins

src/rpdk/core/__init__.py

@@ -1,5 +1,5 @@
 import logging
 
-__version__ = "0.1.8"
+__version__ = "0.1.9"
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

src/rpdk/core/contract/resource_client.py

@@ -133,7 +133,6 @@ def __init__(
         )
         self.region = region
         self.account = get_account(self._session, self._creds)
-        self.partition = self._get_partition()
         self._function_name = function_name
         if endpoint.startswith("http://"):
             self._client = self._session.client(
@@ -161,13 +160,6 @@ def __init__(
         self._inputs = inputs
         self._timeout_in_seconds = int(timeout_in_seconds)
 
-    def _get_partition(self):
-        if self.region.startswith("cn"):
-            return "aws-cn"
-        if self.region.startswith("us-gov"):
-            return "aws-gov"
-        return "aws"
-
     def _properties_to_paths(self, key):
         return {fragment_decode(prop, prefix="") for prop in self._schema.get(key, [])}
 
@@ -340,7 +332,6 @@ def make_request(
         previous_resource_state,
         region,
         account,
-        partition,
         action,
         creds,
         token,
@@ -354,7 +345,6 @@ def make_request(
                 "previousResourceProperties": previous_resource_state,
             },
             "region": region,
-            "awsPartition": partition,
             "awsAccountId": account,
             "action": action,
             "callbackContext": callback_context,
@@ -416,7 +406,6 @@ def _make_payload(self, action, current_model, previous_model=None, **kwargs):
             previous_model,
             self.region,
             self.account,
-            self.partition,
             action,
             self._creds.copy(),
             self.generate_token(),
@@ -431,7 +420,6 @@ def _call(self, payload):
                 "action",
                 "requestData",
                 "region",
-                "awsPartition",
                 "awsAccountId",
                 "bearerToken",
             ]

tests/contract/test_resource_client.py

@@ -253,7 +253,6 @@ def test_make_request():
         previous_resource_state,
         "us-east-1",
         ACCOUNT,
-        "aws",
         "CREATE",
         {},
         token,
@@ -265,7 +264,6 @@ def test_make_request():
             "previousResourceProperties": previous_resource_state,
         },
         "region": DEFAULT_REGION,
-        "awsPartition": "aws",
         "awsAccountId": ACCOUNT,
         "action": "CREATE",
         "bearerToken": token,
@@ -538,7 +536,6 @@ def test_make_payload(resource_client):
             "previousResourceProperties": None,
         },
         "region": DEFAULT_REGION,
-        "awsPartition": "aws",
         "awsAccountId": ACCOUNT,
         "action": "CREATE",
         "bearerToken": token,
@@ -876,17 +873,3 @@ def test_generate_update_example_with_inputs(resource_client_inputs):
 
 def test_generate_invalid_update_example_with_inputs(resource_client_inputs):
     assert resource_client_inputs.generate_invalid_update_example({"a": 1}) == {"b": 2}
-
-
-def test_get_partition_aws(resource_client):
-    assert resource_client._get_partition() == "aws"
-
-
-def test_get_partition_aws_cn(resource_client):
-    resource_client.region = "cn-north-1"
-    assert resource_client._get_partition() == "aws-cn"
-
-
-def test_get_partition_aws_gov(resource_client):
-    resource_client.region = "us-gov-west-1"
-    assert resource_client._get_partition() == "aws-gov"