Change auth config name

apache · Dec 18, 2024 · 696a757 · 696a757
1 parent a5b7c45
commit 696a757
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
@@ -51,6 +51,7 @@ public class ControllerConf extends PinotConfiguration {
   public static final String CONTROLLER_BROKER_PROTOCOL = "controller.broker.protocol";
   public static final String CONTROLLER_BROKER_PORT_OVERRIDE = "controller.broker.port.override";
   public static final String CONTROLLER_BROKER_TLS_PREFIX = "controller.broker.tls";
+  public static final String CONTROLLER_BROKER_AUTH_PREFIX = "controller.broker.auth";
   public static final String CONTROLLER_TLS_PREFIX = "controller.tls";
   public static final String CONTROLLER_HOST = "controller.host";
   public static final String CONTROLLER_PORT = "controller.port";

diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/cursors/ResponseStoreCleaner.java b/pinot-controller/src/main/java/org/apache/pinot/controller/cursors/ResponseStoreCleaner.java
@@ -84,7 +84,7 @@ public ResponseStoreCleaner(ControllerConf config, PinotHelixResourceManager pin
     _executor = executor;
     _connectionManager = connectionManager;
     _authProvider =
-        AuthProviderUtils.extractAuthProvider(config, CommonConstants.CursorConfigs.RESPONSE_STORE_AUTH_PREFIX);
+        AuthProviderUtils.extractAuthProvider(config, ControllerConf.CONTROLLER_BROKER_AUTH_PREFIX);
   }
 
   private static long getInitialDelayInSeconds(ControllerConf config) {

diff --git a/...tests/src/test/java/org/apache/pinot/integration/tests/CursorWithAuthIntegrationTest.java b/...tests/src/test/java/org/apache/pinot/integration/tests/CursorWithAuthIntegrationTest.java
@@ -43,6 +43,7 @@
 import org.apache.pinot.common.utils.FileUploadDownloadClient;
 import org.apache.pinot.common.utils.URIUtils;
 import org.apache.pinot.common.utils.http.HttpClient;
+import org.apache.pinot.controller.ControllerConf;
 import org.apache.pinot.controller.helix.ControllerRequestClient;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -75,9 +76,9 @@ protected void overrideControllerConf(Map<String, Object> properties) {
     properties.put("controller.segment.fetcher.auth.provider.class", AUTH_PROVIDER_CLASS);
     properties.put("controller.segment.fetcher.auth.url", AUTH_URL);
     properties.put("controller.segment.fetcher.auth.prefix", AUTH_PREFIX);
-    properties.put("controller.cluster.response.store.auth.provider.class", AUTH_PROVIDER_CLASS);
-    properties.put("controller.cluster.response.store.auth.url", AUTH_URL);
-    properties.put("controller.cluster.response.store.auth.prefix", AUTH_PREFIX);
+    properties.put(ControllerConf.CONTROLLER_BROKER_AUTH_PREFIX + ".provider.class", AUTH_PROVIDER_CLASS);
+    properties.put(ControllerConf.CONTROLLER_BROKER_AUTH_PREFIX + ".url", AUTH_URL);
+    properties.put(ControllerConf.CONTROLLER_BROKER_AUTH_PREFIX + ".prefix", AUTH_PREFIX);
     properties.put(CommonConstants.CursorConfigs.RESPONSE_STORE_CLEANER_FREQUENCY_PERIOD, "5m");
   }
 

diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
@@ -1338,6 +1338,5 @@ public static class CursorConfigs {
     public static final String DEFAULT_RESPONSE_STORE_CLEANER_FREQUENCY_PERIOD = "1h";
     public static final String RESPONSE_STORE_CLEANER_INITIAL_DELAY =
         "controller.cluster.response.store.cleaner.initialDelay";
-    public static final String RESPONSE_STORE_AUTH_PREFIX = "controller.cluster.response.store.auth";
   }
 }