Add some relatively trivial validation tests

Mostly just to capture some corner cases for BWC reasons
elastic · Oct 8, 2021 · 3a2c57a · 3a2c57a
1 parent 938cc41
commit 3a2c57a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DataTier.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DataTier.java
@@ -175,7 +175,7 @@ public Settings getAdditionalIndexSettings(String indexName, boolean isDataStrea
         }
     }
 
-    private static final class DataTierSettingValidator implements Setting.Validator<String> {
+    static final class DataTierSettingValidator implements Setting.Validator<String> {
 
         private static final Collection<Setting<?>> dependencies = List.of(
             IndexModule.INDEX_STORE_TYPE_SETTING,

diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DataTierTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DataTierTests.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodeRole;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.cluster.routing.allocation.DataTier.DataTierSettingValidator;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.NodeRoleSettings;
@@ -152,4 +153,22 @@ private static List<DiscoveryNode> randomNodes(final int numNodes) {
         }
         return nodesList;
     }
+
+    public void testDataTierSettingValidator() {
+        DataTierSettingValidator validator = new DataTierSettingValidator();
+
+        // good values
+        validator.validate(null);
+        validator.validate("");
+        validator.validate(" ");
+        validator.validate(DATA_WARM);
+        validator.validate(DATA_WARM + "," + DATA_HOT);
+        validator.validate(DATA_WARM + ","); // a little surprising
+
+        // bad values
+        expectThrows(IllegalArgumentException.class, () -> validator.validate(" " + DATA_WARM));
+        expectThrows(IllegalArgumentException.class, () -> validator.validate(DATA_WARM + " "));
+        expectThrows(IllegalArgumentException.class, () -> validator.validate(DATA_WARM + ", "));
+        expectThrows(IllegalArgumentException.class, () -> validator.validate(DATA_WARM + ", " + DATA_HOT));
+    }
 }