Improve support for relationship & cleanup

Author: dgarros

infrahub_sdk/ctl/menu.py

@@ -40,13 +40,8 @@ async def load(
     files = load_yamlfile_from_disk_and_exit(paths=menus, file_type=MenuFile, console=console)
     client = await initialize_client()
 
-    default_kind = "CoreMenuItem"
-
     for file in files:
         file.validate_content()
-        if not file.spec.kind:
-            file.spec.kind = default_kind
-
         schema = await client.schema.get(kind=file.spec.kind, branch=branch)
 
         for idx, item in enumerate(file.spec.data):
@@ -55,6 +50,6 @@ async def load(
                 schema=schema,
                 data=item,
                 branch=branch,
-                default_schema_kind=default_kind,
+                default_schema_kind=file.spec.kind,
                 context={"list_index": idx},
             )

infrahub_sdk/ctl/object.py

@@ -1,11 +1,11 @@
+import logging
 from pathlib import Path
 
 import typer
 from rich.console import Console
 
 from infrahub_sdk.async_typer import AsyncTyper
 from infrahub_sdk.ctl.client import initialize_client
-from infrahub_sdk.ctl.exceptions import FileNotValidError
 from infrahub_sdk.ctl.utils import catch_exception, init_logging
 from infrahub_sdk.spec.object import ObjectFile
 
@@ -35,13 +35,13 @@ async def load(
 
     init_logging(debug=debug)
 
+    logging.getLogger("infrahub_sdk").setLevel(logging.INFO)
+
     files = load_yamlfile_from_disk_and_exit(paths=paths, file_type=ObjectFile, console=console)
     client = await initialize_client()
 
     for file in files:
         file.validate_content()
-        if not file.spec.kind:
-            raise FileNotValidError(name=str(file.location), message="kind must be specified.")
         schema = await client.schema.get(kind=file.spec.kind, branch=branch)
 
         for item in file.spec.data:

infrahub_sdk/spec/menu.py

@@ -6,6 +6,8 @@
 
 
 class InfrahubMenuFileData(InfrahubObjectFileData):
+    kind: str = "CoreMenuItem"
+
     @classmethod
     def enrich_node(cls, data: dict, context: dict) -> dict:
         if "kind" in data and "path" not in data:

infrahub_sdk/spec/object.py

@@ -8,7 +8,7 @@
 
 
 class InfrahubObjectFileData(BaseModel):
-    kind: Optional[str] = None
+    kind: str
     data: list[dict[str, Any]] = Field(default_factory=list)
 
     @classmethod
@@ -35,21 +35,21 @@ async def create_node(
         remaining_rels = []
         for key, value in data.items():
             if key in schema.attribute_names:
-                # NOTE we could validate the format of the data but the API will do it as well
                 clean_data[key] = value
 
             if key in schema.relationship_names:
                 rel_schema = schema.get_relationship(name=key)
 
-                if not isinstance(value, dict) and "data" in value:
-                    raise ValueError(f"relationship {key} must be a dict with 'data'")
+                if isinstance(value, dict) and "data" not in value:
+                    raise ValueError(f"Relationship {key} must be a dict with 'data'")
 
-                if rel_schema.cardinality == "one" or rel_schema.optional is False:
-                    raise ValueError(
-                        "Not supported yet, we need to have a way to define connect object before they exist"
-                    )
-                    # clean_data[key] = value[data]
-                remaining_rels.append(key)
+                # This is a simple implementation for now, need to revisit once we have the integration tests
+                if isinstance(value, (list)):
+                    clean_data[key] = value
+                elif rel_schema.cardinality == "one" and isinstance(value, str):
+                    clean_data[key] = [value]
+                else:
+                    remaining_rels.append(key)
 
         if context:
             clean_context = {