diff --git a/setup.py b/setup.py index 7ec4c086..953170f2 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,11 @@ def find_version(*file_paths): include_package_data=True, zip_safe=True, python_requires=">=3.6", - install_requires=["cloudformation-cli>=0.1.10,<0.2", "docker>=3.7,<5"], + install_requires=[ + "cloudformation-cli>=0.1.10,<0.2", + "docker>=3.7,<5", + "urllib3<1.26", + ], entry_points={ "rpdk.v1.languages": [ "python37 = rpdk.python.codegen:Python37LanguagePlugin", diff --git a/src/cloudformation_cli_python_lib/interface.py b/src/cloudformation_cli_python_lib/interface.py index 7dbd8aa8..7f3d3a0d 100644 --- a/src/cloudformation_cli_python_lib/interface.py +++ b/src/cloudformation_cli_python_lib/interface.py @@ -133,6 +133,7 @@ class BaseResourceHandlerRequest: desiredResourceTags: Optional[Mapping[str, Any]] previousResourceTags: Optional[Mapping[str, Any]] systemTags: Optional[Mapping[str, Any]] + previousSystemTags: Optional[Mapping[str, Any]] awsAccountId: Optional[str] logicalResourceIdentifier: Optional[str] nextToken: Optional[str] diff --git a/src/cloudformation_cli_python_lib/resource.py b/src/cloudformation_cli_python_lib/resource.py index 63363719..88d35acc 100644 --- a/src/cloudformation_cli_python_lib/resource.py +++ b/src/cloudformation_cli_python_lib/resource.py @@ -161,6 +161,7 @@ def _cast_resource_request( desiredResourceTags=request.requestData.stackTags, previousResourceTags=request.requestData.previousStackTags, systemTags=request.requestData.systemTags, + previousSystemTags=request.requestData.previousSystemTags, awsAccountId=request.awsAccountId, logicalResourceIdentifier=request.requestData.logicalResourceId, stackId=request.stackId, diff --git a/src/cloudformation_cli_python_lib/utils.py b/src/cloudformation_cli_python_lib/utils.py index eb9a4a63..28af28d6 100644 --- a/src/cloudformation_cli_python_lib/utils.py +++ b/src/cloudformation_cli_python_lib/utils.py @@ -58,6 +58,7 @@ class RequestData: providerCredentials: Optional[Credentials] = None previousResourceProperties: Optional[Mapping[str, Any]] = None previousStackTags: Optional[Mapping[str, Any]] = None + previousSystemTags: Optional[Mapping[str, Any]] = None @classmethod def deserialize(cls, json_data: MutableMapping[str, Any]) -> "RequestData": @@ -121,6 +122,7 @@ class UnmodelledRequest: desiredResourceTags: Optional[Mapping[str, Any]] = None previousResourceTags: Optional[Mapping[str, Any]] = None systemTags: Optional[Mapping[str, Any]] = None + previousSystemTags: Optional[Mapping[str, Any]] = None awsAccountId: Optional[str] = None logicalResourceIdentifier: Optional[str] = None nextToken: Optional[str] = None @@ -136,6 +138,7 @@ def to_modelled(self, model_cls: Type[BaseModel]) -> BaseResourceHandlerRequest: desiredResourceTags=self.desiredResourceTags, previousResourceTags=self.previousResourceTags, systemTags=self.systemTags, + previousSystemTags=self.previousSystemTags, awsAccountId=self.awsAccountId, logicalResourceIdentifier=self.logicalResourceIdentifier, nextToken=self.nextToken, diff --git a/src/setup.py b/src/setup.py index a6769ae8..3da3dfb3 100644 --- a/src/setup.py +++ b/src/setup.py @@ -3,7 +3,7 @@ setup( name="cloudformation-cli-python-lib", - version="2.1.3", + version="2.1.4", description=__doc__, author="Amazon Web Services", author_email="aws-cloudformation-developers@amazon.com", diff --git a/tests/lib/log_delivery_test.py b/tests/lib/log_delivery_test.py index 9d69f1ac..9477ad54 100644 --- a/tests/lib/log_delivery_test.py +++ b/tests/lib/log_delivery_test.py @@ -37,6 +37,7 @@ def make_payload() -> HandlerRequest: logicalResourceId="MyResourceId", resourceProperties={}, systemTags={}, + previousSystemTags={}, ), stackId="an-arn", ) diff --git a/tests/lib/resource_test.py b/tests/lib/resource_test.py index 467ffa4a..3b03c487 100644 --- a/tests/lib/resource_test.py +++ b/tests/lib/resource_test.py @@ -42,6 +42,7 @@ "resourceProperties": sentinel.state_in1, "previousResourceProperties": sentinel.state_in2, "systemTags": {"aws:cloudformation:stack-id": "SampleStack"}, + "previousSystemTags": {}, "stackTags": {"tag1": "abc"}, "previousStackTags": {"tag1": "def"}, },