This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new 8f04434  [DLAB-1546]: added name convention changes
8f04434 is described below

commit 8f04434832a93eae353808d102b3216a2f49d200
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 4 16:09:11 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/gcp/project_terminate.py                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py 
b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
index eaa2183..0f5b5bf 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
@@ -104,9 +104,9 @@ def terminate_edge_node(endpoint_name, project_name, 
service_base_name, region,
         role_targets = ['{}-{}-{}'.format(base, 
GCPMeta.get_index_by_service_account_name(
             '{}-{}'.format(base, k)), k) for k in keys]
         for service_account in (set(targets) & set(list_service_accounts)):
-            if service_account.startswith(service_base_name) and 
service_account.endswith('-edge'):
+            if service_account.startswith(service_base_name) and 
service_account.endswith('-edge-sa'):
                 GCPActions.remove_service_account(service_account, 
service_base_name)
-            elif service_account.startswith(service_base_name) and 
service_account.endswith('-ps'):
+            elif service_account.startswith(service_base_name) and 
service_account.endswith('-ps-sa'):
                 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to