Several fixes (#1218)

Have create project use http object that uses CA_FILE
Fix calls to functions in new source modules
Put deprovisionupgradetransfer back
This commit is contained in:
Ross Scroggs
2020-07-02 01:38:40 -07:00
committed by GitHub
parent 7ee1edbab8
commit 45e0e57668
2 changed files with 8 additions and 4 deletions

View File

@@ -6990,7 +6990,7 @@ def getCRMService(login_hint):
'online',
login_hint=login_hint,
use_console_flow=not GC_Values[GC_OAUTH_BROWSER])
httpc = transport.AuthorizedHttp(creds)
httpc = transport.AuthorizedHttp(creds, transport.create_http())
return getService('cloudresourcemanagerv1', httpc), httpc
@@ -11365,7 +11365,7 @@ def ProcessGAMCommand(args):
elif argument in ['course', 'class']:
doDelCourse()
elif argument == 'domain':
doDelDomain()
gapi_directory_domains.delete()
elif argument in ['domainalias', 'aliasdomain']:
gapi_directory_domainaliases.delete()
elif argument == 'admin':
@@ -11745,7 +11745,7 @@ def ProcessGAMCommand(args):
elif delWhat in ['token', 'tokens', 'oauth', '3lo']:
doDelTokens(users)
elif delWhat in ['group', 'groups']:
deleteUserFromGroups(users)
gapi_directory_groups.deleteUserFromGroups(users)
elif delWhat in ['alias', 'aliases']:
doRemoveUsersAliases(users)
elif delWhat == 'emptydrivefolders':

View File

@@ -52,11 +52,15 @@ def doUpdateCros():
elif action in ['deprovisionretiringdevice']:
action = 'deprovision'
deprovisionReason = 'retiring_device'
elif action == 'deprovisionupgradetransfer':
action = 'deprovision'
deprovisionReason = 'upgrade_transfer'
elif action not in ['disable', 'reenable']:
controlflow.system_error_exit(2, f'expected action of ' \
f'deprovision_same_model_replace, ' \
f'deprovision_different_model_replace, ' \
f'deprovision_retiring_device, disable or reenable,'
f'deprovision_retiring_device, ' \
f'deprovision_upgrade_transfer, disable or reenable,'
f' got {action}')
action_body = {'action': action}
if deprovisionReason: