Merge "Remove use of formatter function"

Zuul · openstack-gerrit · commit 2148a86fc574 · 2025-04-02T10:19:34.000Z
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
@@ -428,23 +428,22 @@ def take_action(self, parsed_args):
             domain = identity_client.find_domain(
                 name_or_id=parsed_args.domain,
             )
-            columns: tuple[str, ...] = ('ID', 'Name', 'Domain')
             data = identity_client.roles(domain_id=domain.id)
+            return (
+                ('ID', 'Name', 'Domain'),
+                (
+                    utils.get_item_properties(s, ('id', 'name'))
+                    + (domain.name,)
+                    for s in data
+                ),
+            )
+
         else:
-            columns = ('ID', 'Name')
             data = identity_client.roles()
-
-        return (
-            columns,
-            (
-                utils.get_item_properties(
-                    s,
-                    columns,
-                    formatters={'Domain': lambda _: domain.name},
-                )
-                for s in data
-            ),
-        )
+            return (
+                ('ID', 'Name'),
+                (utils.get_item_properties(s, ('id', 'name')) for s in data),
+            )
 
 
 class RemoveRole(command.Command):
