ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-09-09 22:51:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes GcpRequest comparison for boolean parameters

Browse source 
Fixes #402 .
This commit is contained in:
nkakouros 2023-01-22 00:37:58 +01:00 • committed by Yusuke Tsutsumi
commit 30c2bbd84e
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/module_utils/gcp_utils.py
View file

@ -362,7 +362,7 @@ class GcpRequest(object):
def _compare_dicts(self, req_dict, resp_dict): def _compare_dicts(self, req_dict, resp_dict):
difference = {} difference = {}
for key in req_dict: for key in req_dict:
if resp_dict.get(key): if resp_dict.get(key) is not None:
difference[key] = self._compare_value(req_dict.get(key), resp_dict.get(key)) difference[key] = self._compare_value(req_dict.get(key), resp_dict.get(key))
# Remove all empty values from difference. # Remove all empty values from difference.
@ -408,7 +408,7 @@ class GcpRequest(object):
diff = None diff = None
# If a None is found, a difference does not exist. # If a None is found, a difference does not exist.
# Only differing values matter. # Only differing values matter.
if not resp_value: if resp_value is None:
return None return None
# Can assume non-None types at this point. # Can assume non-None types at this point.
@ -444,7 +444,7 @@ class GcpRequest(object):
# Value1 False, resp_value 'false' # Value1 False, resp_value 'false'
if not req_value and to_text(resp_value) == 'false': if not req_value and to_text(resp_value) == 'false':
return None return None
return resp_value return True
# to_text may throw UnicodeErrors. # to_text may throw UnicodeErrors.
# These errors shouldn't crash Ansible and should be hidden. # These errors shouldn't crash Ansible and should be hidden.

31
tests/unit/plugins/test_gcp_utils.py
View file

@ -143,3 +143,34 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
request2 = GcpRequest(value2) request2 = GcpRequest(value2)
self.assertNotEquals(request1, request2) self.assertNotEquals(request1, request2)
self.assertEqual(request1.difference(request2), difference) self.assertEqual(request1.difference(request2), difference)
def test_dicts_boolean_with_difference(self):
value1 = {
"foo": True,
"bar": False,
"baz": True,
"qux": False,
}
value2 = {
"foo": True,
"bar": False,
"baz": False,
"qux": True,
}
value2 = {
"foo": True,
"bar": False,
"baz": False,
"qux": True,
}
difference = {
"baz": True,
"qux": True,
}
request1 = GcpRequest(value1)
request2 = GcpRequest(value2)
self.assertNotEquals(request1, request2)
self.assertEqual(request1.difference(request2), difference)