Merge remote-tracking branch 'elastic/main' into skip-can-match-on-batched

Author: original-brownbear

docs/changelog/124708.yaml

@@ -0,0 +1,5 @@
+pr: 124708
+summary: Throw exception for unknown token in RestIndexPutAliasAction
+area: Indices APIs
+type: enhancement
+issues: []

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml

@@ -103,3 +103,30 @@
         index: test_index
         name: test_alias
   - match: {test_index.aliases.test_alias: {"filter": {"range": {"date_nanos_field": {"gt": "now-7d/d"}}}}}
+
+---
+"Throw exception for unknown token":
+  - requires:
+      cluster_features: [ "index.throw_exception_for_unknown_token_in_rest_index_put_alias_action" ]
+      reason: "Throw exception for unknown token in RestIndexPutAliasAction"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      catch: /Unsupported field \[foo\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          is_write_index: true
+          foo: "bar"
+
+  - do:
+      catch: / Unexpected token \[START_ARRAY\]/
+      indices.put_alias:
+        index: test_index
+        name: test_alias
+        body:
+          routing: [ "routing" ]

server/src/main/java/org/elasticsearch/index/IndexFeatures.java

@@ -25,6 +25,10 @@ public Set<NodeFeature> getFeatures() {
 
     private static final NodeFeature SYNONYMS_SET_LENIENT_ON_NON_EXISTING = new NodeFeature("index.synonyms_set_lenient_on_non_existing");
 
+    private static final NodeFeature THROW_EXCEPTION_FOR_UNKNOWN_TOKEN_IN_REST_INDEX_PUT_ALIAS_ACTION = new NodeFeature(
+        "index.throw_exception_for_unknown_token_in_rest_index_put_alias_action"
+    );
+
     private static final NodeFeature THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS = new NodeFeature(
         "index.throw_exception_on_index_creation_if_unsupported_value_type_in_alias"
     );
@@ -34,6 +38,7 @@ public Set<NodeFeature> getTestFeatures() {
         return Set.of(
             LOGSDB_NO_HOST_NAME_FIELD,
             SYNONYMS_SET_LENIENT_ON_NON_EXISTING,
+            THROW_EXCEPTION_FOR_UNKNOWN_TOKEN_IN_REST_INDEX_PUT_ALIAS_ACTION,
             THROW_EXCEPTION_ON_INDEX_CREATION_IF_UNSUPPORTED_VALUE_TYPE_IN_ALIAS
         );
     }

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -2652,7 +2652,7 @@ public void onSettingsChanged() {
     }
 
     /**
-     * Acquires a lock on the translog files and Lucene soft-deleted documents to prevent them from being trimmed
+     * Acquires a lock on Lucene soft-deleted documents to prevent them from being trimmed
      */
     public Closeable acquireHistoryRetentionLock() {
         return getEngine().acquireHistoryRetentionLock();

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

@@ -11,6 +11,7 @@
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -30,7 +31,6 @@
 
 @ServerlessScope(Scope.PUBLIC)
 public class RestIndexPutAliasAction extends BaseRestHandler {
-
     @Override
     public List<Route> routes() {
         return List.of(
@@ -90,11 +90,15 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
                                     searchRouting = parser.textOrNull();
                                 } else if ("is_write_index".equals(currentFieldName)) {
                                     writeIndex = parser.booleanValue();
+                                } else {
+                                    throw new IllegalArgumentException("Unsupported field [" + currentFieldName + "]");
                                 }
                     } else if (token == XContentParser.Token.START_OBJECT) {
                         if ("filter".equals(currentFieldName)) {
                             filter = parser.mapOrdered();
                         }
+                    } else if (token != XContentParser.Token.END_OBJECT) {
+                        throw new ParsingException(parser.getTokenLocation(), "Unexpected token [" + token + "]");
                     }
                 }
             }

x-pack/plugin/esql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/esql/EsqlSecurityIT.java

@@ -995,7 +995,7 @@ private void createDataStreamDocuments() throws IOException {
     }
 
     private void createDataStreamAlias() throws IOException {
-        Request request = new Request("PUT", "_alias");
+        Request request = new Request("POST", "_aliases");
         request.setJsonEntity("""
             {
               "actions": [

x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityDataStreamEsqlRcs1IT.java

@@ -270,7 +270,7 @@ private static void createDataStreamDocuments(CheckedFunction<Request, Response,
     }
 
     private static void createDataStreamAlias(CheckedFunction<Request, Response, Exception> requestConsumer) throws Exception {
-        Request request = new Request("PUT", "_alias");
+        Request request = new Request("POST", "_aliases");
         request.setJsonEntity("""
             {
               "actions": [