Skip to content

Commit 8bb2bf8

Browse files
committed
Refactor MCP permissions
1 parent cc08f2f commit 8bb2bf8

5 files changed

Lines changed: 17 additions & 7 deletions

File tree

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
WEAVIATE_VERSION:
95-
["1.32.24", "1.33.11", "1.34.7", "1.35.2", "1.36.9", "1.37.0-rc.0"]
95+
["1.32.24", "1.33.11", "1.34.7", "1.35.2", "1.36.9", "1.37.1"]
9696
steps:
9797
- uses: actions/checkout@v4
9898

src/it/java/io/weaviate/containers/Weaviate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public enum Version {
4545
V134(1, 34, 7),
4646
V135(1, 35, 2),
4747
V136(1, 36, 9),
48-
V137(1, 37, "0-rc.1");
48+
V137(1, 37, 1);
4949

5050
public final SemanticVersion semver;
5151

src/it/java/io/weaviate/integration/RbacITest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ public void test_roles_Lifecycle() throws IOException {
8585
Permission.groups("my-group", GroupType.OIDC, GroupsPermission.Action.READ));
8686
});
8787
requireAtLeast(Weaviate.Version.V137, () -> {
88-
permissions.add(Permission.mcp(McpPermission.Action.MANAGE));
88+
permissions.add(Permission.mcp(McpPermission.Action.CREATE));
89+
permissions.add(Permission.mcp(McpPermission.Action.READ));
90+
permissions.add(Permission.mcp(McpPermission.Action.UPDATE));
8991
});
9092

9193
// Act: create role

src/main/java/io/weaviate/client6/v1/api/rbac/McpPermission.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@ public Object self() {
2323
}
2424

2525
public enum Action implements RbacAction<Action> {
26-
@SerializedName("manage_mcp")
27-
MANAGE("manage_mcp");
26+
@SerializedName("create_mcp")
27+
CREATE("create_mcp"),
28+
29+
@SerializedName("read_mcp")
30+
READ("read_mcp"),
31+
32+
@SerializedName("update_mcp")
33+
UPDATE("update_mcp");
2834

2935
private final String jsonValue;
3036

src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,12 +1480,14 @@ public static Object[][] testCases() {
14801480
"rock-n-role",
14811481
List.of(
14821482
new McpPermission(
1483-
List.of(McpPermission.Action.MANAGE)))),
1483+
List.of(McpPermission.Action.CREATE, McpPermission.Action.READ, McpPermission.Action.UPDATE)))),
14841484
"""
14851485
{
14861486
"name": "rock-n-role",
14871487
"permissions": [
1488-
{ "action": "manage_mcp" }
1488+
{ "action": "create_mcp" },
1489+
{ "action": "read_mcp" },
1490+
{ "action": "update_mcp" }
14891491
]
14901492
}
14911493
"""

0 commit comments

Comments
 (0)