merge

src/gam/__init__.py

@@ -11426,6 +11426,8 @@ def ProcessGAMCommand(args):
             i, encoding = getCharSet(i + 1)
             f = fileutils.open_file(filename, encoding=encoding)
             csvFile = csv.DictReader(f)
+            if not csvFile.fieldnames:
+                controlflow.system_error_exit(0, f'CSV file {filename} is empty')
             if (i == len(sys.argv)) or (sys.argv[i].lower() !=
                                         'gam') or (i + 1 == len(sys.argv)):
                 controlflow.system_error_exit(

src/gam/gapi/cloudidentity/inboundsso.py

@@ -252,7 +252,7 @@ def create_credentials():
             key_size = int(sys.argv[i+1])
             if key_size not in allowed_sizes:
                 controlflow.expected_argument_exit('key_size',
-                                                   ALLOWED_KEY_SIZES,
+                                                   allowed_sizes,
                                                    key_size)
             i += 2
         else:
@@ -335,6 +335,8 @@ def print_show_credentials(action='print'):
         elif myarg == 'todrive':
             todrive = True
             i += 1
+            for profile in sys.argv[i+1].replace(',', ' ').split():
+                profiles.append(profile_displayname_to_name(profile, ci))
         else:
             controlflow.invalid_argument_exit(myarg, 'gam print inboundssocredentials')
     if not profiles:
@@ -408,7 +410,7 @@ def parse_assignment(body, i, ci):
                     ci,
                     group)
             i += 2
-        elif myarg in ['ou', 'orgunit']:
+        elif myarg in ['ou', 'org', 'orgunit']:
             body['targetOrgUnit'] = get_orgunit_id(sys.argv[i+1])
             i += 2
         else:

src/gam/gapi/vault.py

@@ -11,6 +11,7 @@ from gam import controlflow
 from gam import display
 from gam import fileutils
 from gam import gapi
+from gam.gapi import errors as gapi_errors
 from gam.gapi import storage as gapi_storage
 from gam.gapi import directory as gapi_directory
 from gam.gapi.directory import orgunits as gapi_directory_orgunits
@@ -976,10 +977,14 @@ def printHolds():
     for matterId in matterIds:
         i += 1
         sys.stderr.write(f'Retrieving holds for matter {matterId} ({i}/{matter_count})\n')
-        holds = gapi.get_all_pages(v.matters().holds(),
+        try:
+            holds = gapi.get_all_pages(v.matters().holds(),
                                    'list',
                                    'holds',
+                                   throw_reasons=[gapi_errors.ErrorReason.FOUR_O_O],
                                    matterId=matterId)
+        except googleapiclient.errors.HttpError:
+            continue
         for hold in holds:
             display.add_row_titles_to_csv_file(
                 utils.flatten_json(hold, flattened={'matterId': matterId}),