Eliminate include validation (#32)

* eliminate include validation

* black

* bump version

ocsf_validator/matchers.py

@@ -102,14 +102,6 @@ def get_type(self):
         return OcsfExtension
 
 
-class IncludeMatcher(RegexMatcher, TypeMatcher):
-    def __init__(self):
-        self._pattern = re.compile(r".*includes/.*.json")
-
-    def get_type(self):
-        return OcsfInclude
-
-
 class ProfileMatcher(RegexMatcher, TypeMatcher):
     def __init__(self):
         self._pattern = re.compile(r".*profiles/.*.json")

ocsf_validator/processor.py

@@ -72,7 +72,7 @@ def resolve_include(
         for file in filenames:
             if relative_to is not None:
                 # Search extension for relative include path,
-                # e.g. /includes/thing.json -> /extensions/stuff/includes/thing.json
+                # e.g. /profiles/thing.json -> /extensions/stuff/profiles/thing.json
                 extn = self._types.extension(relative_to)
                 if extn is not None:
                     k = self._reader.key("extensions", extn, file)

ocsf_validator/type_mapping.py

@@ -9,8 +9,6 @@
     VersionMatcher(),
     DictionaryMatcher(),
     CategoriesMatcher(),
-    IncludeMatcher(),
-    CategoriesMatcher(),
     ProfileMatcher(),
     ObjectMatcher(),
     EventMatcher(),

ocsf_validator/validators.py

@@ -27,7 +27,6 @@
     DictionaryMatcher,
     EventMatcher,
     ExtensionMatcher,
-    IncludeMatcher,
     ObjectMatcher,
     ProfileMatcher,
 )
@@ -49,7 +48,6 @@
 
 METASCHEMA_MATCHERS = {
     "event.schema.json": EventMatcher(),
-    "include.schema.json": IncludeMatcher(),
     "object.schema.json": ObjectMatcher(),
     "profile.schema.json": ProfileMatcher(),
     "categories.schema.json": CategoriesMatcher(),
@@ -231,9 +229,7 @@ def validate(reader: Reader, file: str):
 
     reader.apply(
         validate,
-        AnyMatcher(
-            [ObjectMatcher(), EventMatcher(), ProfileMatcher(), IncludeMatcher()]
-        ),
+        AnyMatcher([ObjectMatcher(), EventMatcher(), ProfileMatcher()]),
     )
 
 
@@ -374,9 +370,7 @@ def validate(reader: Reader, file: str):
 
     reader.apply(
         validate,
-        AnyMatcher(
-            [ObjectMatcher(), EventMatcher(), ProfileMatcher(), IncludeMatcher()]
-        ),
+        AnyMatcher([ObjectMatcher(), EventMatcher(), ProfileMatcher()]),
     )
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ocsf-validator"
-version = "0.2.0"
+version = "0.2.1"
 description = "OCSF Schema Validation"
 authors = [
     "Jeremy Fisher <[email protected]>",

tests/test_dependencies.py

@@ -27,11 +27,11 @@ def test_include_one():
     net["name"] = "network"
     net["name2"] = "network"
     httpa = event("http_activity")
-    httpa["$include"] = "includes/network.json"
+    httpa["$include"] = "profiles/network.json"
 
     s = {
         "/events/network/http_activity.json": httpa,
-        "/includes/network.json": net,
+        "/profiles/network.json": net,
         "/dictionary.json": attributes(["stuff"]),
     }
 
@@ -49,11 +49,11 @@ def test_include_many():
     net = attributes(["proxy", "src_ip"])
     thing = attributes(["dest_ip", "score"])
     httpa = event("http_activity")
-    httpa["$include"] = ["includes/network.json", "events/thing.json"]
+    httpa["$include"] = ["profiles/network.json", "events/thing.json"]
 
     s = {
         "/events/network/http_activity.json": httpa,
-        "/includes/network.json": net,
+        "/profiles/network.json": net,
         "/events/thing.json": thing,
         "/dictionary.json": attributes(["stuff"]),
     }
@@ -72,11 +72,11 @@ def test_include_attrs():
     net = attributes(["proxy", "src_ip"])
     thing = attributes(["dest_ip", "score"])
     httpa = event("http_activity")
-    httpa["attributes"]["$include"] = ["includes/network.json", "events/thing.json"]
+    httpa["attributes"]["$include"] = ["profiles/network.json", "events/thing.json"]
 
     s = {
         "/events/network/http_activity.json": httpa,
-        "/includes/network.json": net,
+        "/profiles/network.json": net,
         "/events/thing.json": thing,
         "/dictionary.json": attributes(["stuff"]),
     }
@@ -93,7 +93,7 @@ def test_include_attrs():
 
 def test_missing_include():
     httpa = event("http_activity")
-    httpa["attributes"]["$include"] = "includes/network.json"
+    httpa["attributes"]["$include"] = "profiles/network.json"
 
     s = {
         "/events/network/http_activity.json": httpa,