(gravitino) branch main updated: [#5172]fix bug:Iceberg catalog audit user is not correct (#5208)

[fanng]

This is an automated email from the ASF dual-hosted git repository.

fanng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/main by this push:
     new 44a47d088 [#5172]fix bug:Iceberg catalog audit user is not correct 
(#5208)
44a47d088 is described below

commit 44a47d088504a3dbcaa95bd4f48c5ca1afd97dc6
Author: lsyulong <lsyul...@sina.com>
AuthorDate: Wed Oct 23 09:58:24 2024 +0800

    [#5172]fix bug:Iceberg catalog audit user is not correct (#5208)
    
    ### What changes were proposed in this pull request?
    
    Iceberg and JDBC catalog audit user is not correct
    
    ### Why are the changes needed?
    
    Fix: #5172
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    No need
---
 .../java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java | 4 ++--
 .../gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
 
b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
index aacd9f881..aef5ecac3 100644
--- 
a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
+++ 
b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
@@ -74,6 +74,7 @@ import 
org.apache.gravitino.rel.expressions.transforms.Transform;
 import org.apache.gravitino.rel.indexes.Index;
 import org.apache.gravitino.utils.IsolatedClassLoader;
 import org.apache.gravitino.utils.MapUtils;
+import org.apache.gravitino.utils.PrincipalUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -570,9 +571,8 @@ public class JdbcCatalogOperations implements 
CatalogOperations, SupportsSchemas
         .toArray(TableChange[]::new);
   }
 
-  // TODO. We should figure out a better way to get the current user from 
servlet container.
   private static String currentUser() {
-    return System.getProperty("user.name");
+    return PrincipalUtils.getCurrentUserName();
   }
 
   public void deregisterDriver(Driver driver) throws SQLException {
diff --git 
a/catalogs/catalog-lakehouse-iceberg/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java
 
b/catalogs/catalog-lakehouse-iceberg/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java
index bf787df0b..7b27438d2 100644
--- 
a/catalogs/catalog-lakehouse-iceberg/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java
+++ 
b/catalogs/catalog-lakehouse-iceberg/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergCatalogOperations.java
@@ -62,6 +62,7 @@ import org.apache.gravitino.rel.expressions.sorts.SortOrder;
 import org.apache.gravitino.rel.expressions.transforms.Transform;
 import org.apache.gravitino.rel.indexes.Index;
 import org.apache.gravitino.utils.MapUtils;
+import org.apache.gravitino.utils.PrincipalUtils;
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.exceptions.AlreadyExistsException;
 import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
@@ -587,8 +588,7 @@ public class IcebergCatalogOperations implements 
CatalogOperations, SupportsSche
     }
   }
 
-  // TODO. We should figure out a better way to get the current user from 
servlet container.
   private static String currentUser() {
-    return System.getProperty("user.name");
+    return PrincipalUtils.getCurrentUserName();
   }
 }