Collapse transport versions for 8.17.0

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

@@ -106,31 +106,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
     public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_0_00);
     public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_0_00);
-    public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_0_00);
-    public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ = def(8_776_0_00);
-    public static final TransportVersion SIMULATE_MAPPING_ADDITION = def(8_777_0_00);
-    public static final TransportVersion INTRODUCE_ALL_APPLICABLE_SELECTOR = def(8_778_0_00);
-    public static final TransportVersion INDEX_MODE_LOOKUP = def(8_779_0_00);
-    public static final TransportVersion INDEX_REQUEST_REMOVE_METERING = def(8_780_0_00);
-    public static final TransportVersion CPU_STAT_STRING_PARSING = def(8_781_0_00);
-    public static final TransportVersion QUERY_RULES_RETRIEVER = def(8_782_0_00);
-    public static final TransportVersion ESQL_CCS_EXEC_INFO_WITH_FAILURES = def(8_783_0_00);
-    public static final TransportVersion LOGSDB_TELEMETRY = def(8_784_0_00);
-    public static final TransportVersion LOGSDB_TELEMETRY_STATS = def(8_785_0_00);
-    public static final TransportVersion KQL_QUERY_ADDED = def(8_786_0_00);
-    public static final TransportVersion ROLE_MONITOR_STATS = def(8_787_0_00);
-    public static final TransportVersion DATA_STREAM_INDEX_VERSION_DEPRECATION_CHECK = def(8_788_0_00);
-    public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO = def(8_789_0_00);
-    public static final TransportVersion VERTEX_AI_INPUT_TYPE_ADDED = def(8_790_0_00);
-    public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE = def(8_791_0_00);
-    public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES = def(8_792_0_00);
-    public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS = def(8_793_0_00);
-    public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS_REVERT = def(8_794_0_00);
-    public static final TransportVersion FAST_REFRESH_RCO_2 = def(8_795_0_00);
-    public static final TransportVersion ESQL_ENRICH_RUNTIME_WARNINGS = def(8_796_0_00);
-    public static final TransportVersion INGEST_PIPELINE_CONFIGURATION_AS_MAP = def(8_797_0_00);
-    public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17 = def(8_797_0_01);
-    public static final TransportVersion SOURCE_MODE_TELEMETRY_FIX_8_17 = def(8_797_0_02);
+    public static final TransportVersion V_8_17_0 = def(8_797_0_02);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04);
     public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00);

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java

@@ -67,7 +67,7 @@ public NodeInfo(StreamInput in) throws IOException {
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             version = in.readString();
             if (in.getTransportVersion().isPatchFrom(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO_BACKPORT_8_16)
-                || in.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) {
+                || in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
                 compatibilityVersions = CompatibilityVersions.readVersion(in);
             } else {
                 compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
@@ -253,7 +253,7 @@ public void writeTo(StreamOutput out) throws IOException {
             Version.writeVersion(Version.fromString(version), out);
         }
         if (out.getTransportVersion().isPatchFrom(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO_BACKPORT_8_16)
-            || out.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) {
+            || out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             compatibilityVersions.writeTo(out);
         } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
             TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java

@@ -291,8 +291,7 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) {
-        return version.isPatchFrom(TransportVersions.SOURCE_MODE_TELEMETRY_FIX_8_17)
-            || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
+        return version.isPatchFrom(TransportVersions.V_8_17_0) || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
     }
 
     private static OptionalLong ofNullable(Long l) {

server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java

@@ -55,14 +55,9 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse {
     IndicesStatsResponse(StreamInput in) throws IOException {
         super(in);
         shards = in.readArray(ShardStats::new, ShardStats[]::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
             indexStateMap = in.readMap(IndexMetadata.State::readFrom);
-        } else if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) {
-            indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
-            indexStateMap = in.readMap(IndexMetadata.State::readFrom);
-            in.readMap(StreamInput::readStringCollectionAsList); // unused, reverted
-            in.readMap(StreamInput::readLong); // unused, reverted
         } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
             // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response
             // where we only had health and state available.
@@ -186,14 +181,9 @@ public CommonStats getPrimaries() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeArray(shards);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) {
-            out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
-            out.writeMap(indexStateMap, StreamOutput::writeWriteable);
-        } else if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
             out.writeMap(indexStateMap, StreamOutput::writeWriteable);
-            out.writeMap(Map.of(), StreamOutput::writeStringCollection);
-            out.writeMap(Map.of(), StreamOutput::writeLong);
         } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
             out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
             out.writeMap(indexStateMap, StreamOutput::writeWriteable);

server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java

@@ -142,7 +142,7 @@ public SimulateBulkRequest(StreamInput in) throws IOException {
             componentTemplateSubstitutions = Map.of();
             indexTemplateSubstitutions = Map.of();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             this.mappingAddition = (Map<String, Object>) in.readGenericValue();
         } else {
             mappingAddition = Map.of();
@@ -157,7 +157,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeGenericValue(componentTemplateSubstitutions);
             out.writeGenericValue(indexTemplateSubstitutions);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             out.writeGenericValue(mappingAddition);
         }
     }

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -203,7 +203,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
             requireDataStream = false;
         }
 
