Skip to content

Pass resourceType instead of resourceIndex to resourceSharingClient #4333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −6
Open

Pass resourceType instead of resourceIndex to resourceSharingClient #4333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f836ba5
Pass resourceType instead of resourceIndex to resourceSharingClient
cwperks Oct 21, 2025
30a9ebb
Get all instances
cwperks Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/action/handler/MLSearchHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE;
import static org.opensearch.ml.utils.RestActionUtils.wrapListenerToHandleSearchIndexNotFound;

import java.util.ArrayList;
Expand Down Expand Up @@ -152,7 +153,7 @@ public void search(SdkClient sdkClient, SearchRequest request, String tenantId,
if (rsClientPresent && user != null && modelAccessControlHelper.modelAccessControlEnabled() && hasModelGroupIndex) {
// RSC fast-path: get accessible group IDs → gate models (IDs or missing)
ResourceSharingClient rsc = ResourceSharingClientAccessor.getInstance().getResourceSharingClient();
rsc.getAccessibleResourceIds(CommonValue.ML_MODEL_GROUP_INDEX, ActionListener.wrap(ids -> {
rsc.getAccessibleResourceIds(ML_MODEL_GROUP_RESOURCE_TYPE, ActionListener.wrap(ids -> {
SearchSourceBuilder gated = Optional.ofNullable(request.source()).orElseGet(SearchSourceBuilder::new);
gated.query(rewriteQueryBuilderRSC(gated.query(), ids)); // ids may be empty → "missing only"
request.source(gated);
Expand Down
3 changes: 2 additions & 1 deletion ...n/src/main/java/org/opensearch/ml/action/model_group/SearchModelGroupTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import static org.opensearch.ml.action.handler.MLSearchHandler.wrapRestActionListener;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE;
import static org.opensearch.ml.utils.RestActionUtils.wrapListenerToHandleSearchIndexNotFound;

import java.util.Collections;
Expand Down Expand Up @@ -115,7 +116,7 @@ private void addAccessibleModelGroupsFilterAndSearch(
SearchSourceBuilder sourceBuilder = request.source() != null ? request.source() : new SearchSourceBuilder();
ResourceSharingClient rsc = ResourceSharingClientAccessor.getInstance().getResourceSharingClient();
// filter by accessible model-groups
rsc.getAccessibleResourceIds(ML_MODEL_GROUP_INDEX, ActionListener.wrap(ids -> {
rsc.getAccessibleResourceIds(ML_MODEL_GROUP_RESOURCE_TYPE, ActionListener.wrap(ids -> {
sourceBuilder.query(modelAccessControlHelper.mergeWithAccessFilter(sourceBuilder.query(), ids));
request.source(sourceBuilder);
search(tenantId, request, wrappedListener);
Expand Down
5 changes: 3 additions & 2 deletions plugin/src/main/java/org/opensearch/ml/helper/ModelAccessControlHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
import static org.opensearch.ml.common.CommonValue.BACKEND_ROLES_FIELD;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE;
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_MODEL_ACCESS_CONTROL_ENABLED;

import java.util.Collections;
Expand Down Expand Up @@ -100,7 +101,7 @@ public void validateModelGroupAccess(User user, String modelGroupId, String acti
}
if (ResourceSharingClientAccessor.getInstance().getResourceSharingClient() != null) {
ResourceSharingClient resourceSharingClient = ResourceSharingClientAccessor.getInstance().getResourceSharingClient();
resourceSharingClient.verifyAccess(modelGroupId, ML_MODEL_GROUP_INDEX, action, ActionListener.wrap(isAuthorized -> {
resourceSharingClient.verifyAccess(modelGroupId, ML_MODEL_GROUP_RESOURCE_TYPE, action, ActionListener.wrap(isAuthorized -> {
if (!isAuthorized) {
listener
.onFailure(
Expand Down Expand Up @@ -175,7 +176,7 @@ public void validateModelGroupAccess(
}
if (ResourceSharingClientAccessor.getInstance().getResourceSharingClient() != null) {
ResourceSharingClient resourceSharingClient = ResourceSharingClientAccessor.getInstance().getResourceSharingClient();
resourceSharingClient.verifyAccess(modelGroupId, ML_MODEL_GROUP_INDEX, action, ActionListener.wrap(isAuthorized -> {
resourceSharingClient.verifyAccess(modelGroupId, ML_MODEL_GROUP_RESOURCE_TYPE, action, ActionListener.wrap(isAuthorized -> {
if (!isAuthorized) {
listener
.onFailure(
Expand Down
5 changes: 3 additions & 2 deletions .../test/java/org/opensearch/ml/action/model_group/SearchModelGroupTransportActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE;

import java.util.Collections;
import java.util.Set;
Expand Down Expand Up @@ -279,7 +280,7 @@ public void testResourceSharingEnabled_successPath_filtersByAccessibleIds_andCal

searchModelGroupTransportAction.doExecute(null, req, actionListener);

verify(rsc).getAccessibleResourceIds(eq(CommonValue.ML_MODEL_GROUP_INDEX), rscListenerCaptor.capture());
verify(rsc).getAccessibleResourceIds(eq(ML_MODEL_GROUP_RESOURCE_TYPE), rscListenerCaptor.capture());
rscListenerCaptor.getValue().onResponse(Set.of("idA", "idB"));
future.complete(emptySearchDataObjectResponse());

Expand Down Expand Up @@ -312,7 +313,7 @@ public void testResourceSharingEnabled_failSafePath_usesEmptySet_andCallsSdkClie
searchModelGroupTransportAction.doExecute(null, req, actionListener);

// Simulate failure -> deny-all (empty set)
verify(rsc).getAccessibleResourceIds(eq(CommonValue.ML_MODEL_GROUP_INDEX), rscListenerCaptor.capture());
verify(rsc).getAccessibleResourceIds(eq(ML_MODEL_GROUP_RESOURCE_TYPE), rscListenerCaptor.capture());
rscListenerCaptor.getValue().onFailure(new RuntimeException("boom"));

future.complete(emptySearchDataObjectResponse());
Expand Down
Loading