diff --git a/src/gam/__init__.py b/src/gam/__init__.py index de951f6d..03ab41ec 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -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': diff --git a/src/gam/gapi/directory/cros.py b/src/gam/gapi/directory/cros.py index 0621e179..4236d809 100644 --- a/src/gam/gapi/directory/cros.py +++ b/src/gam/gapi/directory/cros.py @@ -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: