Change order of operations (#719)

Add new/updated key to dict only after removing old ones Co-authored-by: Marges, RSY (Rick) <[email protected]> Co-authored-by: Sean Sullivan <[email protected]>
redhat-cop · Nov 1, 2023 · bc6e8e5 · bc6e8e5
1 parent 4596d83
commit bc6e8e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/lookup/controller_object_diff.py b/plugins/lookup/controller_object_diff.py
@@ -115,9 +115,9 @@ def create_present_list(self, compare_list):
 
     def map_item(self, item, new_attribute_name, attribute_value, dupitems):
         new_item = copy.deepcopy(item)
-        new_item.update({new_attribute_name: attribute_value})
         for dupitem in [dupitem for dupitem in dupitems if dupitem in new_item]:
             new_item.pop(dupitem)
+        new_item.update({new_attribute_name: attribute_value})
         return new_item
 
     def run(self, terms, variables=None, **kwargs):

diff --git a/roles/object_diff/tasks/roles.yml b/roles/object_diff/tasks/roles.yml
@@ -11,16 +11,16 @@
     - __controller_api_current_user_check_is_admin.is_superuser
   block:
 
-    - name: "Get the API list of all roles"  # noqa jinja[spacing]
+    - name: "Get the API list of all roles"
       ansible.builtin.set_fact:
         __controller_api_roles: "{{ (__controller_api_roles | default([])) + [{
                                       'users': current_users,
                                       'teams': current_teams,
                                       'name': current_role.name,
                                       'role': current_role.name,
                                       'type': current_role.type,
-                                      'resource_type': (current_role.summary_fields.resource_type|default('no_resource_type')),
-                                      (current_role.summary_fields.resource_type|default('no_resource_type')): (current_role.summary_fields.resource_name|default('no_resource_name'))
+                                      'resource_type': (current_role.summary_fields.resource_type | default('no_resource_type')),
+                                      (current_role.summary_fields.resource_type | default('no_resource_type')): (current_role.summary_fields.resource_name | default('no_resource_name'))
                                     }]
                                  }}"
       vars: