Giving informative error messages for double slashes in API call URLs…

…- [ BACKPORT-1.x ] (opensearch-project#1601) * Integration test that checks for settings upgrade (opensearch-project#1482) * Made changes. Signed-off-by: Megha Sai Kavikondala <[email protected]> * Signed-off-by: Megha Sai Kavikondala <[email protected]> Changes made by deleting the TestSettingsIT file and adding new lines in FullClusterRestartSettingsUpgradeIT.java Signed-off-by: Megha Sai Kavikondala <[email protected]> * Signed-off-by: Megha Sai Kavikondala <[email protected]> Informative error messages related to empty index name.[Backport]
mch2 · Nov 23, 2021 · 83e005b · 83e005b
1 parent dc14994
commit 83e005b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -250,6 +250,9 @@ public static void validateIndexOrAliasName(String index, BiFunction<String, Str
         if (!Strings.validFileName(index)) {
             throw exceptionCtor.apply(index, "must not contain the following characters " + Strings.INVALID_FILENAME_CHARS);
         }
+        if (index.isEmpty()) {
+            throw exceptionCtor.apply(index, "must not be empty");
+        }
         if (index.contains("#")) {
             throw exceptionCtor.apply(index, "must not contain '#'");
         }

diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -626,6 +626,8 @@ public void testValidateIndexName() throws Exception {
             validateIndexName(checkerService, "..", "must not be '.' or '..'");
 
             validateIndexName(checkerService, "foo:bar", "must not contain ':'");
+
+            validateIndexName(checkerService, "", "Invalid index name [], must not be empty");
         }));
     }