-        if (in.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) {
+        if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) {
             if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
                 in.readZLong(); // obsolete normalisedBytesParsed
             }
@@ -803,7 +803,7 @@ private void writeBody(StreamOutput out) throws IOException {
             out.writeBoolean(requireDataStream);
         }
 
-        if (out.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) {
+        if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) {
             if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
                 out.writeZLong(-1);  // obsolete normalisedBytesParsed
             }

server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java

@@ -911,7 +911,7 @@ public void writeIndicesOptions(StreamOutput out) throws IOException {
         }
         if (out.getTransportVersion()
             .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) {
-            if (out.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) {
+            if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) {
                 out.writeVInt(1); // Enum set sized 1
                 out.writeVInt(0); // ordinal 0 (::data selector)
             } else {
@@ -955,7 +955,7 @@ public static IndicesOptions readIndicesOptions(StreamInput in) throws IOExcepti
         if (in.getTransportVersion()
             .between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) {
             // Reading from an older node, which will be sending either an enum set or a single byte that needs to be read out and ignored.
-            if (in.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) {
+            if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) {
                 int size = in.readVInt();
                 for (int i = 0; i < size; i++) {
                     in.readVInt();

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

@@ -587,7 +587,7 @@ public static void writeTo(IndexMode indexMode, StreamOutput out) throws IOExcep
             case STANDARD -> 0;
             case TIME_SERIES -> 1;
             case LOGSDB -> 2;
-            case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.INDEX_MODE_LOOKUP) ? 3 : 0;
+            case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0) ? 3 : 0;
         };
         out.writeByte((byte) code);
     }

server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java

@@ -168,7 +168,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
         final String id = in.readString();
         final Map<String, Object> config;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_PIPELINE_CONFIGURATION_AS_MAP)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             config = in.readGenericMap();
         } else {
             final BytesReference bytes = in.readSlicedBytesReference();
@@ -190,7 +190,7 @@ public String toString() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(id);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_PIPELINE_CONFIGURATION_AS_MAP)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             out.writeGenericMap(config);
         } else {
             XContentBuilder builder = XContentBuilder.builder(JsonXContent.jsonXContent).prettyPrint();

server/src/main/java/org/elasticsearch/monitor/os/OsStats.java

@@ -488,7 +488,7 @@ public Cgroup(
 
         Cgroup(final StreamInput in) throws IOException {
             cpuAcctControlGroup = in.readString();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
+            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
                 cpuAcctUsageNanos = in.readBigInteger();
             } else {
                 cpuAcctUsageNanos = BigInteger.valueOf(in.readLong());
@@ -505,7 +505,7 @@ public Cgroup(
         @Override
         public void writeTo(final StreamOutput out) throws IOException {
             out.writeString(cpuAcctControlGroup);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
                 out.writeBigInteger(cpuAcctUsageNanos);
             } else {
                 out.writeLong(cpuAcctUsageNanos.longValue());
@@ -605,7 +605,7 @@ public CpuStat(
             }
 
             CpuStat(final StreamInput in) throws IOException {
-                if (in.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
+                if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
                     numberOfElapsedPeriods = in.readBigInteger();
                     numberOfTimesThrottled = in.readBigInteger();
                     timeThrottledNanos = in.readBigInteger();
@@ -618,7 +618,7 @@ public CpuStat(
 
             @Override
             public void writeTo(final StreamOutput out) throws IOException {
-                if (out.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
+                if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
                     out.writeBigInteger(numberOfElapsedPeriods);
                     out.writeBigInteger(numberOfTimesThrottled);
                     out.writeBigInteger(timeThrottledNanos);

server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

@@ -289,7 +289,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException {
             rankBuilder = in.readOptionalNamedWriteable(RankBuilder.class);
         }
         if (in.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
-            || in.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
+            || in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             skipInnerHits = in.readBoolean();
         } else {
             skipInnerHits = false;
@@ -384,7 +384,7 @@ public void writeTo(StreamOutput out) throws IOException {
             throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]");
         }
         if (out.getTransportVersion().isPatchFrom(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16)
-            || out.getTransportVersion().onOrAfter(TransportVersions.SKIP_INNER_HITS_SEARCH_SOURCE)) {
+            || out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             out.writeBoolean(skipInnerHits);
         }
     }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/LogsDBFeatureSetUsage.java

@@ -28,15 +28,15 @@ public LogsDBFeatureSetUsage(StreamInput input) throws IOException {
         super(input);
         indicesCount = input.readVInt();
         indicesWithSyntheticSource = input.readVInt();
-        if (input.getTransportVersion().onOrAfter(TransportVersions.LOGSDB_TELEMETRY_STATS)) {
+        if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             numDocs = input.readVLong();
             sizeInBytes = input.readVLong();
         } else {
             numDocs = 0;
             sizeInBytes = 0;
         }
         var transportVersion = input.getTransportVersion();
-        if (transportVersion.isPatchFrom(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17)
+        if (transportVersion.isPatchFrom(TransportVersions.V_8_17_0)
             || transportVersion.onOrAfter(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE)) {
             hasCustomCutoffDate = input.readBoolean();
         } else {
@@ -49,12 +49,12 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeVInt(indicesCount);
         out.writeVInt(indicesWithSyntheticSource);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.LOGSDB_TELEMETRY_STATS)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
             out.writeVLong(numDocs);
             out.writeVLong(sizeInBytes);
         }
         var transportVersion = out.getTransportVersion();
-        if (transportVersion.isPatchFrom(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17)
+        if (transportVersion.isPatchFrom(TransportVersions.V_8_17_0)
             || transportVersion.onOrAfter(TransportVersions.LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE)) {
             out.writeBoolean(hasCustomCutoffDate);
         }
@@ -79,7 +79,7 @@ public LogsDBFeatureSetUsage(
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.LOGSDB_TELEMETRY;
+        return TransportVersions.V_8_17_0;
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/GetInferenceModelAction.java

@@ -62,8 +62,7 @@ public Request(StreamInput in) throws IOException {
             super(in);
             this.inferenceEntityId = in.readString();
             this.taskType = TaskType.fromStream(in);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_DONT_PERSIST_ON_READ)
-                || in.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_0)) {
+            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
                 this.persistDefaultConfig = in.readBoolean();
             } else {
                 this.persistDefaultConfig = PERSIST_DEFAULT_CONFIGS;
@@ -88,8 +87,7 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(inferenceEntityId);
             taskType.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.INFERENCE_DONT_PERSIST_ON_READ)
-                || out.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_0)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
                 out.writeBoolean(this.persistDefaultConfig);
             }
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/RemoteClusterPermissions.java

@@ -32,8 +32,6 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.TransportVersions.ROLE_MONITOR_STATS;
-
 /**
  * Represents the set of permissions for remote clusters. This is intended to be the model for both the {@link RoleDescriptor}
  * and {@link Role}. This model is intended to be converted to local cluster permissions
@@ -71,6 +69,7 @@
 public class RemoteClusterPermissions implements NamedWriteable, ToXContentObject {
 
     public static final TransportVersion ROLE_REMOTE_CLUSTER_PRIVS = TransportVersions.V_8_15_0;
+    public static final TransportVersion ROLE_MONITOR_STATS = TransportVersions.V_8_17_0;
 
     public static final String NAME = "remote_cluster_permissions";
     private static final Logger logger = LogManager.getLogger(RemoteClusterPermissions.class);

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java

@@ -44,10 +44,10 @@
 import java.util.stream.Collectors;
 
 import static java.util.Map.entry;
-import static org.elasticsearch.TransportVersions.ROLE_MONITOR_STATS;
 import static org.elasticsearch.xpack.core.security.authc.Authentication.VERSION_API_KEY_ROLES_AS_BYTES;
 import static org.elasticsearch.xpack.core.security.authc.AuthenticationTestHelper.randomCrossClusterAccessSubjectInfo;
 import static org.elasticsearch.xpack.core.security.authc.CrossClusterAccessSubjectInfoTests.randomRoleDescriptorsIntersection;
+import static org.elasticsearch.xpack.core.security.authz.permission.RemoteClusterPermissions.ROLE_MONITOR_STATS;
 import static org.elasticsearch.xpack.core.security.authz.permission.RemoteClusterPermissions.ROLE_REMOTE_CLUSTER_PRIVS;
 import static org.hamcrest.Matchers.anEmptyMap;
 import static org.hamcrest.Matchers.containsString;