From 9f7174cb8a75c7cf1780025846c74593b404a3b3 Mon Sep 17 00:00:00 2001 From: nelynehemia Date: Tue, 22 Nov 2022 17:51:38 +0200 Subject: [PATCH 1/2] use JsonCleanuper --- cloudify_aws/common/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cloudify_aws/common/__init__.py b/cloudify_aws/common/__init__.py index c5fc1a83..1d704faf 100644 --- a/cloudify_aws/common/__init__.py +++ b/cloudify_aws/common/__init__.py @@ -65,8 +65,10 @@ def get_describe_result(self, params): return {} def compare_configuration(self): - return DeepDiff(self.expected_configuration, - self.remote_configuration) + result = DeepDiff(self.expected_configuration, + self.remote_configuration) + delta = utils.JsonCleanuper(result) + return delta.to_dict() def import_configuration(self, resource_config, runtime_props): """ Read all of the various runtime properties where we store From 73c58903c14b564b7ed478e7e4d220d20bf6cac6 Mon Sep 17 00:00:00 2001 From: nelynehemia Date: Tue, 22 Nov 2022 17:55:05 +0200 Subject: [PATCH 2/2] update version and changelog --- CHANGELOG.txt | 2 ++ plugin.yaml | 2 +- plugin_1_4.yaml | 2 +- plugin_1_5.yaml | 2 +- v2_plugin.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ab3dd149..d171b0c7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,5 @@ +3.1.2: + - RD-6237 Calculated drift in non-JSON serializable format 3.1.1: - RD 6213 RDS provisioned in wrong vpc. 3.1.0: diff --git a/plugin.yaml b/plugin.yaml index 929ac32f..9bd9b6bd 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: '3.1.1' + package_version: '3.1.2' data_types: diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml index 7c01038b..9e2cbf1b 100644 --- a/plugin_1_4.yaml +++ b/plugin_1_4.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: '3.1.1' + package_version: '3.1.2' data_types: diff --git a/plugin_1_5.yaml b/plugin_1_5.yaml index 87164853..f5e5d851 100644 --- a/plugin_1_5.yaml +++ b/plugin_1_5.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: '3.1.1' + package_version: '3.1.2' properties_description: | Manage AWS resources. Credentials documentation: https://docs.cloudify.co/latest/working_with/official_plugins/infrastructure/aws/#authentication-with-aws. diff --git a/v2_plugin.yaml b/v2_plugin.yaml index bcd539be..c3ea4136 100644 --- a/v2_plugin.yaml +++ b/v2_plugin.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: '3.1.1' + package_version: '3.1.2' data_types: