[impala] 03/03: IMPALA-9651: Update Ranger's Impala plugin to replace use of deprecated APIs

[st...@apache.org]

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

stigahuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 9ea8b1454fabf5872459cd8ae6af60e8d89f62a5
Author: Fang-Yu Rao <fa...@cloudera.com>
AuthorDate: Mon Apr 13 13:45:01 2020 -0700

    IMPALA-9651: Update Ranger's Impala plugin to replace use of deprecated APIs
    
    RangerAuthContext#getResourceACLs() was deprecated due to a recent
    change in RANGER-2654 and the constructor
    RangerRESTClient(String, String) of the class RangerRESTClient was
    also recently deprecated in RANGER-2646. This patch replaces the
    references to these two methods with the updated APIs respectively.
    
    Testing:
    - Verified that this patch passes the exhaustive tests in the DEBUG
      build.
    
    Change-Id: Ia6dfd1107928c2c4b971e7cec48463ba34b25b3b
    Reviewed-on: http://gerrit.cloudera.org:8080/15731
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 .../authorization/ranger/RangerImpaladAuthorizationManager.java       | 4 +---
 .../java/org/apache/impala/authorization/AuthorizationTestBase.java   | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fe/src/main/java/org/apache/impala/authorization/ranger/RangerImpaladAuthorizationManager.java b/fe/src/main/java/org/apache/impala/authorization/ranger/RangerImpaladAuthorizationManager.java
index 369b232..fc1faad 100644
--- a/fe/src/main/java/org/apache/impala/authorization/ranger/RangerImpaladAuthorizationManager.java
+++ b/fe/src/main/java/org/apache/impala/authorization/ranger/RangerImpaladAuthorizationManager.java
@@ -76,11 +76,9 @@ public class RangerImpaladAuthorizationManager implements AuthorizationManager {
   private static final String ANY = "*";
 
   private final Supplier<RangerImpalaPlugin> plugin_;
-  private final Supplier<RangerAuthContext> authContext_;
 
   public RangerImpaladAuthorizationManager(Supplier<RangerImpalaPlugin> pluginSupplier) {
     plugin_ = pluginSupplier;
-    authContext_ = () -> plugin_.get().createRangerAuthContext();
   }
 
   @Override
@@ -302,7 +300,7 @@ public class RangerImpaladAuthorizationManager implements AuthorizationManager {
 
     for (RangerAccessRequest request : requests) {
       List<RangerResultRow> resultRows;
-      RangerResourceACLs acls = authContext_.get().getResourceACLs(request);
+      RangerResourceACLs acls = plugin_.get().getResourceACLs(request);
 
       switch (params.principal_type) {
         case USER:
diff --git a/fe/src/test/java/org/apache/impala/authorization/AuthorizationTestBase.java b/fe/src/test/java/org/apache/impala/authorization/AuthorizationTestBase.java
index fe15601..cbee2f9 100644
--- a/fe/src/test/java/org/apache/impala/authorization/AuthorizationTestBase.java
+++ b/fe/src/test/java/org/apache/impala/authorization/AuthorizationTestBase.java
@@ -149,7 +149,8 @@ public abstract class AuthorizationTestBase extends FrontendTestBase {
                 .getRangerImpalaPlugin();
         assertEquals("test-cluster", rangerImpalaPlugin_.getClusterName());
         sentryService_ = null;
-        rangerRestClient_ = new RangerRESTClient(RANGER_ADMIN_URL, null);
+        rangerRestClient_ = new RangerRESTClient(RANGER_ADMIN_URL, null,
+            rangerImpalaPlugin_.getConfig());
         rangerRestClient_.setBasicAuthInfo(RANGER_USER, RANGER_PASSWORD);
         break;
       default: