Skip to content

Commit 8ac8658

Browse files
committed
fix test
1 parent 85819c4 commit 8ac8658

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
import org.elasticsearch.search.builder.SearchSourceBuilder;
132132
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
133133
import org.elasticsearch.search.crossproject.ProjectRoutingInfo;
134+
import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
134135
import org.elasticsearch.search.crossproject.ProjectTags;
135136
import org.elasticsearch.search.crossproject.TargetProjects;
136137
import org.elasticsearch.search.internal.AliasFilter;
@@ -284,6 +285,7 @@ public class AuthorizationServiceTests extends ESTestCase {
284285
private LinkedProjectConfigService linkedProjectConfigService;
285286
private AuthorizedProjectsResolver authorizedProjectsResolver;
286287
private CrossProjectModeDecider crossProjectModeDecider;
288+
private ProjectRoutingResolver routingResolver;
287289

288290
@SuppressWarnings("unchecked")
289291
@Before
@@ -347,6 +349,7 @@ public void setup() {
347349
crossProjectModeDecider = mock(CrossProjectModeDecider.class);
348350
when(crossProjectModeDecider.crossProjectEnabled()).thenReturn(false);
349351
when(crossProjectModeDecider.resolvesCrossProject(any())).thenReturn(false);
352+
routingResolver = mock(ProjectRoutingResolver.class);
350353
authorizationService = new AuthorizationService(
351354
settings,
352355
rolesStore,
@@ -366,7 +369,8 @@ public void setup() {
366369
linkedProjectConfigService,
367370
projectResolver,
368371
authorizedProjectsResolver,
369-
crossProjectModeDecider
372+
crossProjectModeDecider,
373+
routingResolver
370374
);
371375
}
372376

@@ -1331,7 +1335,8 @@ public void testResolveIndexActionWithProjectAuthorization() {
13311335
linkedProjectConfigService,
13321336
projectResolver,
13331337
authorizedProjectsResolver,
1334-
crossProjectModeDecider
1338+
crossProjectModeDecider,
1339+
routingResolver
13351340
);
13361341

13371342
RoleDescriptor role = new RoleDescriptor(
@@ -1394,7 +1399,8 @@ public void testResolveIndexActionWithProjectAuthorizationFailure() {
13941399
linkedProjectConfigService,
13951400
projectResolver,
13961401
authorizedProjectsResolver,
1397-
crossProjectModeDecider
1402+
crossProjectModeDecider,
1403+
routingResolver
13981404
);
13991405

14001406
RoleDescriptor role = new RoleDescriptor(
@@ -1941,7 +1947,8 @@ public void testDenialForAnonymousUser() {
19411947
linkedProjectConfigService,
19421948
projectResolver,
19431949
new AuthorizedProjectsResolver.Default(),
1944-
new CrossProjectModeDecider(settings)
1950+
new CrossProjectModeDecider(settings),
1951+
routingResolver
19451952
);
19461953

19471954
RoleDescriptor role = new RoleDescriptor(
@@ -1994,7 +2001,8 @@ public void testDenialForAnonymousUserAuthorizationExceptionDisabled() {
19942001
linkedProjectConfigService,
19952002
projectResolver,
19962003
new AuthorizedProjectsResolver.Default(),
1997-
new CrossProjectModeDecider(settings)
2004+
new CrossProjectModeDecider(settings),
2005+
routingResolver
19982006
);
19992007

20002008
RoleDescriptor role = new RoleDescriptor(
@@ -3535,7 +3543,8 @@ public void testAuthorizationEngineSelectionForCheckPrivileges() throws Exceptio
35353543
linkedProjectConfigService,
35363544
projectResolver,
35373545
new AuthorizedProjectsResolver.Default(),
3538-
new CrossProjectModeDecider(Settings.EMPTY)
3546+
new CrossProjectModeDecider(Settings.EMPTY),
3547+
routingResolver
35393548
);
35403549

35413550
Subject subject = new Subject(new User("test", "a role"), mock(RealmRef.class));
@@ -3694,7 +3703,8 @@ public void getUserPrivileges(AuthorizationInfo authorizationInfo, ActionListene
36943703
linkedProjectConfigService,
36953704
projectResolver,
36963705
new AuthorizedProjectsResolver.Default(),
3697-
new CrossProjectModeDecider(Settings.EMPTY)
3706+
new CrossProjectModeDecider(Settings.EMPTY),
3707+
routingResolver
36983708
);
36993709
Authentication authentication;
37003710
try (StoredContext ignore = threadContext.stashContext()) {

0 commit comments

Comments
 (0)