From 4563e0198607a5e1a2d9c36f5c37da5f10f4252a Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Sat, 8 Sep 2018 10:44:43 +0100 Subject: [PATCH] Workaround CMA payload issues --- .../configurations/02-privileges.json | 14 +++++ .../configurations/03-assignments.json | 58 ------------------- .../configurations/04-amps.json | 2 +- 3 files changed, 15 insertions(+), 59 deletions(-) diff --git a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/02-privileges.json b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/02-privileges.json index 77fd9206ad..402b84a558 100644 --- a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/02-privileges.json +++ b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/02-privileges.json @@ -9,71 +9,85 @@ { "privilege-name": "dba-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(dba)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "stagingWriter-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(stagingWriter)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "stagingReader-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(stagingReader)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "finalReader-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(finalReader)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "finalWriter-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(finalWriter)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "moduleExecutor-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(moduleExecutor)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "flowDeveloper-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(flowDeveloper)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "flowOperator-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(flowOperator)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "endpointDeveloper-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(endpointDeveloper)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "endpointUser-inherit", "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(endpointUser)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "flowDeveloper-edit", "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(flowDeveloper)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "flowOperator-edit", "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(flowOperator)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "endpointDeveloper-edit", "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(endpointDeveloper)", + "role": ["securityAdmin"], "kind": "execute" }, { "privilege-name": "endpointUser-edit", "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(endpointUser)", + "role": ["securityAdmin"], "kind": "execute" } ] diff --git a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/03-assignments.json b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/03-assignments.json index 00c5670413..0556d555dc 100644 --- a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/03-assignments.json +++ b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/03-assignments.json @@ -228,64 +228,6 @@ { "privilege-name": "create-data-role", "action": "http://marklogic.com/xdmp/privileges/create-data-role", "kind": "execute" - }, - { "privilege-name": "dba-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(dba)", - "kind": "execute" - }, - { "privilege-name": "stagingWriter-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(stagingWriter)", - "kind": "execute" - }, - { "privilege-name": "stagingReader-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(stagingReader)", - "kind": "execute" - }, - { "privilege-name": "finalReader-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(finalReader)", - "kind": "execute" - }, - { "privilege-name": "finalWriter-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(finalWriter)", - "kind": "execute" - }, - { "privilege-name": "moduleExecutor-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(moduleExecutor)", - "kind": "execute" - }, - - { "privilege-name": "flowDeveloper-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(flowDeveloper)", - "kind": "execute" - }, - { "privilege-name": "flowOperator-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(flowOperator)", - "kind": "execute" - }, - { "privilege-name": "endpointDeveloper-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(endpointDeveloper)", - "kind": "execute" - }, - { "privilege-name": "endpointUser-inherit", - "action": "http://marklogic.com/xdmp/privileges/role/inherit/$$role-id(endpointUser)", - "kind": "execute" - }, - - { "privilege-name": "flowDeveloper-edit", - "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(flowDeveloper)", - "kind": "execute" - }, - { "privilege-name": "flowOperator-edit", - "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(flowOperator)", - "kind": "execute" - }, - { "privilege-name": "endpointDeveloper-edit", - "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(endpointDeveloper)", - "kind": "execute" - }, - { "privilege-name": "endpointUser-edit", - "action": "http://marklogic.com/xdmp/privileges/role/edit/$$role-id(endpointUser)", - "kind": "execute" } ] } diff --git a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/04-amps.json b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/04-amps.json index a4292632fb..6be1561019 100644 --- a/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/04-amps.json +++ b/marklogic-data-hub/src/main/resources/hub-internal-config/configurations/04-amps.json @@ -1,6 +1,6 @@ { "config": { - "amps": [ + "amp": [ { "namespace": "", "local-name": "addResponseHeader",