Need unqualified version

droberts195 · Sep 27, 2023 · c5be055 · c5be055
1 parent 8acdedf
commit c5be055
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java
@@ -249,6 +249,14 @@ public String qualifiedVersion() {
         return version;
     }
 
+    /**
+     * Get the build version without any suffices like "-SNAPSHOT" or "-rc1".
+     * @return the build version with no suffix
+     */
+    public String unqualifiedVersion() {
+        return version.replaceFirst("-.*", "");
+    }
+
     public boolean isProductionRelease() {
         return isSnapshot() == false && version.matches(".*(-alpha\\d+)|(-beta\\d+)|(-rc\\d+)") == false;
     }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlConfigIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlConfigIndex.java
@@ -34,7 +34,7 @@ public static String indexName() {
     public static String mapping() {
         return TemplateUtils.loadTemplate(
             "/ml/config_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(CONFIG_INDEX_MAPPINGS_VERSION))
         );

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java
@@ -32,7 +32,7 @@ public static String indexName() {
     public static String mapping() {
         return TemplateUtils.loadTemplate(
             "/ml/meta_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(META_INDEX_MAPPINGS_VERSION))
         );

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlStatsIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlStatsIndex.java
@@ -40,7 +40,7 @@ public static String wrappedMapping() {
     public static String mapping() {
         return TemplateUtils.loadTemplate(
             "/ml/stats_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(STATS_INDEX_MAPPINGS_VERSION))
         );

diff --git a/...lugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java b/...lugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java
@@ -213,7 +213,7 @@ public static void createAnnotationsIndexIfNecessary(
     public static String annotationsMapping() {
         return TemplateUtils.loadTemplate(
             "/ml/annotations_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(ANNOTATION_INDEX_MAPPINGS_VERSION))
         );

diff --git a/...n/java/org/elasticsearch/xpack/core/ml/inference/persistence/InferenceIndexConstants.java b/...n/java/org/elasticsearch/xpack/core/ml/inference/persistence/InferenceIndexConstants.java
@@ -51,7 +51,7 @@ public final class InferenceIndexConstants {
     public static String mapping() {
         return TemplateUtils.loadTemplate(
             "/ml/inference_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(INFERENCE_INDEX_MAPPINGS_VERSION))
         );

diff --git a/.../src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java b/.../src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java
@@ -137,7 +137,7 @@ public static String wrappedResultsMapping() {
     public static String resultsMapping() {
         return TemplateUtils.loadTemplate(
             RESOURCE_PATH + "results_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             RESULTS_MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(RESULTS_INDEX_MAPPINGS_VERSION))
         );

diff --git a/.../core/src/main/java/org/elasticsearch/xpack/core/ml/notifications/NotificationsIndex.java b/.../core/src/main/java/org/elasticsearch/xpack/core/ml/notifications/NotificationsIndex.java
@@ -24,7 +24,7 @@ private NotificationsIndex() {}
     public static String mapping() {
         return TemplateUtils.loadTemplate(
             RESOURCE_PATH + "notifications_index_mappings.json",
-            Build.current().version(), // Only needed for BWC with pre-8.10.0 nodes
+            Build.current().unqualifiedVersion(), // Only needed for BWC with pre-8.10.0 nodes
             MAPPINGS_VERSION_VARIABLE,
             Map.of("xpack.ml.managed.index.version", Integer.toString(NOTIFICATIONS_INDEX_MAPPINGS_VERSION))
         );