Merge branch 'main' into entitlements/fix-policy-parser-paths-windows

Author: ldematte

.buildkite/pipelines/intake.yml

@@ -76,7 +76,7 @@ steps:
             ES_VERSION:
               - "9.0.0"
             ES_COMMIT:
-              - "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
+              - "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump / head of combat-lucene-10-0-0
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

modules/reindex/build.gradle

@@ -167,3 +167,7 @@ if (OS.current() == OS.WINDOWS) {
     }
   }
 }
+
+tasks.named("yamlRestCompatTestTransform").configure { task ->
+  task.skipTest("reindex/20_validation/specifying size fails", "size is rejected in 9.0")
+}

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml

@@ -107,7 +107,7 @@
         body:   { "text": "test" }
 
   - do:
-      catch: /invalid parameter \[size\], use \[max_docs\] instead/
+      catch: /(invalid parameter \[size\], use \[max_docs\] instead|unknown field \[size\])/
       reindex:
         body:
           source:

muted-tests.yml

@@ -394,6 +394,9 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/122680
 - class: org.elasticsearch.entitlement.qa.EntitlementsDeniedIT
   issue: https://github.com/elastic/elasticsearch/issues/122566
+- class: org.elasticsearch.repositories.blobstore.testkit.analyze.S3RepositoryAnalysisRestIT
+  method: testRepositoryAnalysis
+  issue: https://github.com/elastic/elasticsearch/issues/122799
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java

@@ -21,7 +21,6 @@
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -355,10 +354,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         );
 
         PARSER.declareInt(ReindexRequest::setMaxDocsValidateIdentical, new ParseField("max_docs"));
-
-        // avoid silently accepting an ignored size.
-        PARSER.declareInt((r, s) -> failOnSizeSpecified(), new ParseField("size"));
-
         PARSER.declareField((p, v, c) -> v.setScript(Script.parse(p)), new ParseField("script"), ObjectParser.ValueType.OBJECT);
         PARSER.declareString(ReindexRequest::setConflicts, new ParseField("conflicts"));
     }
@@ -498,10 +493,4 @@ static void setMaxDocsValidateIdentical(AbstractBulkByScrollRequest<?> request,
             request.setMaxDocs(maxDocs);
         }
     }
-
-    @UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_INDEXING)
-    // do we still need this ref to [max_docs] or can we remove the field entirely so it's rejected with the default message?
-    private static void failOnSizeSpecified() {
-        throw new IllegalArgumentException("invalid parameter [size], use [max_docs] instead");
-    }
 }