adding previous system tags (#137)

Author: ammokhov

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",

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]

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,

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,

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="[email protected]",

tests/lib/log_delivery_test.py

@@ -37,6 +37,7 @@ def make_payload() -> HandlerRequest:
             logicalResourceId="MyResourceId",
             resourceProperties={},
             systemTags={},
+            previousSystemTags={},
         ),
         stackId="an-arn",
     )

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"},
     },