Fix searching by unique identifier (Chaffelson#205)

razdob15 · Chaffelson · web-flow · commit 735d0e24a35d · 2020-06-26T10:13:48.000+01:00
* Fix the search according unique identifier

* Fix the search according unique identifier and update functions doc

* Minor typo correction

Co-authored-by: Dan Chaffelson &lt;chaffelson@gmail.com&gt;
diff --git a/nipyapi/security.py b/nipyapi/security.py
@@ -44,22 +44,22 @@ def list_service_users(service='nifi'):
 
 def get_service_user(identifier, identifier_type='identity', service='nifi'):
     """
-    Filters the all users list for a given identifier and type
+    Gets the unique user matching to the given identifier and type.
 
     Args:
         identifier (str): the string to search for
         identifier_type (str): the field to search in
         service (str): the name of the service
 
     Returns:
-        None if no match, list of multiple matches, else single object
+        None if no match, else single object
 
     """
     assert service in _valid_services
     assert isinstance(identifier, six.string_types)
     assert isinstance(identifier_type, six.string_types)
     obj = list_service_users(service)
-    out = nipyapi.utils.filter_obj(obj, identifier, identifier_type)
+    out = nipyapi.utils.filter_obj(obj, identifier, identifier_type, greedy=False)
     return out
 
 
@@ -212,22 +212,22 @@ def list_service_user_groups(service='nifi'):
 def get_service_user_group(identifier, identifier_type='identity',
                            service='nifi'):
     """
-    Filters the all groups list for a given identifier and type
+    Gets the unique group matching to the given identifier and type.
 
     Args:
         identifier (str): the string to search for
         identifier_type (str): the field to search in, identity or id
         service (str): the name of the service
 
     Returns:
-        None if no match, list of multiple matches, else single object
+        None if no match, else single object
 
     """
     assert service in _valid_services
     assert isinstance(identifier, six.string_types)
     assert isinstance(identifier_type, six.string_types)
     obj = list_service_user_groups(service)
-    out = nipyapi.utils.filter_obj(obj, identifier, identifier_type)
+    out = nipyapi.utils.filter_obj(obj, identifier, identifier_type, greedy=False)
     return out
 
 
