From 12a229410c9102412fc3a1891d1bb54f18d4cbbf Mon Sep 17 00:00:00 2001
From: Megha Sai Kavikondala <kavmegha@amazon.com>
Date: Mon, 22 Nov 2021 15:01:39 -0800
Subject: [PATCH] Giving informative error messages for double slashes in API
 call URLs (#1568)

* Signed-off-by: Megha Sai Kavikondala <kavmegha@amazon.com>

Changes related to Informative error messages.

* Signed-off-by: Megha Sai Kavikondala <kavmegha@amazon.com>

Spotless changes

* Signed-off-by: Megha Sai Kavikondala <kavmegha@amazon.com>

naming and message changes.

Signed-off-by: Megha Sai Kavikondala <kavmegha@amazon.com>

* Signed-off-by: Megha Sai Kavikondala <kavmegha@amazon.com>

Deleting the log message.
---
 .../cluster/metadata/MetadataCreateIndexService.java           | 3 +++
 .../cluster/metadata/MetadataCreateIndexServiceTests.java      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
index a923e6d0b9dc1..3f3446a08c8b8 100644
--- 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
index eaf1c2488e1f7..0405773871555 100644
--- 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");
         }));
     }