Previous tags and allowing newer Docker versions

.travis.yml

@@ -25,6 +25,7 @@ jobs:
     language: python
     python: "3.6"
     script:
+      - ls -la
       - DIR=$(mktemp -d)
       - cd "$DIR"
       - ls -la

python/rpdk/python/__init__.py

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

python/rpdk/python/templates/requirements.txt

@@ -1 +1 @@
-{{ support_lib_name }}==2.1.0
+{{ support_lib_name }}==2.1.1

setup.py

@@ -38,7 +38,7 @@ def find_version(*file_paths):
     include_package_data=True,
     zip_safe=True,
     python_requires=">=3.6",
-    install_requires=["cloudformation-cli>=0.1,<0.2", "docker>=3.7,<3.8"],
+    install_requires=["cloudformation-cli>=0.1,<0.2", "docker>=3.7,<5"],
     entry_points={
         "rpdk.v1.languages": [
             "python37 = rpdk.python.codegen:Python37LanguagePlugin",

src/cloudformation_cli_python_lib/interface.py

@@ -131,6 +131,7 @@ class BaseResourceHandlerRequest:
     desiredResourceState: Optional[BaseModel]
     previousResourceState: Optional[BaseModel]
     desiredResourceTags: Optional[Mapping[str, Any]]
+    previousResourceTags: Optional[Mapping[str, Any]]
     systemTags: Optional[Mapping[str, Any]]
     awsAccountId: Optional[str]
     logicalResourceIdentifier: Optional[str]

src/cloudformation_cli_python_lib/resource.py

@@ -164,6 +164,7 @@ def _cast_resource_request(
                 desiredResourceState=request.requestData.resourceProperties,
                 previousResourceState=request.requestData.previousResourceProperties,
                 desiredResourceTags=request.requestData.stackTags,
+                previousResourceTags=request.requestData.previousStackTags,
                 systemTags=request.requestData.systemTags,
                 awsAccountId=request.awsAccountId,
                 logicalResourceIdentifier=request.requestData.logicalResourceId,

src/cloudformation_cli_python_lib/utils.py

@@ -114,6 +114,7 @@ class UnmodelledRequest:
     desiredResourceState: Optional[Mapping[str, Any]] = None
     previousResourceState: Optional[Mapping[str, Any]] = None
     desiredResourceTags: Optional[Mapping[str, Any]] = None
+    previousResourceTags: Optional[Mapping[str, Any]] = None
     systemTags: Optional[Mapping[str, Any]] = None
     awsAccountId: Optional[str] = None
     logicalResourceIdentifier: Optional[str] = None
@@ -127,6 +128,7 @@ def to_modelled(self, model_cls: Type[BaseModel]) -> BaseResourceHandlerRequest:
             desiredResourceState=model_cls._deserialize(self.desiredResourceState),
             previousResourceState=model_cls._deserialize(self.previousResourceState),
             desiredResourceTags=self.desiredResourceTags,
+            previousResourceTags=self.previousResourceTags,
             systemTags=self.systemTags,
             awsAccountId=self.awsAccountId,
             logicalResourceIdentifier=self.logicalResourceIdentifier,

src/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="cloudformation-cli-python-lib",
-    version="2.0.0",
+    version="2.1.1",
     description=__doc__,
     author="Amazon Web Services",
     author_email="[email protected]",

tests/plugin/codegen_test.py

@@ -149,7 +149,7 @@ def test_package_pip(project):
 
     # not real requirements, would make version bumps a pain to test
     (project.root / "requirements.txt").write_text("")
-    (project.root / f"{SUPPORT_LIB_NAME}-0.0.1.tar.gz").touch()
+    (project.root / f"{SUPPORT_LIB_NAME}-2.1.1.tar.gz").touch()
     # want to exclude *.pyc files from zip, but code isn't run, so never get made
     (project.root / "src" / "foo_bar_baz" / "coverage.pyc").touch()