RevokeRolePrivilegeParam support dbName parameter (#1234)

Signed-off-by: lentitude2tk <[email protected]>
milvus-io · Dec 16, 2024 · 9b60b20 · 9b60b20
1 parent f29741b
commit 9b60b20
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/sdk-core/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java b/sdk-core/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java
@@ -2557,15 +2557,19 @@ public R<RpcStatus> revokeRolePrivilege(RevokeRolePrivilegeParam requestParam) {
         String title = String.format("RevokeRolePrivilegeRequest roleName:%s", requestParam.getRoleName());
 
         try {
+            GrantEntity.Builder builder = GrantEntity.newBuilder()
+                    .setRole(RoleEntity.newBuilder().setName(requestParam.getRoleName()).build())
+                    .setObjectName(requestParam.getObjectName())
+                    .setObject(ObjectEntity.newBuilder().setName(requestParam.getObject()).build())
+                    .setGrantor(GrantorEntity.newBuilder()
+                            .setPrivilege(PrivilegeEntity.newBuilder().setName(requestParam.getPrivilege()).build()).build());
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
+
             OperatePrivilegeRequest request = OperatePrivilegeRequest.newBuilder()
                     .setType(OperatePrivilegeType.Revoke)
-                    .setEntity(GrantEntity.newBuilder()
-                            .setRole(RoleEntity.newBuilder().setName(requestParam.getRoleName()).build())
-                            .setObjectName(requestParam.getObjectName())
-                            .setObject(ObjectEntity.newBuilder().setName(requestParam.getObject()).build())
-                            .setGrantor(GrantorEntity.newBuilder()
-                                    .setPrivilege(PrivilegeEntity.newBuilder().setName(requestParam.getPrivilege()).build()).build())
-                            .build())
+                    .setEntity(builder.build())
                     .build();
 
             Status response = blockingStub().operatePrivilege(request);

diff --git a/sdk-core/src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java b/sdk-core/src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java
@@ -37,11 +37,14 @@ public class RevokeRolePrivilegeParam {
 
     private final String privilege;
 
+    private final String databaseName;
+
     private RevokeRolePrivilegeParam(@NonNull RevokeRolePrivilegeParam.Builder builder) {
         this.roleName = builder.roleName;
         this.object = builder.object;
         this.objectName = builder.objectName;
         this.privilege = builder.privilege;
+        this.databaseName = builder.databaseName;
     }
 
     public static RevokeRolePrivilegeParam.Builder newBuilder() {
@@ -56,11 +59,23 @@ public static final class Builder {
         private String object;
         private String objectName;
         private String privilege;
+        private String databaseName;
 
 
         private Builder() {
         }
 
+        /**
+         * Sets the databaseName. databaseName cannot be null.
+         *
+         * @param databaseName databaseName
+         * @return <code>Builder</code>
+         */
+        public RevokeRolePrivilegeParam.Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
          * Sets the roleName. RoleName cannot be empty or null.
          *