Hotfix user not returning list

lib/openstack_query/queries/user_query.py

@@ -31,8 +31,9 @@ class UserQuery(QueryWrapper):
 
     def _get_server_side_handler(self) -> ServerSideHandler:
         """
-        method to configure a server handler which can be used to get 'filter' keyword arguments that
-        can be passed to openstack function conn.compute.servers() to filter results for a valid preset-property pair
+        method to configure a server-side handler which can be used to get 'filter' keyword arguments that
+        can be passed to an openstack function to filter results for a valid preset-property
+        on the control plane, rather than locally.
 
         valid filters documented here:
             https://docs.openstack.org/openstacksdk/latest/user/proxies/compute.html
@@ -43,6 +44,7 @@ def _get_server_side_handler(self) -> ServerSideHandler:
                 QueryPresetsGeneric.EQUAL_TO: {
                     UserProperties.USER_DOMAIN_ID: lambda value: {"domain_id": value},
                     UserProperties.USER_NAME: lambda value: {"name": value},
+                    UserProperties.USER_ID: lambda value: {"id": value},
                 }
             }
         )
@@ -51,7 +53,7 @@ def _get_client_side_handlers(self) -> QueryClientSideHandlers:
         """
         method to configure a set of client-side handlers which can be used to get local filter functions
         corresponding to valid preset-property pairs. These filter functions can be used to filter results after
-        listing all servers.
+        listing all users.
         """
         return QueryClientSideHandlers(
             # set generic query preset mappings

lib/openstack_query/runners/user_runner.py

@@ -79,7 +79,7 @@ def _run_query(
         conn: OpenstackConnection,
         filter_kwargs: Optional[Dict[str, str]] = None,
         **meta_params,
-    ) -> List[User]:
+    ) -> List[Optional[User]]:
         """
         This method runs the query by running openstacksdk commands
 
@@ -91,6 +91,12 @@ def _run_query(
         if not filter_kwargs:
             filter_kwargs = {}
 
+        # having a filter of 'id' - will automatically mean no other filter kwargs
+        selected_id = filter_kwargs.get("id", None)
+        if selected_id:
+            val = conn.identity.find_user(selected_id, ignore_missing=True)
+            return [val] if val else []
+
         if meta_params["domain_id"] and "domain_id" in filter_kwargs.keys():
             raise ParseQueryError(
                 "This query uses a preset that requires searching on domain_ids "

tests/lib/openstack_query/runners/test_user_runner.py

@@ -149,6 +149,20 @@ def test_run_query_no_meta_args(
     assert res == ["user1", "user2"]
 
 
+def test_run_query_returns_list(instance, mock_openstack_connection):
+    """
+    Tests that run_query correctly returns a list of entries
+    """
+    return_value = NonCallableMock()
+    mock_openstack_connection.identity.find_user.return_value = return_value
+
+    returned = instance._run_query(mock_openstack_connection, filter_kwargs={"id": "1"})
+    mock_openstack_connection.identity.find_user.assert_called_once_with(
+        "1", ignore_missing=True
+    )
+    assert [return_value] == returned
+
+
 def test_run_query_with_from_domain_and_id_given(instance, mock_openstack_connection):
     """
     Test error is raised when the domain name and domain id is provided at