You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/08/30 14:00:00 UTC
[incubator-datalab] branch DATALAB-1342 updated: [DATALAB-1342]:
moved client secret generation to configure_keycloak
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-1342
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-1342 by this push:
new 46f1b6d [DATALAB-1342]: moved client secret generation to configure_keycloak
46f1b6d is described below
commit 46f1b6dcd9d4cd8b5be0293d8564b7432fb93075
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Aug 30 16:59:47 2021 +0300
[DATALAB-1342]: moved client secret generation to configure_keycloak
---
infrastructure-provisioning/src/base/scripts/configure_keycloak.py | 3 +++
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 1 -
infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py | 1 -
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/base/scripts/configure_keycloak.py b/infrastructure-provisioning/src/base/scripts/configure_keycloak.py
index 538a665..e760e8f 100644
--- a/infrastructure-provisioning/src/base/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/base/scripts/configure_keycloak.py
@@ -58,6 +58,9 @@ if __name__ == "__main__":
"client_id": "admin-cli",
}
+ if not args.keycloak_client_secret:
+ args.keycloak_client_secret = str(uuid.uuid4())
+
keycloak_client_create_url = '{0}/admin/realms/{1}/clients'.format(args.keycloak_auth_server_url,
args.keycloak_realm_name)
if args.project_name and args.endpoint_name:
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index f040c82..d2921a5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -625,7 +625,6 @@ if __name__ == "__main__":
clear_resources()
sys.exit(1)
- ssn_conf['keycloak_client_secret'] = str(uuid.uuid4())
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
"--edge_public_ip {} " \
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index e77ec28..9ca8844 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -516,7 +516,6 @@ if __name__ == "__main__":
datalab.fab.append_result("Unable to configure UI.", str(err))
sys.exit(1)
- ssn_conf['keycloak_client_secret'] = str(uuid.uuid4())
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
"--edge_public_ip {} " \
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index aa02e0b..464c94d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -525,7 +525,6 @@ if __name__ == "__main__":
clear_resources()
sys.exit(1)
- ssn_conf['keycloak_client_secret'] = str(uuid.uuid4())
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
"--edge_public_ip {} " \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org