From ea97ab493c66b85d0f09e7fe1bf17a7717ca87b2 Mon Sep 17 00:00:00 2001 From: Michael Maeng Date: Wed, 21 Dec 2022 09:30:36 -0500 Subject: [PATCH 1/2] If desired resource state/tag is none, default to empty dictionary --- src/cloudformation_cli_python_lib/resource.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloudformation_cli_python_lib/resource.py b/src/cloudformation_cli_python_lib/resource.py index bf7ba30f..04b59a6a 100644 --- a/src/cloudformation_cli_python_lib/resource.py +++ b/src/cloudformation_cli_python_lib/resource.py @@ -164,9 +164,9 @@ def _cast_resource_request( try: return UnmodelledRequest( clientRequestToken=request.bearerToken, - desiredResourceState=request.requestData.resourceProperties, + desiredResourceState=request.requestData.resourceProperties if request.requestData.resourceProperties else {}, previousResourceState=request.requestData.previousResourceProperties, - desiredResourceTags=request.requestData.stackTags, + desiredResourceTags=request.requestData.stackTags if request.requestData.stackTags else {}, previousResourceTags=request.requestData.previousStackTags, systemTags=request.requestData.systemTags, previousSystemTags=request.requestData.previousSystemTags, From fbbb1e940bf96d32d703f159b8fae915a2b8dc68 Mon Sep 17 00:00:00 2001 From: Michael Maeng Date: Wed, 21 Dec 2022 09:37:09 -0500 Subject: [PATCH 2/2] linting and formating --- src/cloudformation_cli_python_lib/resource.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cloudformation_cli_python_lib/resource.py b/src/cloudformation_cli_python_lib/resource.py index 04b59a6a..bfc93845 100644 --- a/src/cloudformation_cli_python_lib/resource.py +++ b/src/cloudformation_cli_python_lib/resource.py @@ -164,9 +164,13 @@ def _cast_resource_request( try: return UnmodelledRequest( clientRequestToken=request.bearerToken, - desiredResourceState=request.requestData.resourceProperties if request.requestData.resourceProperties else {}, + desiredResourceState=request.requestData.resourceProperties + if request.requestData.resourceProperties + else {}, previousResourceState=request.requestData.previousResourceProperties, - desiredResourceTags=request.requestData.stackTags if request.requestData.stackTags else {}, + desiredResourceTags=request.requestData.stackTags + if request.requestData.stackTags + else {}, previousResourceTags=request.requestData.previousStackTags, systemTags=request.requestData.systemTags, previousSystemTags=request.requestData.previousSystemTags,