Fix the db prefix not being removed from request parameters in method…

… refresh_privileges (ExpediaGroup#312) * fix refresh_privileges * add unit test and use old function
flaming-archer · Apr 12, 2024 · 0dde4c2 · 0dde4c2
1 parent d7df48a
commit 0dde4c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java
@@ -1350,7 +1350,7 @@ public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef hiveObjectR
       }
     }
     return databaseMapping.getClient().refresh_privileges(databaseMapping.transformInboundHiveObjectRef(hiveObjectRef),
-            authorizer, grantRevokePrivilegeRequest);
+            authorizer, databaseMapping.transformInboundGrantRevokePrivilegesRequest(grantRevokePrivilegeRequest));
   }
 
   private DatabaseMapping checkWritePermissionsForPrivileges(PrivilegeBag privileges) throws NoSuchObjectException {

diff --git a/...e-dance-core/src/test/java/com/hotels/bdp/waggledance/server/FederatedHMSHandlerTest.java b/...e-dance-core/src/test/java/com/hotels/bdp/waggledance/server/FederatedHMSHandlerTest.java
@@ -120,6 +120,7 @@
 import org.apache.hadoop.hive.metastore.api.HeartbeatTxnRangeResponse;
 import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
 import org.apache.hadoop.hive.metastore.api.HiveObjectRef;
+import org.apache.hadoop.hive.metastore.api.HiveObjectType;
 import org.apache.hadoop.hive.metastore.api.ISchema;
 import org.apache.hadoop.hive.metastore.api.ISchemaName;
 import org.apache.hadoop.hive.metastore.api.LockComponent;
@@ -2003,9 +2004,21 @@ public void refresh_privileges() throws TException {
     GrantRevokePrivilegeRequest grantRevokePrivilegeRequest = new GrantRevokePrivilegeRequest();
     HiveObjectRef hiveObjectRef = new HiveObjectRef();
     hiveObjectRef.setDbName(DB_P);
+    PrivilegeBag privileges = new PrivilegeBag();
+    List<HiveObjectPrivilege> privilegesList = new ArrayList<>();
+    HiveObjectPrivilege hiveObjectPrivilege = new HiveObjectPrivilege();
+    HiveObjectRef hor = new HiveObjectRef();
+    hor.setDbName(DB_P);
+    hor.setObjectType(HiveObjectType.DATABASE);
+    hor.setObjectName(DB_P);
+    hiveObjectPrivilege.setHiveObject(hor);
+    privilegesList.add(hiveObjectPrivilege);
+    privileges.setPrivileges(privilegesList);
+    grantRevokePrivilegeRequest.setPrivileges(privileges);
     GrantRevokePrivilegeResponse grantRevokePrivilegeResponse = new GrantRevokePrivilegeResponse();
 
     when(primaryMapping.transformInboundHiveObjectRef(hiveObjectRef)).thenReturn(hiveObjectRef);
+    when(primaryMapping.transformInboundGrantRevokePrivilegesRequest(grantRevokePrivilegeRequest)).thenReturn(grantRevokePrivilegeRequest);
     when(primaryClient.refresh_privileges(hiveObjectRef, "dummy", grantRevokePrivilegeRequest)).thenReturn(grantRevokePrivilegeResponse);
     GrantRevokePrivilegeResponse result = handler.refresh_privileges(hiveObjectRef, "dummy", grantRevokePrivilegeRequest);
     assertThat(result, is(grantRevokePrivilegeResponse));