Handle preliminary end

danielmitterdorfer · Jul 17, 2023 · edf0a95 · edf0a95
1 parent 9d3d546
commit edf0a95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...plugin/profiler/src/main/java/org/elasticsearch/xpack/profiler/ProfilingIndexManager.java b/...plugin/profiler/src/main/java/org/elasticsearch/xpack/profiler/ProfilingIndexManager.java
@@ -360,7 +360,8 @@ public boolean isMatchWithoutVersion(String indexName) {
 
         private boolean isVersionNumber(String name, int startIndex) {
             final int versionNumberLength = 3;
-            return name.substring(startIndex, startIndex + versionNumberLength).chars().allMatch(Character::isDigit);
+            String versionNumberCandidate = name.substring(startIndex, Math.min(startIndex + versionNumberLength, name.length()));
+            return versionNumberCandidate.length() == versionNumberLength && versionNumberCandidate.chars().allMatch(Character::isDigit);
         }
 
         public boolean isMatchWithoutGeneration(String indexName) {

diff --git a/...n/profiler/src/test/java/org/elasticsearch/xpack/profiler/ProfilingIndexManagerTests.java b/...n/profiler/src/test/java/org/elasticsearch/xpack/profiler/ProfilingIndexManagerTests.java
@@ -232,6 +232,7 @@ public void testIndexMatchWithoutVersion() {
         assertTrue(idx.isMatchWithoutVersion(".profiling-test-v002"));
         assertFalse(idx.isMatchWithoutVersion(".profiling-testing-v001"));
         assertFalse(idx.isMatchWithoutVersion(".profiling-test-verbose"));
+        assertFalse(idx.isMatchWithoutVersion(".profiling-test-v"));
     }
 
     private ActionResponse verifyIndexInstalled(