Add work on adding subcomponent validation to integrations

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

scripts/integrations-cli/integrations_cli/helpers/validate.py

@@ -1,5 +1,7 @@
 import jsonschema
 from returns.result import Failure, Result, safe
+from returns.pipeline import is_successful
+import os
 
 from .constants import SCHEMAS
 
@@ -15,9 +17,20 @@ def validate_instance(instance: dict, schema: dict) -> dict:
     return instance
 
 
-def validate_config(config: dict) -> Result[dict, Exception]:
+def validate_config(config: dict, name: str) -> Result[dict, Exception]:
     try:
-        return validate_instance(config, SCHEMAS["integration.schema"])
+        result = validate_instance(config, SCHEMAS["integration.schema"])
+        if not is_successful(result):
+            return result
+        # TODO assumes component is named same thing as mapping
+        # This is not true for e.g. logs
+        # Need to load catalog to see what the expected name is
+
+        # for component in config["components"]:
+        #     path = os.path.join(f"integrations/{name}/schema", f"{component}.mapping")
+        #     if not os.path.exists(path):
+        #         return Failure(FileNotFoundError(f"Component `{component}` is absent from schema"))
+        return result
     except KeyError as err:
         return Failure(err)
 

scripts/integrations-cli/integrations_cli/main.py

@@ -92,10 +92,10 @@ def create(name: str):
     click.echo(colored(f"Integration created at '{integration_path}'", "green"))
 
 
-def validate_component(path: str, validator) -> Result[dict, Exception]:
+def validate_component(path: str, name: str, validator) -> Result[dict, Exception]:
     with open(path, "r", encoding="utf-8") as item_data:
         loaded = json.load(item_data)
-        result = validator(loaded)
+        result = validator(loaded, name)
         if not is_successful(result):
             msg = str(result.failure)
             msg = ("> " + msg).replace("\n", "\n> ")
@@ -109,7 +109,7 @@ def full_integration_is_valid(name: str) -> bool:
     encountered_errors = False
     for item, validator in integration_parts.items():
         item_path = os.path.join(integration_path, item)
-        if not is_successful(validate_component(item_path, validator)):
+        if not is_successful(validate_component(item_path, name, validator)):
             encountered_errors = True
     return not encountered_errors