From 6ec65c46b5e13363ba3053af6a62d69bbc352459 Mon Sep 17 00:00:00 2001 From: Marco Lettere Date: Fri, 4 Dec 2020 10:03:19 +0100 Subject: [PATCH] added realm variable for LR to KC workflows and task for removal of workflows befroe uploading --- defaults/main.yaml | 1 + tasks/main.yaml | 11 ++++++++++- templates/create-user-add-to-vre.json.j2 | 4 ++-- templates/group_created.json.j2 | 4 ++-- templates/group_deleted.json.j2 | 4 ++-- templates/invitation-accepted.json.j2 | 4 ++-- templates/user-group-role_created.json.j2 | 4 ++-- templates/user-group-role_deleted.json.j2 | 4 ++-- templates/user-group_created.json.j2 | 4 ++-- templates/user-group_deleted.json.j2 | 4 ++-- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 268ea49..c4473aa 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -11,6 +11,7 @@ workflows: - delete-user-account keycloak_host: "https://accounts.dev.d4science.org/auth" keycloak: "{{ keycloak_host }}/realms" +keycloak_realm: "d4science" keycloak_admin: "{{ keycloak_host }}/admin/realms" keycloak_auth: "c93501bd-abeb-4228-bc28-afac38877338" liferay: "https://next.d4science.org/api/jsonws" diff --git a/tasks/main.yaml b/tasks/main.yaml index 4cb8d46..9fa6b9d 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -11,6 +11,15 @@ dest: "{{ target.path }}/{{ item }}.json" loop: "{{ workflows }}" +- name: Undeploy previous versions of workflows + uri: + url: "{{ conductor_workflowdef_endpoint }}/{{ item }}/1" + method: DELETE + follow_redirects: yes + status_code: [200, 204, 404, 500] + loop: + "{{ workflows }}" + - name: Upload workflows uri: url: "{{ conductor_workflowdef_endpoint }}" @@ -18,7 +27,7 @@ src: "{{ target.path }}/{{ item }}.json" body_format: json follow_redirects: yes - status_code: [200, 204, 409, 500] + status_code: [200, 204] loop: "{{ workflows }}" diff --git a/templates/create-user-add-to-vre.json.j2 b/templates/create-user-add-to-vre.json.j2 index 58542e7..e78321b 100644 --- a/templates/create-user-add-to-vre.json.j2 +++ b/templates/create-user-add-to-vre.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "group" : "${workflow.input.group}", "scriptExpression": "var path = $.group.split('%2F').slice(1); return { 'tree' : Java.to(path, 'java.lang.Object[]'), 'name' : path.slice(path.length-1)[0]}" } diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2 index e7cd250..1a9705e 100644 --- a/templates/group_created.json.j2 +++ b/templates/group_created.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "clientId" : "${workflow.input.group}", "scriptExpression": "var tree = $.clientId.split('%2F'); return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/')}" } diff --git a/templates/group_deleted.json.j2 b/templates/group_deleted.json.j2 index b06464c..0e0a7f9 100644 --- a/templates/group_deleted.json.j2 +++ b/templates/group_deleted.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "group" : "${workflow.input.group}", "scriptExpression" : "return $.group.split('%2F').join('/')" } diff --git a/templates/invitation-accepted.json.j2 b/templates/invitation-accepted.json.j2 index 36d812c..a1001ba 100644 --- a/templates/invitation-accepted.json.j2 +++ b/templates/invitation-accepted.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "scriptExpression": "1" } }, diff --git a/templates/user-group-role_created.json.j2 b/templates/user-group-role_created.json.j2 index 85c7e1b..868ab17 100644 --- a/templates/user-group-role_created.json.j2 +++ b/templates/user-group-role_created.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "scriptExpression": "1" } }, diff --git a/templates/user-group-role_deleted.json.j2 b/templates/user-group-role_deleted.json.j2 index 08ad250..a08b9a6 100644 --- a/templates/user-group-role_deleted.json.j2 +++ b/templates/user-group-role_deleted.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "scriptExpression": "1" } }, diff --git a/templates/user-group_created.json.j2 b/templates/user-group_created.json.j2 index 78148b3..9cdd804 100644 --- a/templates/user-group_created.json.j2 +++ b/templates/user-group_created.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "group" : "${workflow.input.group}", "scriptExpression": "var path = $.group.split('%2F').slice(1); return { 'tree' : Java.to(path, 'java.lang.Object[]'), 'name' : path.slice(path.length-1)[0]}" } diff --git a/templates/user-group_deleted.json.j2 b/templates/user-group_deleted.json.j2 index 966eadf..58a4ff0 100644 --- a/templates/user-group_deleted.json.j2 +++ b/templates/user-group_deleted.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/{{ keycloak_realm }}", + "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}", "group" : "${workflow.input.group}", "scriptExpression": "var path = $.group.split('%2F').slice(1); return { 'tree' : Java.to(path, 'java.lang.Object[]'), 'name' : path.slice(path.length-1)[0]}" }