This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new f5dde640e75 fix msq compaction to apply policies (#18741)
f5dde640e75 is described below
commit f5dde640e75dc3e1996f547b032539de85b25a69
Author: Clint Wylie <[email protected]>
AuthorDate: Mon Nov 17 16:22:31 2025 -0800
fix msq compaction to apply policies (#18741)
---
.../embedded/compact/CompactionSupervisorTest.java | 57 +++++++++++++++++++---
.../http/OverlordCompactionResourceTest.java | 2 +-
.../druid/msq/indexing/MSQCompactionRunner.java | 40 +++++++++++++--
.../msq/indexing/MSQCompactionRunnerTest.java | 24 ++++-----
.../druid/guice/security/AuthorizerModule.java | 25 +++++-----
.../initialization/AuthorizerMapperModule.java | 2 +-
.../druid/server/security/AllowAllAuthorizer.java | 25 ++++++++++
.../druid/server/security/AuthTestUtils.java | 2 +-
.../druid/server/security/AuthorizationUtils.java | 10 ++--
.../AsyncManagementForwardingServletTest.java | 2 +-
.../server/security/AuthorizationUtilsTest.java | 2 +-
.../server/AsyncQueryForwardingServletTest.java | 2 +-
12 files changed, 149 insertions(+), 44 deletions(-)
diff --git
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/compact/CompactionSupervisorTest.java
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/compact/CompactionSupervisorTest.java
index e11563c0389..9019a0cb5ec 100644
---
a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/compact/CompactionSupervisorTest.java
+++
b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/compact/CompactionSupervisorTest.java
@@ -22,6 +22,8 @@ package org.apache.druid.testing.embedded.compact;
import org.apache.druid.catalog.guice.CatalogClientModule;
import org.apache.druid.catalog.guice.CatalogCoordinatorModule;
import org.apache.druid.common.utils.IdUtils;
+import org.apache.druid.indexer.CompactionEngine;
+import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec;
import org.apache.druid.indexing.common.task.IndexTask;
import org.apache.druid.indexing.compact.CompactionSupervisorSpec;
import org.apache.druid.indexing.overlord.Segments;
@@ -38,6 +40,7 @@ import
org.apache.druid.server.coordinator.ClusterCompactionConfig;
import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
import
org.apache.druid.server.coordinator.InlineSchemaDataSourceCompactionConfig;
import org.apache.druid.server.coordinator.UserCompactionTaskGranularityConfig;
+import org.apache.druid.server.coordinator.UserCompactionTaskQueryTuningConfig;
import org.apache.druid.testing.embedded.EmbeddedBroker;
import org.apache.druid.testing.embedded.EmbeddedCoordinator;
import org.apache.druid.testing.embedded.EmbeddedDruidCluster;
@@ -51,9 +54,10 @@ import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.joda.time.Period;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import java.util.List;
import java.util.Map;
/**
@@ -78,6 +82,14 @@ public class CompactionSupervisorTest extends
EmbeddedClusterTestBase
return EmbeddedDruidCluster.withEmbeddedDerbyAndZookeeper()
.useLatchableEmitter()
.useDefaultTimeoutForLatchableEmitter(600)
+ .addCommonProperty("druid.auth.authorizers",
"[\"allowAll\"]")
+
.addCommonProperty("druid.auth.authorizer.allowAll.type", "allowAll")
+
.addCommonProperty("druid.auth.authorizer.allowAll.policy.type",
"noRestriction")
+ .addCommonProperty(
+ "druid.policy.enforcer.allowedPolicies",
+
"[\"org.apache.druid.query.policy.NoRestrictionPolicy\"]"
+ )
+
.addCommonProperty("druid.policy.enforcer.type", "restrictAllTables")
.addExtensions(
CatalogClientModule.class,
CatalogCoordinatorModule.class,
@@ -95,18 +107,21 @@ public class CompactionSupervisorTest extends
EmbeddedClusterTestBase
.addServer(new EmbeddedRouter());
}
- @BeforeAll
- public void enableCompactionSupervisors()
+
+ private void configureCompaction(CompactionEngine compactionEngine)
{
final UpdateResponse updateResponse = cluster.callApi().onLeaderOverlord(
- o -> o.updateClusterCompactionConfig(new ClusterCompactionConfig(1.0,
100, null, true, null))
+ o -> o.updateClusterCompactionConfig(new ClusterCompactionConfig(1.0,
100, null, true, compactionEngine))
);
Assertions.assertTrue(updateResponse.isSuccess());
}
- @Test
- public void
test_ingestDayGranularity_andCompactToMonthGranularity_withInlineConfig()
+ @MethodSource("getEngine")
+ @ParameterizedTest(name = "compactionEngine={0}")
+ public void
test_ingestDayGranularity_andCompactToMonthGranularity_withInlineConfig(CompactionEngine
compactionEngine)
{
+ configureCompaction(compactionEngine);
+
// Ingest data at DAY granularity and verify
runIngestionAtGranularity(
"DAY",
@@ -125,6 +140,29 @@ public class CompactionSupervisorTest extends
EmbeddedClusterTestBase
.withGranularitySpec(
new UserCompactionTaskGranularityConfig(Granularities.MONTH,
null, null)
)
+ .withTuningConfig(
+ new UserCompactionTaskQueryTuningConfig(
+ null,
+ null,
+ null,
+ null,
+ null,
+ new DimensionRangePartitionsSpec(null, 5000,
List.of("item"), false),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null
+ )
+ )
.build();
runCompactionWithSpec(compactionConfig);
@@ -192,4 +230,9 @@ public class CompactionSupervisorTest extends
EmbeddedClusterTestBase
.withId(IdUtils.getRandomId());
cluster.callApi().runTask(task, overlord);
}
+
+ public static List<CompactionEngine> getEngine()
+ {
+ return List.of(CompactionEngine.NATIVE, CompactionEngine.MSQ);
+ }
}
diff --git
a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordCompactionResourceTest.java
b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordCompactionResourceTest.java
index fc20739af15..a54459ad889 100644
---
a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordCompactionResourceTest.java
+++
b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordCompactionResourceTest.java
@@ -99,7 +99,7 @@ public class OverlordCompactionResourceTest
httpRequest = EasyMock.createStrictMock(HttpServletRequest.class);
authorizerMapper = EasyMock.createStrictMock(AuthorizerMapper.class);
- EasyMock.expect(authorizerMapper.getAuthorizer("druid")).andReturn(new
AllowAllAuthorizer()).anyTimes();
+ EasyMock.expect(authorizerMapper.getAuthorizer("druid")).andReturn(new
AllowAllAuthorizer(null)).anyTimes();
taskMaster = EasyMock.createStrictMock(TaskMaster.class);
EasyMock.expect(taskMaster.getSupervisorManager()).andReturn(Optional.of(supervisorManager)).anyTimes();
diff --git
a/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
index a4adb11ccc6..745b86cdd16 100644
---
a/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
+++
b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
@@ -47,6 +47,7 @@ import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.math.expr.ExprMacroTable;
import org.apache.druid.msq.indexing.destination.DataSourceMSQDestination;
import org.apache.druid.msq.util.MultiStageQueryContext;
+import org.apache.druid.query.DataSource;
import org.apache.druid.query.Druids;
import org.apache.druid.query.Order;
import org.apache.druid.query.OrderBy;
@@ -63,6 +64,7 @@ import org.apache.druid.query.filter.DimFilter;
import org.apache.druid.query.groupby.GroupByQuery;
import org.apache.druid.query.groupby.GroupByQueryConfig;
import org.apache.druid.query.groupby.orderby.OrderByColumnSpec;
+import org.apache.druid.query.policy.PolicyEnforcer;
import org.apache.druid.query.spec.MultipleIntervalSegmentSpec;
import org.apache.druid.segment.VirtualColumn;
import org.apache.druid.segment.VirtualColumns;
@@ -73,6 +75,14 @@ import org.apache.druid.segment.indexing.CombinedDataSchema;
import org.apache.druid.segment.indexing.DataSchema;
import org.apache.druid.segment.virtual.ExpressionVirtualColumn;
import org.apache.druid.server.coordinator.CompactionConfigValidationResult;
+import org.apache.druid.server.security.Action;
+import org.apache.druid.server.security.AuthorizationResult;
+import org.apache.druid.server.security.AuthorizationUtils;
+import org.apache.druid.server.security.AuthorizerMapper;
+import org.apache.druid.server.security.Escalator;
+import org.apache.druid.server.security.Resource;
+import org.apache.druid.server.security.ResourceAction;
+import org.apache.druid.server.security.ResourceType;
import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
import org.apache.druid.sql.calcite.planner.ColumnMapping;
import org.apache.druid.sql.calcite.planner.ColumnMappings;
@@ -262,7 +272,9 @@ public class MSQCompactionRunner implements CompactionRunner
} else {
query = buildScanQuery(compactionTask, interval, dataSchema,
inputColToVirtualCol);
}
+
QueryContext compactionTaskContext = new
QueryContext(compactionTask.getContext());
+
DataSourceMSQDestination destination =
buildMSQDestination(compactionTask, dataSchema);
boolean isReindex =
MSQControllerTask.isReplaceInputDataSourceTask(query, destination);
@@ -370,6 +382,28 @@ public class MSQCompactionRunner implements
CompactionRunner
return rowSignatureBuilder.build();
}
+ /**
+ * Creates a {@link DataSource} and uses 'system' {@link
AuthorizationResult} using an {@link Escalator} and
+ * {@link AuthorizerMapper} and applies any resulting {@link
org.apache.druid.query.policy.Policy} to it using
+ * {@link DataSource#withPolicies(Map, PolicyEnforcer)}
+ */
+ private DataSource getInputDataSource(String name)
+ {
+ TableDataSource dataSource = new TableDataSource(name);
+ final Escalator escalator = injector.getInstance(Escalator.class);
+ if (escalator != null) {
+ final AuthorizerMapper authorizerMapper =
injector.getInstance(AuthorizerMapper.class);
+ final PolicyEnforcer policyEnforcer =
injector.getInstance(PolicyEnforcer.class);
+ final AuthorizationResult authResult =
AuthorizationUtils.authorizeAllResourceActions(
+ escalator.createEscalatedAuthenticationResult(),
+ List.of(new ResourceAction(new Resource(name,
ResourceType.DATASOURCE), Action.READ)),
+ authorizerMapper
+ );
+ return dataSource.withPolicies(authResult.getPolicyMap(),
policyEnforcer);
+ }
+ return dataSource;
+ }
+
private static List<DimensionSpec> getAggregateDimensions(
DataSchema dataSchema,
Map<String, VirtualColumn> inputColToVirtualCol
@@ -457,7 +491,7 @@ public class MSQCompactionRunner implements CompactionRunner
return queryContext;
}
- private static Query<?> buildScanQuery(
+ private Query<?> buildScanQuery(
CompactionTask compactionTask,
Interval interval,
DataSchema dataSchema,
@@ -467,7 +501,7 @@ public class MSQCompactionRunner implements CompactionRunner
RowSignature rowSignature = getRowSignature(dataSchema);
VirtualColumns virtualColumns = VirtualColumns.create(new
ArrayList<>(inputColToVirtualCol.values()));
Druids.ScanQueryBuilder scanQueryBuilder = new Druids.ScanQueryBuilder()
- .dataSource(dataSchema.getDataSource())
+ .dataSource(getInputDataSource(dataSchema.getDataSource()))
.columns(rowSignature.getColumnNames())
.virtualColumns(virtualColumns)
.columnTypes(rowSignature.getColumnTypes())
@@ -618,7 +652,7 @@ public class MSQCompactionRunner implements CompactionRunner
.collect(Collectors.toList());
GroupByQuery.Builder builder = new GroupByQuery.Builder()
- .setDataSource(new TableDataSource(compactionTask.getDataSource()))
+ .setDataSource(getInputDataSource(compactionTask.getDataSource()))
.setVirtualColumns(virtualColumns)
.setDimFilter(dimFilter)
.setGranularity(new AllGranularity())
diff --git
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
index ef417a8b838..c9bf384569d 100644
---
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
+++
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
@@ -32,6 +32,9 @@ import org.apache.druid.data.input.impl.DimensionsSpec;
import org.apache.druid.data.input.impl.LongDimensionSchema;
import org.apache.druid.data.input.impl.StringDimensionSchema;
import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.guice.StartupInjectorBuilder;
+import org.apache.druid.guice.security.EscalatorModule;
+import org.apache.druid.guice.security.PolicyModule;
import org.apache.druid.indexer.TaskStatus;
import org.apache.druid.indexer.granularity.UniformGranularitySpec;
import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec;
@@ -41,6 +44,7 @@ import org.apache.druid.indexer.partitions.PartitionsSpec;
import org.apache.druid.indexing.common.task.CompactionIntervalSpec;
import org.apache.druid.indexing.common.task.CompactionTask;
import org.apache.druid.indexing.common.task.TuningConfigBuilder;
+import org.apache.druid.initialization.CoreInjectorBuilder;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.StringUtils;
@@ -74,6 +78,7 @@ import org.apache.druid.segment.indexing.DataSchema;
import org.apache.druid.segment.transform.CompactionTransformSpec;
import org.apache.druid.segment.transform.TransformSpec;
import org.apache.druid.server.coordinator.CompactionConfigValidationResult;
+import org.apache.druid.server.initialization.AuthorizerMapperModule;
import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
import org.joda.time.Interval;
import org.junit.Assert;
@@ -143,19 +148,6 @@ public class MSQCompactionRunnerTest
ImmutableSet.of(MV_STRING_DIMENSION.getName())
)
);
- private static final Map<Interval, DataSchema>
INTERVAL_DATASCHEMAS_WITH_PROJECTION = ImmutableMap.of(
- COMPACTION_INTERVAL,
- new CombinedDataSchema(
- DATA_SOURCE,
- new TimestampSpec(TIMESTAMP_COLUMN, null, null),
- new DimensionsSpec(DIMENSIONS),
- null,
- null,
- null,
- ImmutableList.of(PROJECTION_SPEC),
- ImmutableSet.of(MV_STRING_DIMENSION.getName())
- )
- );
private static final ObjectMapper JSON_MAPPER = new DefaultObjectMapper();
private static final AggregatorFactory AGG1 = new
CountAggregatorFactory("agg_0");
private static final AggregatorFactory AGG2 = new
LongSumAggregatorFactory("sum_added", "sum_added");
@@ -163,7 +155,11 @@ public class MSQCompactionRunnerTest
private static final MSQCompactionRunner MSQ_COMPACTION_RUNNER = new
MSQCompactionRunner(
JSON_MAPPER,
TestExprMacroTable.INSTANCE,
- null
+ new CoreInjectorBuilder(new
StartupInjectorBuilder().forTests().build()).addModules(
+ new EscalatorModule(),
+ new AuthorizerMapperModule(),
+ new PolicyModule()
+ ).build()
);
private static final List<String> PARTITION_DIMENSIONS =
Collections.singletonList(STRING_DIMENSION.getName());
diff --git
a/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java
b/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java
index 95ac8fcf5c3..eccfb23b99d 100644
--- a/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java
+++ b/server/src/main/java/org/apache/druid/guice/security/AuthorizerModule.java
@@ -19,34 +19,37 @@
package org.apache.druid.guice.security;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.Module;
import com.google.inject.Provides;
-import com.google.inject.multibindings.MapBinder;
import com.google.inject.name.Named;
-import org.apache.druid.guice.LazySingleton;
-import org.apache.druid.guice.PolyBind;
+import org.apache.druid.initialization.DruidModule;
import org.apache.druid.server.security.AllowAllAuthorizer;
import org.apache.druid.server.security.AuthConfig;
import org.apache.druid.server.security.Authorizer;
-public class AuthorizerModule implements Module
+import java.util.List;
+
+public class AuthorizerModule implements DruidModule
{
@Override
public void configure(Binder binder)
{
- final MapBinder<String, Authorizer> authorizerMapBinder =
PolyBind.optionBinder(
- binder,
- Key.get(Authorizer.class)
+ }
+
+ @Override
+ public List<? extends Module> getJacksonModules()
+ {
+ return List.of(
+ new SimpleModule().registerSubtypes(AllowAllAuthorizer.class)
);
-
authorizerMapBinder.addBinding(AuthConfig.ALLOW_ALL_NAME).to(AllowAllAuthorizer.class).in(LazySingleton.class);
}
@Provides
@Named(AuthConfig.ALLOW_ALL_NAME)
public Authorizer getAuthorizer()
{
- return new AllowAllAuthorizer();
+ return new AllowAllAuthorizer(null);
}
}
diff --git
a/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java
b/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java
index 3d3507b0c36..9e35b32d8f1 100644
---
a/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java
+++
b/server/src/main/java/org/apache/druid/server/initialization/AuthorizerMapperModule.java
@@ -85,7 +85,7 @@ public class AuthorizerMapperModule implements DruidModule
// Default is allow all
if (authorizers == null) {
- AllowAllAuthorizer allowAllAuthorizer = new AllowAllAuthorizer();
+ AllowAllAuthorizer allowAllAuthorizer = new AllowAllAuthorizer(null);
authorizerMap.put(AuthConfig.ALLOW_ALL_NAME, allowAllAuthorizer);
return new AuthorizerMapper(null)
diff --git
a/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java
b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java
index 6271228b33d..34f8fabda67 100644
---
a/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java
+++
b/server/src/main/java/org/apache/druid/server/security/AllowAllAuthorizer.java
@@ -19,11 +19,36 @@
package org.apache.druid.server.security;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.druid.query.policy.Policy;
+
+import javax.annotation.Nullable;
+
public class AllowAllAuthorizer implements Authorizer
{
+ @Nullable
+ private final Policy policy;
+
+ @JsonCreator
+ public AllowAllAuthorizer(
+ @JsonProperty("policy") @Nullable Policy policy
+ )
+ {
+ this.policy = policy;
+ }
+
@Override
public Access authorize(AuthenticationResult authenticationResult, Resource
resource, Action action)
{
+ if (shouldApplyPolicy(resource, action)) {
+ return Access.allowWithRestriction(policy);
+ }
return Access.OK;
}
+
+ private boolean shouldApplyPolicy(Resource resource, Action action)
+ {
+ return policy != null && AuthorizationUtils.shouldApplyPolicy(resource,
action);
+ }
}
diff --git
a/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java
b/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java
index 5922a5d234c..5ba4b6fb47b 100644
--- a/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java
+++ b/server/src/main/java/org/apache/druid/server/security/AuthTestUtils.java
@@ -36,7 +36,7 @@ public class AuthTestUtils
@Override
public Authorizer getAuthorizer(String name)
{
- return new AllowAllAuthorizer();
+ return new AllowAllAuthorizer(null);
}
};
}
diff --git
a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
index 2bdd0d586b7..cb142ef5c06 100644
---
a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
+++
b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
@@ -46,7 +46,7 @@ import java.util.Set;
*/
public class AuthorizationUtils
{
- static final ImmutableSet<String> RESTRICTION_APPLICABLE_RESOURCE_TYPES =
ImmutableSet.of(
+ public static final ImmutableSet<String>
RESTRICTION_APPLICABLE_RESOURCE_TYPES = ImmutableSet.of(
ResourceType.DATASOURCE
);
@@ -204,8 +204,7 @@ public class AuthorizationUtils
return AuthorizationResult.deny(access.getMessage());
} else {
resultCache.add(resourceAction);
- if (resourceAction.getAction().equals(Action.READ)
- &&
RESTRICTION_APPLICABLE_RESOURCE_TYPES.contains(resourceAction.getResource().getType()))
{
+ if (shouldApplyPolicy(resourceAction.getResource(),
resourceAction.getAction())) {
// For every table read, we check on the policy returned from
authorizer and add it to the map.
policyFilters.put(resourceAction.getResource().getName(),
access.getPolicy());
} else if (access.getPolicy().isPresent()) {
@@ -222,6 +221,11 @@ public class AuthorizationUtils
return AuthorizationResult.allowWithRestriction(policyFilters);
}
+ public static boolean shouldApplyPolicy(Resource resource, Action action)
+ {
+ return Action.READ.equals(action) ||
RESTRICTION_APPLICABLE_RESOURCE_TYPES.contains(resource.getType());
+ }
+
/**
* Performs authorization check on a list of resource-actions based on the
authentication fields from the request.
diff --git
a/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java
b/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java
index c576f966cf6..5b414d6f3cb 100644
---
a/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java
+++
b/server/src/test/java/org/apache/druid/server/AsyncManagementForwardingServletTest.java
@@ -518,7 +518,7 @@ public class AsyncManagementForwardingServletTest extends
BaseJettyTest
injector.getInstance(DruidHttpClientConfig.class),
coordinatorLeaderSelector,
overlordLeaderSelector,
- new AuthorizerMapper(ImmutableMap.of("allowAll", new
AllowAllAuthorizer()))
+ new AuthorizerMapper(ImmutableMap.of("allowAll", new
AllowAllAuthorizer(null)))
)
);
diff --git
a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
index 2d61ba586a7..fd07ae17053 100644
---
a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
+++
b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
@@ -66,7 +66,7 @@ public class AuthorizationUtilsTest
};
Map<String, Authorizer> authorizerMap = new HashMap<>();
- authorizerMap.put(authorizerName, new AllowAllAuthorizer());
+ authorizerMap.put(authorizerName, new AllowAllAuthorizer(null));
AuthorizerMapper mapper = new AuthorizerMapper(authorizerMap);
diff --git
a/services/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java
b/services/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java
index 372ad96174c..24416859ea2 100644
---
a/services/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java
+++
b/services/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java
@@ -170,7 +170,7 @@ public class AsyncQueryForwardingServletTest extends
BaseJettyTest
@Override
public Authorizer getAuthorizer(String name)
{
- return new AllowAllAuthorizer();
+ return new AllowAllAuthorizer(null);
}
}
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
