Fix model search for deleting connector

dbwiddis · dbwiddis · commit f960401f579b · 2025-03-18T17:48:14.000-07:00
Signed-off-by: Daniel Widdis &lt;widdis@gmail.com&gt;
diff --git a/plugin/src/main/java/org/opensearch/ml/action/connector/DeleteConnectorTransportAction.java b/plugin/src/main/java/org/opensearch/ml/action/connector/DeleteConnectorTransportAction.java
@@ -137,9 +137,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();
     }

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,6 @@ private void checkForModelsUsingConnector(String connectorId, String tenantId, A`
`137`	`137`	`private SearchDataObjectRequest buildModelSearchRequest(String connectorId, String tenantId) {`
`138`	`138`	`SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();`
`139`	`139`	`sourceBuilder.query(QueryBuilders.matchQuery(MLModel.CONNECTOR_ID_FIELD, connectorId));`
`140`		`- if (mlFeatureEnabledSetting.isMultiTenancyEnabled()) {`
`141`		`- sourceBuilder.query(QueryBuilders.matchQuery(TENANT_ID_FIELD, tenantId));`
`142`		`- }`
`143`	`140`
`144`	`141`	`return SearchDataObjectRequest.builder().indices(ML_MODEL_INDEX).tenantId(tenantId).searchSourceBuilder(sourceBuilder).build();`
`145`	`142`	`}`