You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/02/03 13:13:31 UTC
[incubator-dlab] branch DLAB-1499 updated: [DLAB-1499]:
Noteboks/links are not loaded successfully if project contains more than
one edge fixed
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1499
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1499 by this push:
new 0c15fa2 [DLAB-1499]: Noteboks/links are not loaded successfully if project contains more than one edge fixed
0c15fa2 is described below
commit 0c15fa2b1a83c618cb8232a843f81d99568a9927
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Mon Feb 3 15:13:13 2020 +0200
[DLAB-1499]: Noteboks/links are not loaded successfully if project contains more than one edge fixed
---
.../src/general/scripts/aws/edge_configure.py | 4 ++--
.../src/general/scripts/azure/edge_configure.py | 4 ++--
.../src/general/scripts/gcp/edge_configure.py | 4 ++--
.../src/project/scripts/configure_keycloak.py | 27 +++-------------------
4 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index eb72395..889708f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -222,11 +222,11 @@ if __name__ == "__main__":
raise Exception
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
- "--edge_public_ip {} --hostname {} --project_name {} " \
+ "--edge_public_ip {} --hostname {} --project_name {} --endpoint_name {} " \
.format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
os.environ['keycloak_user_password'],
- keycloak_client_secret, edge_conf['edge_public_ip'], instance_hostname, os.environ['project_name'])
+ keycloak_client_secret, edge_conf['edge_public_ip'], instance_hostname, os.environ['project_name'], os.environ['endpoint_name'])
try:
local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
except:
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index e1837ca..e6625bd 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -293,11 +293,11 @@ if __name__ == "__main__":
raise Exception
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
- "--edge_public_ip {} --project_name {}" \
+ "--edge_public_ip {} --project_name {} --endpoint_name {} " \
.format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
os.environ['keycloak_user_password'],
- keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'])
+ keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'], os.environ['endpoint_name'])
try:
local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
except:
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 45e0115..e3024f2 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -262,11 +262,11 @@ if __name__ == "__main__":
raise Exception
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
"--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
- "--edge_public_ip {} --project_name {}" \
+ "--edge_public_ip {} --project_name {}" --endpoint_name {} \
.format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
os.environ['keycloak_user_password'],
- keycloak_client_secret, instance_hostname, os.environ['project_name'])
+ keycloak_client_secret, instance_hostname, os.environ['project_name'], os.environ['endpoint_name'])
try:
local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
except:
diff --git a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
index a34bd8e..a40bad2 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
@@ -41,6 +41,7 @@ parser.add_argument('--keycloak_client_secret', type=str, default='')
parser.add_argument('--edge_public_ip', type=str, default='')
parser.add_argument('--hostname', type=str, default='')
parser.add_argument('--project_name', type=str, default='')
+parser.add_argument('--endpoint_name', type=str, default='')
args = parser.parse_args()
##############
@@ -61,7 +62,7 @@ if __name__ == "__main__":
keycloak_client_create_url = '{0}/admin/realms/{1}/clients'.format(args.keycloak_auth_server_url,
args.keycloak_realm_name)
- keycloak_client_name = "{0}-{1}".format(args.service_base_name, args.project_name)
+ keycloak_client_name = "{0}-{1}-{2}".format(args.service_base_name, args.project_name, args.endpoint_name)
keycloak_client_id = str(uuid.uuid4())
if args.hostname == '':
keycloak_redirectUris = 'https://{0}/*,http://{0}/*'.format(args.edge_public_ip).split(',')
@@ -81,29 +82,7 @@ if __name__ == "__main__":
try:
keycloak_token = requests.post(keycloak_auth_server_url, data=keycloak_auth_data, verify=False).json()
- keycloak_client_data_check = {
- "clientId": keycloak_client_name,
- }
-
- keycloak_client_id = requests.get(keycloak_client_create_url, data=keycloak_auth_data,
- params=keycloak_client_data_check,
- headers={"Authorization": "Bearer " + keycloak_token.get("access_token"),
- "Content-Type": "application/json"}, verify=False).json()
- if keycloak_client_id:
- keycloak_client_redirectUris = keycloak_client_id[0]['redirectUris']
- updated_keycloak_redirectUris = keycloak_client_redirectUris + keycloak_redirectUris
- keycloak_client_data_upd = {
- "clientId": keycloak_client_name,
- "redirectUris": updated_keycloak_redirectUris,
- }
- keycloak_id_of_client = keycloak_client_id[0]['id']
- keycloak_client_update_url = '{0}/admin/realms/{1}/clients/{2}'.format(args.keycloak_auth_server_url,
- args.keycloak_realm_name, keycloak_id_of_client)
- keycloak_client = requests.put(keycloak_client_update_url, json=keycloak_client_data_upd,
- headers={"Authorization": "Bearer " + keycloak_token.get("access_token"),
- "Content-Type": "application/json"}, verify=False)
- else:
- keycloak_client = requests.post(keycloak_client_create_url, json=keycloak_client_data,
+ keycloak_client = requests.post(keycloak_client_create_url, json=keycloak_client_data,
headers={"Authorization": "Bearer " + keycloak_token.get("access_token"),
"Content-Type": "application/json"}, verify=False)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org