diff --git a/defaults/main.yaml b/defaults/main.yaml index a5cf1b1..c598883 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,19 +1,19 @@ --- workflows: -# - create-user-add-to-vre -# - group_deleted -# - user-group_created -# - user-group-role_created -# - group_created -# - invitation-accepted -# - user-group_deleted -# - user-group-role_deleted -# - delete-user-account -# - role_deleted -# - role_created -# - add_role_policy_permission -# - add_all_member_roles -# - create_system_service + - create-user-add-to-vre + - group_deleted + - user-group_created + - user-group-role_created + - group_created + - invitation-accepted + - user-group_deleted + - user-group-role_deleted + - delete-user-account + - role_deleted + - role_created + - add_role_policy_permission + - add_all_member_roles + - create_system_service - add_all_system_services_to_vre keycloak_host: "https://accounts.dev.d4science.org/auth" keycloak: "{{ keycloak_host }}/realms" diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2 index 4f9d162..76405c5 100644 --- a/templates/group_created.json.j2 +++ b/templates/group_created.json.j2 @@ -435,15 +435,15 @@ ] }, { - "name": "LAMBDA_TASK", - "taskReferenceName": "policy_list", - "type": "LAMBDA", - "inputParameters": { - "memberpolicy" : "${create_role_policy_member.output.body.id}", - "otherpolicies" : "${join_parallel_policy_addition.output[*].body.id}", - "scriptExpression": "return Java.to(Java.from($.otherpolicies).concat($.memberpolicy), 'java.lang.String[]')" - } - }, + "name": "LAMBDA_TASK", + "taskReferenceName": "policy_list", + "type": "LAMBDA", + "inputParameters": { + "memberpolicy" : "${create_role_policy_member.output.body.id}", + "otherpolicies" : "${join_parallel_policy_addition.output[*].body.id}", + "scriptExpression": "return Java.to(Java.from($.otherpolicies).concat($.memberpolicy), 'java.lang.String[]')" + } + }, { "name" : "pyrest", "taskReferenceName" : "finalize_permission", @@ -464,6 +464,17 @@ "Content-Type" : "application/json" } } + }, + { + "name": "sub_workflow_task", + "taskReferenceName": "call_add_all_system_services_to_new_vre", + "type": "SUB_WORKFLOW", + "inputParameters": { + "client_resource_id": "${extract_client_id.output.result.client_id}" + }, + "subWorkflowParam": { + "name": "add_all_system_services_to_vre" + } } ] }