From 0181349228250825905804bf056fd81c9861814f Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Wed, 18 Oct 2023 14:18:27 +0200
Subject: [PATCH] fixed transformation to array

---
 defaults/main.yaml                           | 8 ++++----
 templates/add_role_policy_permission.json.j2 | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 404921b..4f582b9 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -11,7 +11,7 @@ workflows:
    # - delete-user-account
    # - role_deleted
    # - role_created
-   # - add_role_policy_permission 
+   - add_role_policy_permission 
    # - add_all_member_roles
    # - create_system_service
    # - delete_system_service
@@ -27,9 +27,9 @@ workflows:
    # - ghn_client_remove_from_contexts
    # - ghn_client_remove_from_context
    # - jupyterhub_add_serveroptions_to_context
-   - record_context_to_is
-   - create_vre_folder_for_context
-   - create_vre
+   # - record_context_to_is
+   # - create_vre_folder_for_context
+   # - create_vre
 
 keycloak_host: "https://accounts.dev.d4science.org/auth"
 keycloak: "{{ keycloak_host }}/realms"
diff --git a/templates/add_role_policy_permission.json.j2 b/templates/add_role_policy_permission.json.j2
index 44025bc..7e95ea9 100644
--- a/templates/add_role_policy_permission.json.j2
+++ b/templates/add_role_policy_permission.json.j2
@@ -45,6 +45,7 @@
               "name" : "pyrest",
               "type" : "SIMPLE",
               "taskReferenceName": "add_policy",
+              "retryCount" : 1,
               "inputParameters" : {
                 "url" : "${init.input.keycloak_admin}/clients/${workflow.input.role.containerId}/authz/resource-server/policy/role",
                 "method" :"POST",
@@ -53,7 +54,6 @@
                   "Content-Type" : "application/json",
                   "Accept" : "application/json"
                 },
-                "expect" : [201, 409],
                 "body" : {
                   "name":"${workflow.input.role.name}_policy",
                   "description" : "Policy for having ${workflow.input.role.name} role",
@@ -70,6 +70,7 @@
             "name" : "pyrest",
             "type" : "SIMPLE",
             "taskReferenceName": "retrieve_default_permission",
+            "retryCount" : 1,
             "inputParameters" : {
               "url" : "${init.input.keycloak_admin}/clients/${workflow.input.role.containerId}/authz/resource-server/permission?name=Default Permission",
               "method" :"GET",
@@ -109,7 +110,7 @@
         "newpolicy": "${add_policy.output.body}",
         "evaluatorType" : "javascript",
         "prevpolicies" : "${retrieve_default_permission_policies.output.body}",
-        "expression": "Java.to(Java.from($.prevpolicies).concat($.newpolicy),'java.util.Map[]')"
+        "expression": "Java.from($.prevpolicies).concat($.newpolicy)"
       }
     },
     {