extend character validations for model,fields,tags and measurements n…

…ames , fix #392
regel · Nov 7, 2020 · 351e721 · 351e721
1 parent 0008bae
commit 351e721
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/loudml/model.py b/loudml/model.py
@@ -77,9 +77,9 @@ class Feature:
     SCHEMA = Schema({
         Required('name'): All(schemas.key, Length(max=256)),
         Required('metric'): All(schemas.key, Length(max=256)),
-        Required('field'): All(schemas.dotted_key, Length(max=256)),
+        Required('field'): All(schemas.key, Length(max=256)),
         'bucket': Any(None, schemas.key),
-        'measurement': Any(None, schemas.dotted_key),
+        'measurement': Any(None, schemas.key),
         'match_all': Any(None, Schema([
             {Required(schemas.key): Any(
                 int,
@@ -157,13 +157,13 @@ class FeatureTemplate(Feature):
             All(schemas.bracket_key, Length(max=256)),
         ),
         Required('field'): Any(
-            All(schemas.dotted_key, Length(max=256)),
+            All(schemas.key, Length(max=256)),
             All(schemas.bracket_key, Length(max=256)),
         ),
         'bucket': Any(
             None, schemas.key, schemas.bracket_key),
         'measurement': Any(
-            None, schemas.dotted_key, schemas.bracket_key),
+            None, schemas.key, schemas.bracket_key),
         'match_all': Any(
             None,
             Schema([

diff --git a/loudml/schemas.py b/loudml/schemas.py
@@ -28,7 +28,7 @@
 key = All(
     str,
     Length(min=1),
-    Match("^[a-zA-Z0-9-_@]+$"),
+    Match("^[a-zA-Z0-9-_@\/\[\]{}:;,.|=%\"\$]+$"),
 )
 
 time_str_key = All(
@@ -37,12 +37,6 @@
     Match("^[:0-9]+$"),
 )
 
-dotted_key = All(
-    str,
-    Length(min=1),
-    Match("^[a-zA-Z0-9-_@.]+$"),
-)
-
 bracket_key = All(
     str,
     Length(min=1),

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -37,11 +37,6 @@ def test_validate_feature(self):
         )
 
         # Invalid
-        self.invalid_feature(
-            name="foo/invalid",
-            field="bar",
-            metric="avg",
-        )
         self.invalid_feature(
             metric="avg",
             field="bar",

diff --git a/tests/test_schemas.py b/tests/test_schemas.py
@@ -22,10 +22,15 @@ def test_key(self):
         self.valid("Foo-Bar")
         self.valid("00_foo_00_bar_001")
         self.valid("_foo")
+        self.valid("traffic.rxt_et-1/0/0")
+        self.valid("traffic.rxt_et-[1/0/0]")
+        self.valid("traffic.rxt_et-{1/0/0}")
+        self.valid("traffic.rxt_et-00:11:11")
+        self.valid("traffic.rxt_et=adfa")
+        self.valid("traffic.rxt_et=\"foo\"")
+        self.valid("traffic.rxt_et=${value}")
 
         self.invalid("")
-        self.invalid("foo/bar")
-        self.invalid(".foo")
 
     def test_timestamp(self):
         self.schema = schemas.Timestamp()