a-c-m
/
ansible.utils
mirror of https://github.com/ansible-collections/ansible.utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove strings

pull/156/head
KB-perByte 2022-04-06 11:20:16 +05:30
parent 39ab9aeecd
commit ae4bfa421c
No known key found for this signature in database
GPG Key ID: F49472BE1744C3D5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/plugin_utils/consolidate.py
View File

@ -26,7 +26,9 @@ def _raise_error(filter, msg):
Raises: Raises:
AnsibleFilterError: AnsibleError with filter name and message AnsibleFilterError: AnsibleError with filter name and message
""" """
error = f"Error when using plugin 'consolidate': '{filter}' reported {msg}" error = "Error when using plugin 'consolidate': '{filter}' reported {msg}".format(
filter=filter, msg=msg
)
raise AnsibleFilterError(error) raise AnsibleFilterError(error)
@ -83,13 +85,17 @@ def check_missing_match_key_duplicate(
except KeyError: except KeyError:
if fail_missing_match_key: if fail_missing_match_key:
errors_match_key.append( errors_match_key.append(
f"Missing match key '{match_key}' in data source {ds_idx} in list entry {dd_idx}" "Missing match key '{match_key}' in data source {ds_idx} in list entry {dd_idx}".format(
match_key=match_key, ds_idx=ds_idx, dd_idx=dd_idx
)
) )
continue continue
if sorted(set(ds_values)) != sorted(ds_values) and fail_duplicate: if sorted(set(ds_values)) != sorted(ds_values) and fail_duplicate:
errors_duplicate.append( errors_duplicate.append(
f"Duplicate values in data source {ds_idx}" "Duplicate values in data source {ds_idx}".format(
ds_idx=ds_idx
)
) )
results.append(set(ds_values)) results.append(set(ds_values))
return results, { return results, {
@ -114,8 +120,11 @@ def check_missing_match_values(matched_keys, fail_missing_match_value):
for ds_idx, ds_values in enumerate(matched_keys): for ds_idx, ds_values in enumerate(matched_keys):
missing_match = all_values - ds_values missing_match = all_values - ds_values
if missing_match: if missing_match:
m_matches = ", ".join(missing_match)
errors_match_values.append( errors_match_values.append(
f"Missing match value {', '.join(missing_match)} in data source {ds_idx}" "Missing match value {m_matches} in data source {ds_idx}".format(
ds_idx=ds_idx, m_matches=m_matches
)
) )
return all_values, {"match_val_err": errors_match_values} return all_values, {"match_val_err": errors_match_values}