deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 05:33:34 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Try universal ToS. Fixes #1489

Browse Source
This commit is contained in:
Jay Lee
2022-03-07 19:51:43 +00:00
parent 94b5407cb4
commit 53b336aee9
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gam/__init__.py
View File

@ -7118,6 +7118,7 @@ def enableGAMProjectAPIs(GAMProjectAPIs,
f' Project: {projectId}, Enable {jcount} APIs{currentCount(i, count)}' f' Project: {projectId}, Enable {jcount} APIs{currentCount(i, count)}'
) )
j = 0 j = 0
tried_universal_tos = False
for api in apis: for api in apis:
service_name = f'projects/{projectId}/services/{api}' service_name = f'projects/{projectId}/services/{api}'
j += 1 j += 1
@ -7128,19 +7129,26 @@ def enableGAMProjectAPIs(GAMProjectAPIs,
throw_reasons=[ throw_reasons=[
gapi_errors.ErrorReason.FAILED_PRECONDITION, gapi_errors.ErrorReason.FAILED_PRECONDITION,
gapi_errors.ErrorReason.FORBIDDEN, gapi_errors.ErrorReason.FORBIDDEN,
gapi_errors.ErrorReason.PERMISSION_DENIED gapi_errors.ErrorReason.PERMISSION_DENIED,
gapi_errors.ErrorReason.FOUR_O_O,
], ],
retry_reasons=[gapi_errors.ErrorReason.INTERNAL_SERVER_ERROR], retry_reasons=[gapi_errors.ErrorReason.INTERNAL_SERVER_ERROR],
name=service_name) name=service_name)
print(f' API: {api}, Enabled{currentCount(j, jcount)}') print(f' API: {api}, Enabled{currentCount(j, jcount)}')
break break
except gapi_errors.GapiFailedPreconditionError as e: except (gapi_errors.GapiFailedPreconditionError,
googleapiclient.errors.HttpError) as e:
if hasattr(e, 'reason'):
msg = e.reason
else:
msg = str(e)
if 'terms of service' in msg.lower() and not tried_universal_tos:
msg = '''You need to agree to the Google Cloud Terms of Service at:\n\n https://console.developers.google.com'''
tried_universal_tos = True
print( print(
f'\nThere was an error enabling {api}. Please resolve error as described below:' f'\nThere was an error enabling {api}. Please resolve error as described below:'
) )
print() print(f'\n\n{msg}\n\n')
print(f'\n{str(e)}\n')
print()
input( input(
'Press enter once resolved and we will try enabling the API again.' 'Press enter once resolved and we will try enabling the API again.'
) )