Fix model search for deleting connector (#3671) (#3673)

Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit a381e10)

Co-authored-by: Daniel Widdis <[email protected]>

Author: opensearch-trigger-bot[bot]

plugin/src/main/java/org/opensearch/ml/action/connector/DeleteConnectorTransportAction.java

@@ -7,7 +7,6 @@
 
 import static org.opensearch.ml.common.CommonValue.ML_CONNECTOR_INDEX;
 import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
-import static org.opensearch.ml.common.CommonValue.TENANT_ID_FIELD;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -137,9 +136,6 @@ private void checkForModelsUsingConnector(String connectorId, String tenantId, A
     private SearchDataObjectRequest buildModelSearchRequest(String connectorId, String tenantId) {
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.query(QueryBuilders.matchQuery(MLModel.CONNECTOR_ID_FIELD, connectorId));
-        if (mlFeatureEnabledSetting.isMultiTenancyEnabled()) {
-            sourceBuilder.query(QueryBuilders.matchQuery(TENANT_ID_FIELD, tenantId));
-        }
 
         return SearchDataObjectRequest.builder().indices(ML_MODEL_INDEX).tenantId(tenantId).searchSourceBuilder(sourceBuilder).build();
     }

plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java

@@ -35,7 +35,6 @@
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.ml.common.AccessMode;
-import org.opensearch.ml.common.CommonValue;
 import org.opensearch.ml.common.MLModelGroup;
 import org.opensearch.ml.common.exception.MLResourceNotFoundException;
 import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupInput;
@@ -224,17 +223,13 @@ public void validateUniqueModelGroupName(String name, String tenantId, ActionLis
         try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
             BoolQueryBuilder query = new BoolQueryBuilder();
             query.filter(new TermQueryBuilder(MLRegisterModelGroupInput.NAME_FIELD + ".keyword", name));
-            if (tenantId != null) {
-                query.filter(new TermQueryBuilder(CommonValue.TENANT_ID_FIELD, tenantId));
-            }
 
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(query);
             SearchRequest searchRequest = new SearchRequest(ML_MODEL_GROUP_INDEX).source(searchSourceBuilder);
 
             SearchDataObjectRequest searchDataObjectRequest = SearchDataObjectRequest
                 .builder()
                 .indices(searchRequest.indices())
-                .tenantId(tenantId)
                 .searchSourceBuilder(searchRequest.source())
                 .tenantId(tenantId)
                 .build();