Updates from Jason review

Also "replace"-ed repoveprefix, since I think this script might be running on a machine with only python 3.6.8 (removeprefix needs 3.9)

Author: williamnswanson

group_identifier_assigner.py

@@ -20,7 +20,7 @@
 POST = "POST"
 DELETE = "DELETE"
 
-OSPOOL_PATTERN_STR = "Yes-"
+OSPOOL_PROJECT_PREFIX_STR = "Yes-"
 PROJECT_GIDS_START = 200000
 
 _usage = f"""\
@@ -153,10 +153,11 @@ def get_datalist(data, listname):
 
 
 def identifier_index(id_list, id_type):
-    found_list = list((id["Type"] == id_type for id in id_list))
-    if any(found_list):
-        return found_list.index(True)
-    return -1
+    id_type_list = [id["Type"] for id in id_list]
+    try:
+        return id_type_list.index(id_type)
+    except ValueError:
+        return -1
 
 
 def identifier_matches(id_list, id_type, regex_string):
@@ -225,33 +226,36 @@ def main(args):
 
     co_groups = get_osg_co_groups()["CoGroups"]
     highest_osggid = 0
+    projects_to_assign_identifiers = []
 
     for group in co_groups:
         gid = group["Id"]
         identifier_data = get_co_group_identifiers(gid)
-        
+
         if identifier_data:
             identifier_list = identifier_data["Identifiers"]
 
             project_id_index = identifier_index(identifier_list, "ospoolproject")
             if project_id_index != -1:
-                project_id = identifier_list[project_id_index]["Identifier"]
-                is_project = (re.compile(OSPOOL_PATTERN_STR + "*").match(project_id) is not None)
+                project_id = str(identifier_list[project_id_index]["Identifier"])
+                is_project = re.compile(OSPOOL_PROJECT_PREFIX_STR + "*").match(project_id) is not None
             else:
                 is_project = False
 
             osggid_index = identifier_index(identifier_list, "osggid")
             if osggid_index != -1:
                 highest_osggid = max(highest_osggid, int(identifier_list[osggid_index]["Identifier"]))
             elif is_project is True:
-                # for each, set a 'OSG GID' starting from 200000 and a 'OSG Group Name' that is the group name
-                osggid_to_assign = max(highest_osggid + 1, options.project_gid_startval)
-                highest_osggid = osggid_to_assign
-                add_identifier_to_group(gid, type="osggid", identifier_name=osggid_to_assign)
-
-                project_name = project_id.removeprefix(OSPOOL_PATTERN_STR).lower()
-                add_identifier_to_group(gid, type="osggroup", identifier_name=project_name)
-                print(f"project {project_id}: added osggid {osggid_to_assign} and osg project name {project_name}")
+                project_name = project_id.replace(OSPOOL_PROJECT_PREFIX_STR, "", 1).lower()
+                projects_to_assign_identifiers.append(tuple([gid, project_name]))
+
+    for gid, project_name in projects_to_assign_identifiers:
+        # for each, set a 'OSG GID' starting from 200000 and a 'OSG Group Name' that is the group name
+        osggid_to_assign = max(highest_osggid + 1, options.project_gid_startval)
+        highest_osggid = osggid_to_assign
+        add_identifier_to_group(gid, type="osggid", identifier_name=osggid_to_assign)
+        add_identifier_to_group(gid, type="osggroup", identifier_name=project_name)
+        print(f"project {project_name}: added osggid {osggid_to_assign} and osg project name {project_name}")
 
 
 if __name__ == "__main__":