This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1379
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1379 by this push:
new 7747210 [DLAB-1379] - SSN creation fixed
7747210 is described below
commit 774721076f959640ae70d666efd5b5b47e8f685e
Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com>
AuthorDate: Mon Dec 16 15:41:01 2019 +0200
[DLAB-1379] - SSN creation fixed
---
.../src/general/lib/gcp/actions_lib.py | 31 +++++++++++++---------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 8779f18..3759abf 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -554,21 +554,28 @@ class GCPActions:
def set_role_to_service_account(self, service_account_name, role_name,
role_type='custom'):
resource = "projects/{}/serviceAccounts/{}".format(self.project,
service_account_name)
- request =
GCPActions().service_resource.projects().serviceAccounts().getIamPolicy(resource=resource)
- serviceAccounts_policy = request.execute()
+# request =
GCPActions().service_resource.projects().serviceAccounts().getIamPolicy(resource=resource)
+# serviceAccounts_policy = request.execute()
service_account_email =
"{}@{}.iam.gserviceaccount.com".format(service_account_name, self.project)
- params = {
- "role": "projects/{}/roles/{}".format(self.project,
role_name.replace('-', '_')),
- "members": [
- "serviceAccount:{}".format(service_account_email)
- ]
- }
- if role_type == 'predefined':
- params['role'] = "roles/{}".format(role_name)
- serviceAccounts_policy['bindings'].append(params)
+# params = {
+# "role": "projects/{}/roles/{}".format(self.project,
role_name.replace('-', '_')),
+# "members": [
+# "serviceAccount:{}".format(service_account_email)
+# ]
+# }
+# if role_type == 'predefined':
+# params['role'] = "roles/{}".format(role_name)
+# serviceAccounts_policy['bindings'].append(params)
params = {
"policy": {
- "bindings": serviceAccounts_policy['bindings']
+ "bindings": [
+ {
+ "role": "projects/{}/roles/{}".format(self.project,
role_name.replace('-', '_')),
+ "members": [
+ "serviceAccount:{}".format(service_account_email)
+ ]
+ }
+ ]
}
}
request =
self.service_resource.projects().serviceAccounts().setIamPolicy(resource=resource,
body=params)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
