From 2d8e597b3198133cca3395f60fbc0816ffb488d1 Mon Sep 17 00:00:00 2001
From: Jack Conradson <osjdconrad@gmail.com>
Date: Tue, 30 Sep 2025 15:10:29 -0700
Subject: [PATCH] Migrate transport version 8841_033

---
 .../java/org/elasticsearch/TransportVersions.java   |  1 -
 .../action/datastreams/GetDataStreamAction.java     | 13 ++++++++-----
 .../include_index_mode_in_get_data_stream.csv       |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv

diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
index 57221e0b51044..841c2ad26cfad 100644
--- a/server/src/main/java/org/elasticsearch/TransportVersions.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -206,7 +206,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion JINA_AI_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_020_0_00);
     public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(9_021_0_00);
     public static final TransportVersion UNASSIGENEDINFO_RESHARD_ADDED = def(9_022_0_00);
-    public static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = def(9_023_0_00);
     public static final TransportVersion MAX_OPERATION_SIZE_REJECTIONS_ADDED = def(9_024_0_00);
     public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR = def(9_025_0_00);
     public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE = def(9_026_0_00);
diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
index 85f6c4c28aad9..d556574391f3c 100644
--- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
+++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
@@ -8,6 +8,7 @@
  */
 package org.elasticsearch.action.datastreams;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -210,6 +211,10 @@ public enum ManagedBy {
 
         public static final ParseField DATA_STREAMS_FIELD = new ParseField("data_streams");
 
+        private static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = TransportVersion.fromName(
+            "include_index_mode_in_get_data_stream"
+        );
+
         public static class DataStreamInfo implements SimpleDiffable<DataStreamInfo>, ToXContentObject {
 
             public static final ParseField STATUS_FIELD = new ParseField("status");
@@ -347,7 +352,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
                     out.writeOptionalVLong(maximumTimestamp);
                 }
-                if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
+                if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
                     out.writeOptionalString(indexMode);
                 }
             }
@@ -591,9 +596,7 @@ public IndexProperties(StreamInput in) throws IOException {
                     in.readBoolean(),
                     in.readOptionalString(),
                     in.readEnum(ManagedBy.class),
-                    in.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)
-                        ? in.readOptionalString()
-                        : "unknown"
+                    in.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM) ? in.readOptionalString() : "unknown"
                 );
             }
 
@@ -602,7 +605,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeBoolean(preferIlm);
                 out.writeOptionalString(ilmPolicyName);
                 out.writeEnum(managedBy);
-                if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
+                if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
                     out.writeOptionalString(indexMode);
                 }
             }
diff --git a/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv b/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv
new file mode 100644
index 0000000000000..7c28d285164ef
--- /dev/null
+++ b/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv
@@ -0,0 +1 @@
+9023000,8841033