Merge pull request #495 from cloudify-cosmo/RD-6237-compare_configura…

…tion-drift RD-6237-compare_configuration-drift
cloudify-cosmo · Nov 22, 2022 · d60b43f · d60b43f
2 parents 43409c1 + 73c5890
commit d60b43f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git 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/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

diff --git 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
@@ -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
@@ -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
@@ -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: