Merge pull request #982 from opsmill/stable

Merge stable into develop

Author: ogenstad

changelog/908.fixed.md

@@ -0,0 +1 @@
+Skip mandatory field validation during object loading when `object_profile` is specified.

infrahub_sdk/pytest_plugin/loader.py

@@ -37,7 +37,7 @@
     "PythonTransform": "get_python_transform",
 }
 
-ITEMS_MAPPING = {
+ITEMS_MAPPING: dict[str, type[InfrahubItem]] = {
     "check-smoke": InfrahubCheckSmokeItem,
     "check-unit-process": InfrahubCheckUnitProcessItem,
     "check-integration": InfrahubCheckIntegrationItem,
@@ -71,7 +71,7 @@ def collect_group(self, group: InfrahubTestGroup) -> Iterable[pytest.Item]:
         resource_config = self.get_resource_config(group)
 
         for test in group.tests:
-            item_class: type[pytest.Item] = ITEMS_MAPPING[test.spec.kind]  # type: ignore[assignment]
+            item_class = ITEMS_MAPPING[test.spec.kind]
             item: InfrahubItem = item_class.from_parent(
                 name=f"{marker.markname}__{group.resource_name}__{test.name}",
                 parent=self,

infrahub_sdk/spec/object.py

@@ -267,9 +267,9 @@ async def validate_object(
         context = context.copy() if context else {}
 
         # First validate if all mandatory fields are present
-        # Skip mandatory check when an object_template is specified, as the template provides defaults, we expect the API server to just send a
-        # response with a failure if the template is not valid or doesn't provide all mandatory fields
-        if "object_template" not in data:
+        # Skip mandatory check when an object_template or object_profile is specified, as the template/profile provides defaults;
+        # we expect the API server to return a failure if the template/profile is not valid or doesn't provide all mandatory fields
+        if "object_template" not in data and "object_profile" not in data:
             errors.extend(
                 ObjectValidationError(position=[*position, element], message=f"{element} is mandatory")
                 for element in schema.mandatory_input_names

tests/unit/sdk/spec/test_object.py

@@ -472,3 +472,18 @@ async def test_validate_object_skips_mandatory_check_with_object_template(
 
     mandatory_errors = [e for e in errors if e.message == "type is mandatory"]
     assert mandatory_errors == []
+
+
+async def test_validate_object_skips_mandatory_check_with_object_profile(
+    client_with_schema_01: InfrahubClient,
+) -> None:
+    """When object_profile is present, mandatory field validation should be skipped."""
+    schema = await client_with_schema_01.schema.get(kind="BuiltinLocation")
+
+    data = {"name": "Site1", "object_profile": "Standard Site"}
+    errors = await InfrahubObjectFileData.validate_object(
+        client=client_with_schema_01, position=[1], schema=schema, data=data
+    )
+
+    mandatory_errors = [e for e in errors if e.message == "type is mandatory"]
+    assert mandatory_errors == []