From e38ec13dacf8df3fd84af05094ccab495c59c316 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Thu, 7 May 2020 08:59:52 -0700
Subject: [PATCH] Update report documentation/fix gam create project (#1179)

* Update report documentation

* Wait for service account creation to complete

* Update __init__.py
---
 src/GamCommands.txt |  4 ++--
 src/gam/__init__.py | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index f42892ec..1a89299d 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -928,14 +928,14 @@ gam report usage customer [todrive]
 	[fields|parameters <String>]
 
 gam report users|user [todrive]
-	[(user <UserItem>)|(orgunit|org|ou <OrgUnitPath>)]
+	[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)]
 	[date <Date>] [fulldatarequired all|<ReportsAppList>]
 	[filter|filters <String>] [fields|parameters <String>]
 gam report customers|customer|domain [todrive]
 	[date <Date>] [fulldatarequired all|<ReportsAppList>]
 	[fields|parameters <String>]
 gam report <ActivityApplicationName> [todrive]
-	[user all|<UserItem>]
+	[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)]
 	[start <Time>] [end <Time>]
 	[filter|filters <String>] [event <String>] [ip <String>]
 
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 12d39305..0a02437a 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -8608,10 +8608,22 @@ def doCreateOrRotateServiceAccountKeys(iam=None,
         private_key, publicKeyData = _generatePrivateKeyAndPublicCert(
             name, local_key_size)
         print(' Uploading new public certificate to Google...')
-        result = gapi.call(iam.projects().serviceAccounts().keys(),
-                           'upload',
-                           name=name,
-                           body={'publicKeyData': publicKeyData})
+        max_retries = 10
+        for i in range(1, max_retries+1):
+          try:
+            result = gapi.call(iam.projects().serviceAccounts().keys(),
+                               'upload',
+                               throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
+                               name=name,
+                               body={'publicKeyData': publicKeyData})
+            break
+          except gapi_errors.GapiNotFoundError as e:
+              if i == max_retries:
+                  raise e
+              sleep_time = i*5
+              if i > 3:
+                  print(f'Waiting for Service Account creation to complete. Sleeping {sleep_time} seconds\n')
+              time.sleep(sleep_time)
         private_key_id = result['name'].rsplit('/', 1)[-1]
         oauth2service_data = _formatOAuth2ServiceData(project_id, client_email,
                                                       client_id, private_key,