Merge branch 'main' into mp-downsample

Author: nielsbauman

build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle

@@ -133,7 +133,7 @@ develocity {
         }
       } else {
         tag 'LOCAL'
-        if (providers.systemProperty('idea.active').present) {
+        if (System.getProperty('idea.active') == 'true') {
           tag 'IDEA'
         }
       }

docs/README.md

@@ -17,7 +17,7 @@ Docs live in **three places**:
 
 1. **Reference content** lives in this repo. This covers low-level stuff like settings and configuration information that is tightly coupled to code.
 - 👩🏽‍💻 **Engineers** own the bulk of this content.
-2.  **API reference docs** live in the [Elasticsearch specification](https://github.com/elastic/elasticsearch-specification)
+2.  **API reference docs** live in the [Elasticsearch specification](https://github.com/elastic/elasticsearch-specification/blob/main/README.md#how-to-generate-the-openapi-representation)
     - This is where you need to update API docs published in the [new API docs system](https://www.elastic.co/docs/api/doc/elasticsearch/v8/)
 - 👩🏽‍💻 **Engineers** own this content.
 3. **Narrative, overview, and conceptual content** mostly lives in the [`docs-content`](https://github.com/elastic/docs-content/) repo. 
@@ -106,4 +106,4 @@ This allows slightly more expressive testing of the snippets. Since that syntax
 % TEST[s/\n$/\nstartyaml\n  - compare_analyzers: {index: thai_example, first: thai, second: rebuilt_thai}\nendyaml\n/]
 ```
 
-Any place you can use json you can use elements like `$body.path.to.thing` which is replaced on the fly with the contents of the thing at `path.to.thing` in the last response.
+Any place you can use json you can use elements like `$body.path.to.thing` which is replaced on the fly with the contents of the thing at `path.to.thing` in the last response.

plugins/discovery-ec2/build.gradle

@@ -46,13 +46,12 @@ esplugin.bundleSpec.from('config/discovery-ec2') {
 }
 
 tasks.register("writeTestJavaPolicy") {
+  boolean inFips = buildParams.inFipsJvm
+  inputs.property("inFipsJvm", inFips)
+  final File javaPolicy = new File(layout.buildDirectory.asFile.get(), "tmp/java.policy")
+  outputs.file(javaPolicy)
   doLast {
-    final File tmp = file("${buildDir}/tmp")
-    if (tmp.exists() == false && tmp.mkdirs() == false) {
-      throw new GradleException("failed to create temporary directory [${tmp}]")
-    }
-    final File javaPolicy = file("${tmp}/java.policy")
-    if (buildParams.inFipsJvm) {
+    if (inFips) {
       javaPolicy.write(
         [
           "grant {",
@@ -95,9 +94,9 @@ tasks.withType(Test).configureEach {
   // this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property
   // it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'`
   if (buildParams.inFipsJvm){
-    nonInputProperties.systemProperty 'java.security.policy', "=file://${buildDir}/tmp/java.policy"
+    nonInputProperties.systemProperty 'java.security.policy', "=file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
   } else {
-    nonInputProperties.systemProperty 'java.security.policy', "file://${buildDir}/tmp/java.policy"
+    nonInputProperties.systemProperty 'java.security.policy', "file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
   }
 }
 

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -57,7 +57,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_7_3_0 = def(7_03_00_99);
     public static final TransportVersion V_7_3_2 = def(7_03_02_99);
     public static final TransportVersion V_7_4_0 = def(7_04_00_99);
-    public static final TransportVersion V_7_6_0 = def(7_06_00_99);
     public static final TransportVersion V_7_8_0 = def(7_08_00_99);
     public static final TransportVersion V_7_8_1 = def(7_08_01_99);
     public static final TransportVersion V_7_9_0 = def(7_09_00_99);

server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java

@@ -438,7 +438,7 @@ private static void writeBlockSet(Set<ClusterBlock> blocks, StreamOutput out) th
     public static ClusterBlocks readFrom(StreamInput in) throws IOException {
         if (in.getTransportVersion().onOrAfter(TransportVersions.MULTI_PROJECT)) {
             final Set<ClusterBlock> global = readBlockSet(in);
-            final Map<ProjectId, ProjectBlocks> projectBlocksMap = in.readImmutableMap(ProjectId::new, ProjectBlocks::readFrom);
+            final Map<ProjectId, ProjectBlocks> projectBlocksMap = in.readImmutableMap(ProjectId::readFrom, ProjectBlocks::readFrom);
             if (global.isEmpty()
                 && noProjectOrDefaultProjectOnly(projectBlocksMap)
                 && projectBlocksMap.getOrDefault(Metadata.DEFAULT_PROJECT_ID, ProjectBlocks.EMPTY).indices().isEmpty()) {

server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java

@@ -88,7 +88,7 @@ public class Metadata implements Diffable<Metadata>, ChunkedToXContent {
     public static final String UNKNOWN_CLUSTER_UUID = "_na_";
     // TODO multi-project: verify that usages are really expected to work on the default project only,
     // and that they are not a stop-gap solution to make the tests pass
-    public static final ProjectId DEFAULT_PROJECT_ID = new ProjectId("default");
+    public static final ProjectId DEFAULT_PROJECT_ID = ProjectId.DEFAULT;
 
     public enum XContentContext {
         /* Custom metadata should be returned as part of API call */
@@ -1154,7 +1154,7 @@ public static Metadata readFrom(StreamInput in) throws IOException {
                 builder.put(ReservedStateMetadata.readFrom(in));
             }
 
-            builder.projectMetadata(in.readMap(ProjectId::new, ProjectMetadata::readFrom));
+            builder.projectMetadata(in.readMap(ProjectId::readFrom, ProjectMetadata::readFrom));
         }
         return builder.build();
     }

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectId.java

@@ -19,17 +19,39 @@
 import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
+import java.util.Objects;
 
-public record ProjectId(String id) implements Writeable, ToXContent {
+public class ProjectId implements Writeable, ToXContent {
 
-    public static final Reader<ProjectId> READER = ProjectId::new;
+    private static final String DEFAULT_STRING = "default";
+    public static final ProjectId DEFAULT = new ProjectId(DEFAULT_STRING);
+    public static final Reader<ProjectId> READER = ProjectId::readFrom;
     private static final int MAX_LENGTH = 128;
 
-    public ProjectId {
+    private final String id;
+
+    private ProjectId(String id) {
         if (Strings.isNullOrBlank(id)) {
             throw new IllegalArgumentException("project-id cannot be empty");
         }
-        assert isValidFormatId(id) : "project-id [" + id + "] must be alphanumeric ASCII with up to " + MAX_LENGTH + " chars";
+        if (isValidFormatId(id) == false) {
+            final var message = "project-id [" + id + "] must be alphanumeric ASCII with up to " + MAX_LENGTH + " chars";
+            assert false : message;
+            throw new IllegalArgumentException(message);
+        }
+        this.id = id;
+    }
+
+    public String id() {
+        return id;
+    }
+
+    public static ProjectId fromId(String id) {
+        if (DEFAULT_STRING.equals(id)) {
+            return DEFAULT;
+        } else {
+            return new ProjectId(id);
+        }
     }
 
     static boolean isValidFormatId(String id) {
@@ -53,8 +75,8 @@ private static boolean isValidIdChar(char c) {
         return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_' || c == '-';
     }
 
-    public ProjectId(StreamInput in) throws IOException {
-        this(in.readString());
+    public static ProjectId readFrom(StreamInput in) throws IOException {
+        return fromId(in.readString());
     }
 
     @Override
@@ -79,4 +101,16 @@ public static ProjectId ofNullable(@Nullable String id, @Nullable ProjectId fall
     public String toString() {
         return this.id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        ProjectId projectId = (ProjectId) o;
+        return Objects.equals(id, projectId.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
 }

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java

@@ -2136,7 +2136,7 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params p) {
     }
 
     public static ProjectMetadata readFrom(StreamInput in) throws IOException {
-        ProjectId id = new ProjectId(in);
+        ProjectId id = ProjectId.readFrom(in);
         Builder builder = builder(id);
         Function<String, MappingMetadata> mappingLookup;
         Map<String, MappingMetadata> mappingMetadataMap = in.readMapValues(MappingMetadata::new, MappingMetadata::getSha256);

server/src/main/java/org/elasticsearch/cluster/project/AbstractProjectResolver.java

@@ -50,7 +50,7 @@ public ProjectId getProjectId() {
         if (headerValue == null) {
             return getFallbackProjectId();
         }
-        return new ProjectId(headerValue);
+        return ProjectId.fromId(headerValue);
     }
 
     @Override
@@ -89,7 +89,7 @@ public boolean supportsMultipleProjects() {
     }
 
     protected static ProjectMetadata findProject(Metadata metadata, String headerValue) {
-        var project = metadata.projects().get(new ProjectId(headerValue));
+        var project = metadata.projects().get(ProjectId.fromId(headerValue));
         if (project == null) {
             throw new IllegalArgumentException("Could not find project with id [" + headerValue + "]");
         }

server/src/main/java/org/elasticsearch/cluster/routing/GlobalRoutingTable.java

@@ -179,7 +179,7 @@ public static Diff<GlobalRoutingTable> readDiffFrom(StreamInput in) throws IOExc
     }
 
     public static GlobalRoutingTable readFrom(StreamInput in) throws IOException {
-        final var table = in.readImmutableOpenMap(ProjectId::new, RoutingTable::readFrom);
+        final var table = in.readImmutableOpenMap(ProjectId::readFrom, RoutingTable::readFrom);
         return new GlobalRoutingTable(table);
     }