From a0c21f853fa4979d3eea2a02efb3104dddf74362 Mon Sep 17 00:00:00 2001
From: Simon Cooper <simon.cooper@elastic.co>
Date: Wed, 14 Feb 2024 09:24:25 +0000
Subject: [PATCH] Map old release version id directly to their version, don't
 specify a range (#105335)

---
 .../src/main/java/org/elasticsearch/ReleaseVersions.java   | 7 ++++---
 .../test/java/org/elasticsearch/ReleaseVersionsTests.java  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/ReleaseVersions.java b/server/src/main/java/org/elasticsearch/ReleaseVersions.java
index 6e7cf6c428cd6..7b5c8d1d42382 100644
--- a/server/src/main/java/org/elasticsearch/ReleaseVersions.java
+++ b/server/src/main/java/org/elasticsearch/ReleaseVersions.java
@@ -105,14 +105,15 @@ private static IntFunction<String> lookupFunction(NavigableMap<Integer, List<Ver
                     // the next version is just a guess - might be a newer revision, might be a newer minor or major...
                     lowerBound = nextVersion(lastItem(lowerRange.getValue())).toString();
                 } else {
-                    // a really old version we don't otherwise know about
-                    // assume it's an old version id
+                    // a really old version we don't have a record for
+                    // assume it's an old version id - we can just return it directly
                     // this will no longer be the case with ES 10 (which won't know about ES v8.x where we introduced separated versions)
+                    // maybe keep the release mapping around in the csv file?
                     // SEP for now
                     @UpdateForV9
                     // @UpdateForV10
                     Version oldVersion = Version.fromId(id);
-                    lowerBound = oldVersion.toString();
+                    return oldVersion.toString();
                 }
 
                 var upperRange = versions.higherEntry(id);
diff --git a/server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java b/server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java
index cee43954e9ce7..b80e953bd8aea 100644
--- a/server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java
+++ b/server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java
@@ -29,7 +29,7 @@ public void testReturnsRange() {
         IntFunction<String> versions = ReleaseVersions.generateVersionsLookup(ReleaseVersionsTests.class);
 
         assertThat(versions.apply(17), equalTo("8.1.2-8.2.0"));
-        assertThat(versions.apply(9), equalTo("0.0.0-8.0.0"));
+        assertThat(versions.apply(9), equalTo("0.0.0"));
         assertThat(versions.apply(24), equalTo("8.2.2-snapshot[24]"));
     }
 }