Treat Setting value with empty array string as empty array

Signed-off-by: Jeongmin Yu <machenity@gmail.com>
opensearch-project · Oct 14, 2023 · 35515a7 · 35515a7
1 parent 1447d75
commit 35515a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/common/settings/Setting.java b/server/src/main/java/org/opensearch/common/settings/Setting.java
@@ -2337,11 +2337,17 @@ public static <T> Setting<List<T>> listSetting(
         if (defaultStringValue.apply(Settings.EMPTY) == null) {
             throw new IllegalArgumentException("default value function must not return null");
         }
-        Function<String, List<T>> parser = (s) -> parseableStringToList(s).stream().map(singleValueParser).collect(Collectors.toList());
+        Function<String, List<T>> parser = (s) -> isParsedAsEmptyArray(s)
+            ? Collections.emptyList()
+            : parseableStringToList(s).stream().map(singleValueParser).collect(Collectors.toList());
 
         return new ListSetting<>(key, fallbackSetting, defaultStringValue, parser, validator, properties);
     }
 
+    private static boolean isParsedAsEmptyArray(String parsableString) {
+        return parsableString.replaceAll("\\s", "").contentEquals("[\"[]\"]");
+    }
+
     private static List<String> parseableStringToList(String parsableString) {
         // fromXContent doesn't use named xcontent or deprecation.
         try (

diff --git a/server/src/test/java/org/opensearch/node/NodeRoleSettingsTests.java b/server/src/test/java/org/opensearch/node/NodeRoleSettingsTests.java
@@ -72,4 +72,10 @@ public void testUnknownNodeRoleOnly() {
         assertEquals(testRole, nodeRoles.get(0).roleName());
         assertEquals(testRole, nodeRoles.get(0).roleNameAbbreviation());
     }
+
+    public void testNodeRoleOfEmptyArrayNameShouldBeIgnored() {
+        String testRole = "[ ]";
+        Settings roleSettings = Settings.builder().put(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), testRole).build();
+        assertEquals(Collections.emptyList(), NodeRoleSettings.NODE_ROLES_SETTING.get(roleSettings));
+    }
 }