Get all instances

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

plugin/src/main/java/org/opensearch/ml/action/handler/MLSearchHandler.java

@@ -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;
@@ -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);

plugin/src/main/java/org/opensearch/ml/action/model_group/SearchModelGroupTransportAction.java

@@ -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;
@@ -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);