Merge c0dd352 into e8a53b7

Chaffelson · Jun 25, 2020 · 259201c · 259201c
2 parents e8a53b7 + c0dd352
commit 259201c
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/nipyapi/security.py b/nipyapi/security.py
@@ -155,26 +155,30 @@ def create_service_user_group(identity, service='nifi',
     """
     assert service in _valid_services
     assert isinstance(identity, six.string_types)
+
+    users_ids = None
+
     if service == 'nifi':
-        assert all(isinstance(user, nipyapi.nifi.UserEntity) for user in users)
-    else:
-        assert all(isinstance(user, nipyapi.registry.User) for user in users)
-    if service == 'registry':
-        user_group_obj = nipyapi.registry.UserGroup(
-            identity=identity,
-            users=[{'identifier': user.identifier} for user in users]
-        )
-    else:
-        # must be nifi
+        if users:
+            assert all(isinstance(user, nipyapi.nifi.UserEntity) for user in users)
+            users_ids = [{'id': user.id} for user in users]
         user_group_obj = nipyapi.nifi.UserGroupEntity(
             revision=nipyapi.nifi.RevisionDTO(
                 version=0
             ),
             component=nipyapi.nifi.UserGroupDTO(
                 identity=identity,
-                users=[{'id': user.id} for user in users]
+                users=users_ids
             )
         )
+    else:
+        if users:
+            assert all(isinstance(user, nipyapi.registry.User) for user in users)
+            users_ids = [{'identifier': user.identifier} for user in users]
+        user_group_obj = nipyapi.registry.UserGroup(
+            identity=identity,
+            users=users_ids
+        )
     try:
         return getattr(nipyapi, service).TenantsApi().create_user_group(
             user_group_obj