Skip to content

Commit 2dee725

Browse files
committed
MLE-28498 Undoing addition of xdmp-login to test app
Depends on the server no longer requiring the xdmp-login privilege for using REST extensions or transforms.
1 parent 9242bc7 commit 2dee725

11 files changed

Lines changed: 33 additions & 92 deletions

File tree

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void setUpBeforeClass() throws Exception {
9292
};
9393
addRangePathIndex(dbName, rangePaths);
9494

95-
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
95+
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
9696
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user", "manage-user");
9797
}
9898

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static void tearDownAfterClass() throws Exception {
5454
@BeforeEach
5555
public void setUp() throws Exception {
5656
// create new connection for each test below
57-
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
57+
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
5858
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader");
5959
client = newClientAsUser("eval-user", "x");
6060
}

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestJSResourceExtensions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public String deleteJSON(String docUri) {
112112

113113
@BeforeAll
114114
public static void setUpBeforeClass() throws Exception {
115-
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
115+
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke");
116116
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user");
117117
}
118118

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static void tearDownAfterClass() throws Exception {
121121
@BeforeEach
122122
public void setUp() throws Exception {
123123
createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri",
124-
"xdbc:invoke", "temporal:statement-set-system-time", "xdmp-login");
124+
"xdbc:invoke", "temporal:statement-set-system-time");
125125
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "temporal-admin");
126126

127127
adminClient = getDatabaseClient("rest-admin", "x", getConnType());

test-app/src/main/ml-config/security/roles/java-test-xdmp-login.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

test-app/src/main/ml-config/security/roles/test-rest-writer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
"action": "http://marklogic.com/xdmp/privileges/rest-tracer",
1818
"kind": "execute"
1919
},
20-
{
21-
"privilege-name": "xdmp-login",
22-
"action": "http://marklogic.com/xdmp/privileges/xdmp-login",
23-
"kind": "execute"
24-
},
2520
{
2621
"privilege-name": "xdmp:invoke",
2722
"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke",
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"user-name": "rest-admin",
3-
"description": "rest-admin user",
4-
"role": ["rest-admin", "java-test-delete-temporal", "java-test-xdmp-login"],
5-
"password": "x"
2+
"user-name": "rest-admin",
3+
"description": "rest-admin user",
4+
"role": [
5+
"rest-admin",
6+
"java-test-delete-temporal"
7+
],
8+
"password": "x"
69
}
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2-
"user-name": "rest-evaluator",
3-
"description": "Test user for the java-client-api-project",
4-
"role": ["java-test-evaluator", "java-test-xdmp-login"],
5-
"password": "x"
2+
"user-name": "rest-evaluator",
3+
"description": "Test user for the java-client-api-project",
4+
"role": [
5+
"java-test-evaluator"
6+
],
7+
"password": "x"
68
}

test-app/src/main/ml-config/security/users/rest-transform-user.json

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"user-name": "rest-writer",
3-
"description": "rest-writer user",
4-
"role": ["rest-writer", "java-test-delete-graph", "java-test-xdmp-login"],
5-
"password": "x"
2+
"user-name": "rest-writer",
3+
"description": "rest-writer user",
4+
"role": [
5+
"rest-writer",
6+
"java-test-delete-graph"
7+
],
8+
"password": "x"
69
}

0 commit comments

Comments
 (0)