Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/cloudformation_cli_python_lib/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions src/cloudformation_cli_python_lib/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions src/cloudformation_cli_python_lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
Expand Down
1 change: 1 addition & 0 deletions tests/lib/log_delivery_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def make_payload() -> HandlerRequest:
logicalResourceId="MyResourceId",
resourceProperties={},
systemTags={},
previousSystemTags={},
),
stackId="an-arn",
)
Expand Down
1 change: 1 addition & 0 deletions tests/lib/resource_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
},
Expand Down