Script: Configuration driven validation for CtxMap

build-tools/src/integTest/groovy/org/elasticsearch/gradle/LoggedExecFuncTest.groovy

@@ -35,7 +35,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         import org.elasticsearch.gradle.LoggedExec
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'ls', '-lh'
-          spoolOutput = $spooling
+          getSpoolOutput().set($spooling)
         }
         """
         when:
@@ -54,7 +54,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         import org.elasticsearch.gradle.LoggedExec
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'ls', 'wtf'
-          spoolOutput = $spooling
+          getSpoolOutput().set($spooling)        
         }
         """
         when:
@@ -97,7 +97,7 @@ class LoggedExecFuncTest extends AbstractGradleFuncTest {
         tasks.register('loggedExec', LoggedExec) {
           commandLine 'echo', 'HELLO'
           getCaptureOutput().set(true)
-          spoolOutput = true
+          getSpoolOutput().set(true)
         }
         """
         when:

build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java

@@ -56,7 +56,6 @@ public abstract class LoggedExec extends DefaultTask implements FileSystemOperat
     protected FileSystemOperations fileSystemOperations;
     private ProjectLayout projectLayout;
     private ExecOperations execOperations;
-    private boolean spoolOutput;
 
     @Input
     @Optional
@@ -84,6 +83,9 @@ public abstract class LoggedExec extends DefaultTask implements FileSystemOperat
     @Input
     abstract public Property<File> getWorkingDir();
 
+    @Internal
+    abstract public Property<Boolean> getSpoolOutput();
+
     private String output;
 
     @Inject
@@ -95,14 +97,16 @@ public LoggedExec(ProjectLayout projectLayout, ExecOperations execOperations, Fi
         // For now mimic default behaviour of Gradle Exec task here
         getEnvironment().putAll(System.getenv());
         getCaptureOutput().convention(false);
+        getSpoolOutput().convention(false);
     }
 
     @TaskAction
     public void run() {
+        boolean spoolOutput = getSpoolOutput().get();
         if (spoolOutput && getCaptureOutput().get()) {
             throw new GradleException("Capturing output is not supported when spoolOutput is true.");
         }
-        if (getCaptureOutput().getOrElse(false) && getIndentingConsoleOutput().isPresent()) {
+        if (getCaptureOutput().get() && getIndentingConsoleOutput().isPresent()) {
             throw new GradleException("Capturing output is not supported when indentingConsoleOutput is configured.");
         }
         Consumer<Logger> outputLogger;
@@ -156,7 +160,9 @@ public void run() {
         if (getLogger().isInfoEnabled() == false) {
             if (exitValue != 0) {
                 try {
-                    getLogger().error("Output for " + getExecutable().get() + ":");
+                    if (getIndentingConsoleOutput().isPresent() == false) {
+                        getLogger().error("Output for " + getExecutable().get() + ":");
+                    }
                     outputLogger.accept(getLogger());
                 } catch (Exception e) {
                     throw new GradleException("Failed to read exec output", e);
@@ -173,10 +179,6 @@ private String byteStreamToString(OutputStream out) {
         return ((ByteArrayOutputStream) out).toString(StandardCharsets.UTF_8);
     }
 
-    public void setSpoolOutput(boolean spoolOutput) {
-        this.spoolOutput = spoolOutput;
-    }
-
     public static ExecResult exec(ExecOperations execOperations, Action<ExecSpec> action) {
         return genericExec(execOperations::exec, action);
     }

docs/changelog/88257.yaml

@@ -0,0 +1,6 @@
+pr: 88257
+summary: INFO logging of snapshot restore and completion
+area: Snapshot/Restore
+type: enhancement
+issues:
+ - 86610

docs/changelog/88276.yaml

@@ -0,0 +1,5 @@
+pr: 88276
+summary: Updatable API keys - logging audit trail event
+area: Audit
+type: enhancement
+issues: []

docs/changelog/88346.yaml

@@ -0,0 +1,5 @@
+pr: 88346
+summary: Updatable API keys - noop check
+area: Security
+type: enhancement
+issues: []

docs/changelog/88398.yaml

@@ -0,0 +1,5 @@
+pr: 88398
+summary: Track the count of failed invocations since last successful policy snapshot
+area: ILM+SLM
+type: enhancement
+issues: []

docs/changelog/88399.yaml

@@ -0,0 +1,6 @@
+pr: 88399
+summary: Improve error when sorting on incompatible types
+area: Search
+type: enhancement
+issues:
+ - 73146

docs/changelog/88456.yaml

@@ -0,0 +1,5 @@
+pr: 88456
+summary: Audit API key ID when create or grant API keys
+area: Audit
+type: enhancement
+issues: []

docs/reference/aggregations/metrics/avg-aggregation.asciidoc

@@ -4,7 +4,7 @@
 <titleabbrev>Avg</titleabbrev>
 ++++
 
-A `single-value` metrics aggregation that computes the average of numeric values that are extracted from the aggregated documents. These values can be extracted either from specific numeric fields in the documents.
+A `single-value` metrics aggregation that computes the average of numeric values that are extracted from the aggregated documents. These values can be extracted either from specific numeric or <<histogram,histogram>> fields in the documents.
 
 Assuming the data consists of documents representing exams grades (between 0
 and 100) of students we can average their scores with:

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RenameProcessorTests.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.ingest.TestIngestDocument;
 import org.elasticsearch.ingest.TestTemplateService;
+import org.elasticsearch.script.Metadata;
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.ArrayList;
@@ -140,11 +141,14 @@ public void testRenameAtomicOperationSetFails() throws Exception {
         Map<String, Object> metadata = new HashMap<>();
         metadata.put("list", Collections.singletonList("item"));
 
-        IngestDocument ingestDocument = TestIngestDocument.ofMetadataWithValidator(metadata, Map.of("new_field", (o, k, v) -> {
-            if (v != null) {
-                throw new UnsupportedOperationException();
-            }
-        }, "list", (o, k, v) -> {}));
+        IngestDocument ingestDocument = TestIngestDocument.ofMetadataWithValidator(
+            metadata,
+            Map.of("new_field", new Metadata.FieldProperty<>(Object.class, true, true, (k, v) -> {
+                if (v != null) {
+                    throw new UnsupportedOperationException();
+                }
+            }), "list", new Metadata.FieldProperty<>(Object.class, true, true, null))
+        );
         Processor processor = createRenameProcessor("list", "new_field", false);
         try {
             processor.execute(ingestDocument);
@@ -160,16 +164,15 @@ public void testRenameAtomicOperationRemoveFails() throws Exception {
         Map<String, Object> metadata = new HashMap<>();
         metadata.put("list", Collections.singletonList("item"));
 
-        IngestDocument ingestDocument = TestIngestDocument.ofMetadataWithValidator(metadata, Map.of("list", (o, k, v) -> {
-            if (v == null) {
-                throw new UnsupportedOperationException();
-            }
-        }));
+        IngestDocument ingestDocument = TestIngestDocument.ofMetadataWithValidator(
+            metadata,
+            Map.of("list", new Metadata.FieldProperty<>(Object.class, false, true, null))
+        );
         Processor processor = createRenameProcessor("list", "new_field", false);
         try {
             processor.execute(ingestDocument);
             fail("processor execute should have failed");
-        } catch (UnsupportedOperationException e) {
+        } catch (IllegalArgumentException e) {
             // the set failed, the old field has not been removed
             assertThat(ingestDocument.getSourceAndMetadata().containsKey("list"), equalTo(true));
             assertThat(ingestDocument.getSourceAndMetadata().containsKey("new_field"), equalTo(false));

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ScriptProcessorFactoryTests.java

@@ -159,7 +159,7 @@ public void testInlineIsCompiled() throws Exception {
         assertThat(processor.getScript().getParams(), equalTo(Collections.emptyMap()));
         assertNotNull(processor.getPrecompiledIngestScriptFactory());
         IngestDocument doc = TestIngestDocument.emptyIngestDocument();
-        Map<String, Object> ctx = TestIngestDocument.emptyIngestDocument().getIngestSourceAndMetadata();
+        Map<String, Object> ctx = TestIngestDocument.emptyIngestDocument().getSourceAndMetadata();
         processor.getPrecompiledIngestScriptFactory().newInstance(null, doc.getMetadata(), ctx).execute();
         assertThat(ctx.get("foo"), equalTo("bar"));
     }

modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/GeoBoundingBoxQueryLegacyGeoShapeIT.java

@@ -22,11 +22,6 @@
 
 public class GeoBoundingBoxQueryLegacyGeoShapeIT extends GeoBoundingBoxQueryIntegTestCase {
 
-    @Override
-    protected boolean addMockGeoShapeFieldMapper() {
-        return false;
-    }
-
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Collections.singleton(TestLegacyGeoShapeFieldMapperPlugin.class);

modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java

@@ -28,11 +28,6 @@
 
 public class LegacyGeoShapeIT extends GeoShapeIntegTestCase {
 
-    @Override
-    protected boolean addMockGeoShapeFieldMapper() {
-        return false;
-    }
-
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Collections.singleton(TestLegacyGeoShapeFieldMapperPlugin.class);

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilderTests.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.AbstractQueryTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -54,7 +53,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(MapperExtrasPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(MapperExtrasPlugin.class);
     }
 
     @Override

modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenTests.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.join.ParentJoinPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.search.aggregations.BaseAggregationTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -20,7 +19,7 @@ public class ChildrenTests extends BaseAggregationTestCase<ChildrenAggregationBu
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(ParentJoinPlugin.class);
     }
 
     @Override

modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentTests.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.join.ParentJoinPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.search.aggregations.BaseAggregationTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -20,7 +19,7 @@ public class ParentTests extends BaseAggregationTestCase<ParentAggregationBuilde
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(ParentJoinPlugin.class);
     }
 
     @Override

modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java

@@ -45,7 +45,6 @@
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.AbstractQueryTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 
@@ -77,7 +76,7 @@ public class HasChildQueryBuilderTests extends AbstractQueryTestCase<HasChildQue
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(ParentJoinPlugin.class);
     }
 
     @Override

modules/parent-join/src/test/java/org/elasticsearch/join/query/HasParentQueryBuilderTests.java

@@ -31,7 +31,6 @@
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.AbstractQueryTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 
@@ -60,7 +59,7 @@ public class HasParentQueryBuilderTests extends AbstractQueryTestCase<HasParentQ
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(ParentJoinPlugin.class);
     }
 
     @Override

modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentIdQueryBuilderTests.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.join.ParentJoinPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.AbstractQueryTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.hamcrest.Matchers;
 
@@ -48,7 +47,7 @@ public class ParentIdQueryBuilderTests extends AbstractQueryTestCase<ParentIdQue
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(ParentJoinPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(ParentJoinPlugin.class);
     }
 
     @Override

modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java

@@ -62,11 +62,6 @@
 
 public class PercolatorQuerySearchIT extends ESIntegTestCase {
 
-    @Override
-    protected boolean addMockGeoShapeFieldMapper() {
-        return false;
-    }
-
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Arrays.asList(PercolatorPlugin.class, TestGeoShapeFieldMapperPlugin.class);

modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java

@@ -29,7 +29,6 @@
 import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.AbstractQueryTestCase;
-import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
@@ -77,7 +76,7 @@ public class PercolateQueryBuilderTests extends AbstractQueryTestCase<PercolateQ
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return Arrays.asList(PercolatorPlugin.class, TestGeoShapeFieldMapperPlugin.class);
+        return Arrays.asList(PercolatorPlugin.class);
     }
 
     @Override

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerIT.java

@@ -25,6 +25,7 @@
 import org.elasticsearch.plugins.EnginePlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
+import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -57,6 +58,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         List<Class<? extends Plugin>> plugins = new ArrayList<>(super.nodePlugins());
         plugins.add(EngineTestPlugin.class);
         plugins.add(MockTransportService.TestPlugin.class);
+        plugins.add(TestGeoShapeFieldMapperPlugin.class);
         return plugins;
     }
 

server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java

@@ -727,6 +727,7 @@ public ClusterState.Custom randomCreate(String name) {
                             UUIDs.randomBase64UUID(),
                             new Snapshot(randomName("repo"), new SnapshotId(randomName("snap"), UUIDs.randomBase64UUID())),
                             RestoreInProgress.State.fromValue((byte) randomIntBetween(0, 3)),
+                            randomBoolean(),
                             emptyList(),
                             ImmutableOpenMap.of()
                         )

server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoBoundingBoxQueryGeoPointIT.java

@@ -9,14 +9,24 @@
 package org.elasticsearch.search.geo;
 
 import org.elasticsearch.Version;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
 
 public class GeoBoundingBoxQueryGeoPointIT extends GeoBoundingBoxQueryIntegTestCase {
 
+    @SuppressWarnings("deprecation")
+    @Override
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return Collections.singleton(TestGeoShapeFieldMapperPlugin.class);
+    }
+
     @Override
     public XContentBuilder getMapping() throws IOException {
         XContentBuilder xContentBuilder = XContentFactory.jsonBuilder()