Do not allow project_routing as query param

Author: pawankartik-elastic

server/src/main/java/org/elasticsearch/action/search/RestOpenPointInTimeAction.java

@@ -55,7 +55,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         final OpenPointInTimeRequest openRequest = new OpenPointInTimeRequest(indices);
         final boolean crossProjectEnabled = crossProjectModeDecider.crossProjectEnabled();
         if (crossProjectEnabled) {
-            openRequest.projectRouting(request.param("project_routing", null));
             openRequest.indicesOptions(IndicesOptions.fromRequest(request, OpenPointInTimeRequest.DEFAULT_CPS_INDICES_OPTIONS));
         } else {
             openRequest.indicesOptions(IndicesOptions.fromRequest(request, OpenPointInTimeRequest.DEFAULT_INDICES_OPTIONS));

server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java

@@ -62,7 +62,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
         final boolean crossProjectEnabled = crossProjectModeDecider.crossProjectEnabled();
         if (crossProjectEnabled) {
-            fieldRequest.projectRouting(request.param("project_routing", null));
             // Setting includeResolvedTo to always include index resolution data structure in the linked project responses,
             // in order to allow the coordinating node to call CrossProjectIndexResolutionValidator#validate
             fieldRequest.includeResolvedTo(true);

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestResolveIndexAction.java

@@ -59,9 +59,6 @@ protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request
         String modeParam = request.param("mode");
         final boolean crossProjectEnabled = settings != null && settings.getAsBoolean("serverless.cross_project.enabled", false);
         String projectRouting = null;
-        if (crossProjectEnabled) {
-            projectRouting = request.param("project_routing");
-        }
         IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, ResolveIndexAction.Request.DEFAULT_INDICES_OPTIONS);
         if (crossProjectEnabled) {
             indicesOptions = IndicesOptions.builder(indicesOptions)

server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java

@@ -108,9 +108,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         request.param("min_compatible_shard_node");
 
         final boolean crossProjectEnabled = crossProjectModeDecider.crossProjectEnabled();
-        if (crossProjectEnabled) {
-            searchRequest.setProjectRouting(request.param("project_routing"));
-        }
 
         /*
          * We have to pull out the call to `source().size(size)` because

x-pack/plugin/async-search/src/main/java/org/elasticsearch/xpack/search/RestSubmitAsyncSearchAction.java

@@ -72,7 +72,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         boolean crossProjectEnabled = crossProjectModeDecider.crossProjectEnabled();
         if (crossProjectEnabled) {
             submit.getSearchRequest().setCcsMinimizeRoundtrips(true);
-            submit.getSearchRequest().setProjectRouting(request.param("project_routing"));
         }
 
         IntConsumer setSize = size -> submit.getSearchRequest().source().size(size);

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plugin/RestEqlSearchAction.java

@@ -69,7 +69,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
                 indicesOptions = IndicesOptions.builder(indicesOptions)
                     .crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
                     .build();
-                eqlRequest.projectRouting(request.param("project_routing"));
             }
             eqlRequest.indicesOptions(indicesOptions);
             if (request.hasParam("wait_for_completion_timeout")) {

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlQueryAction.java

@@ -56,11 +56,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             sqlRequest = SqlQueryRequest.fromXContent(parser);
         }
 
-        String routingParam = request.param("project_routing");
-        if (routingParam != null) {
-            // takes precedence on the parameter in the body
-            sqlRequest.projectRouting(routingParam);
-        }
         if (sqlRequest.projectRouting() != null && crossProjectModeDecider.crossProjectEnabled() == false) {
             throw new InvalidArgumentException("[project_routing] is only allowed when cross-project search is enabled");
         }

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlTranslateAction.java

@@ -49,11 +49,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         try (XContentParser parser = request.contentOrSourceParamParser()) {
             sqlRequest = SqlTranslateRequest.fromXContent(parser);
         }
-        String routingParam = request.param("project_routing");
-        if (routingParam != null) {
-            // takes precedence on the parameter in the body
-            sqlRequest.projectRouting(routingParam);
-        }
         if (sqlRequest.projectRouting() != null && crossProjectModeDecider.crossProjectEnabled() == false) {
             throw new InvalidArgumentException("[project_routing] is only allowed when cross-project search is enabled");
         }