[incubator-dlab] branch DLAB-1643 updated: [DLAB-1643]: made some changes

[lf...@apache.org]

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


The following commit(s) were added to refs/heads/DLAB-1643 by this push:
     new 8e24787  [DLAB-1643]: made some changes
8e24787 is described below

commit 8e24787f5eb001c313bed71474fe65ecf79aea3d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 19 16:16:41 2020 +0200

    [DLAB-1643]: made some changes
---
 .../src/general/scripts/gcp/project_terminate.py                       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
index f58b14e..d6997bd 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
@@ -103,9 +103,10 @@ def terminate_edge_node(endpoint_name, project_name, service_base_name, region,
         list_service_accounts = GCPMeta.get_list_service_accounts()
         sa_keys = ['edge-sa', 'ps-sa']
         role_keys = ['edge-role', 'ps-role']
+        sa_target = ['{}-{}'.format(base, k) for k in sa_keys]
         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)):
+        for service_account in (set(sa_target) & set(list_service_accounts)):
             GCPActions.remove_service_account(service_account, service_base_name)
         list_roles_names = GCPMeta.get_list_roles()
         for role in (set(role_targets) & set(list_roles_names)):


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org