This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1643 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f7049651849ca27676b0283abbd4c32d4f6ba821 Author: leonidfrolov <[email protected]> AuthorDate: Thu Mar 19 15:49:39 2020 +0200 [DLAB-1643]: made some changes --- .../src/general/scripts/gcp/project_terminate.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py index 49d0767..f58b14e 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py @@ -53,7 +53,7 @@ def terminate_edge_node(endpoint_name, project_name, service_base_name, region, print("Terminating EDGE and notebook instances") base = '{}-{}-{}'.format(service_base_name, project_name, endpoint_name) - keys = ['edge', 'ps', 'static-ip', 'bucket', 'subnet', 'edge-sa', 'ps-sa', 'edge-role', 'ps-role'] + keys = ['edge', 'ps', 'static-ip', 'bucket', 'subnet'] targets = ['{}-{}'.format(base, k) for k in keys] try: instances = GCPMeta.get_list_instances(zone, base) @@ -101,8 +101,10 @@ def terminate_edge_node(endpoint_name, project_name, service_base_name, region, print("Removing Service accounts and roles") try: list_service_accounts = GCPMeta.get_list_service_accounts() - role_targets = ['{}-{}-{}'.format(base, GCPMeta.get_index_by_service_account_name( - '{}-{}'.format(base, k)), k) for k in keys] + sa_keys = ['edge-sa', 'ps-sa'] + role_keys = ['edge-role', 'ps-role'] + indexes = [GCPMeta.get_index_by_service_account_name('{}-{}'.format(base, k)) for k in sa_keys] + role_targets = ['{}-{}-{}'.format(base, i, k) for k in role_keys for i in indexes] for service_account in (set(targets) & set(list_service_accounts)): GCPActions.remove_service_account(service_account, service_base_name) list_roles_names = GCPMeta.get_list_roles() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
