add AttributeKindChecker to aggregated constraints (#5460)

* add AttributeKindChecker to aggregated constraints

* add missing validate_format methods

* add changelog

backend/infrahub/core/attribute.py

@@ -1163,6 +1163,17 @@ def deserialize_value(self, data: AttributeFromDB) -> Any:
             return ujson.loads(data.value)
         return data.value
 
+    @classmethod
+    def validate_format(cls, value: Any, name: str, schema: AttributeSchema) -> None:
+        value_to_check = value
+
+        if isinstance(value, str):
+            try:
+                value_to_check = cls.deserialize_from_string(value_as_string=value)
+            except ujson.JSONDecodeError as exc:
+                raise ValidationError({name: f"{value} is not a valid JSON list"}) from exc
+        super().validate_format(value=value_to_check, name=name, schema=schema)
+
 
 class ListAttributeOptional(ListAttribute):
     value: Optional[list[Any]]
@@ -1188,6 +1199,17 @@ def deserialize_value(self, data: AttributeFromDB) -> Any:
             return ujson.loads(data.value)
         return data.value
 
+    @classmethod
+    def validate_format(cls, value: Any, name: str, schema: AttributeSchema) -> None:
+        value_to_check = value
+
+        if isinstance(value, str):
+            try:
+                value_to_check = cls.deserialize_from_string(value_as_string=value)
+            except ujson.JSONDecodeError as exc:
+                raise ValidationError({name: f"{value} is not valid JSON"}) from exc
+        super().validate_format(value=value_to_check, name=name, schema=schema)
+
 
 class JSONAttributeOptional(JSONAttribute):
     value: Optional[Union[dict, list]]

backend/infrahub/core/validators/attribute/kind.py

@@ -67,7 +67,7 @@ async def get_paths(self) -> GroupedDataPaths:
             if value in (None, NULL_VALUE):
                 continue
             try:
-                infrahub_attribute_class.validate(
+                infrahub_attribute_class.validate_format(
                     value=result.get("attribute_value"), name=self.attribute_schema.name, schema=self.attribute_schema
                 )
             except ValidationError:

backend/infrahub/dependencies/builder/constraint/schema/aggregated.py

@@ -3,6 +3,7 @@
 
 from .attribute_choices import SchemaAttributeChoicesConstraintDependency
 from .attribute_enum import SchemaAttributeEnumConstraintDependency
+from .attribute_kind import SchemaAttributeKindConstraintDependency
 from .attribute_length import SchemaAttributLengthConstraintDependency
 from .attribute_optional import SchemaAttributeOptionalConstraintDependency
 from .attribute_regex import SchemaAttributeRegexConstraintDependency
@@ -32,6 +33,7 @@ def build(cls, context: DependencyBuilderContext) -> AggregatedConstraintChecker
                 SchemaAttributeChoicesConstraintDependency.build(context=context),
                 SchemaAttributeEnumConstraintDependency.build(context=context),
                 SchemaAttributLengthConstraintDependency.build(context=context),
+                SchemaAttributeKindConstraintDependency.build(context=context),
                 SchemaNodeAttributeAddConstraintDependency.build(context=context),
                 SchemaNodeRelationshipAddConstraintDependency.build(context=context),
             ],

backend/infrahub/dependencies/builder/constraint/schema/attribute_kind.py

@@ -0,0 +1,8 @@
+from infrahub.core.validators.attribute.kind import AttributeKindChecker
+from infrahub.dependencies.interface import DependencyBuilder, DependencyBuilderContext
+
+
+class SchemaAttributeKindConstraintDependency(DependencyBuilder[AttributeKindChecker]):
+    @classmethod
+    def build(cls, context: DependencyBuilderContext) -> AttributeKindChecker:
+        return AttributeKindChecker(db=context.db, branch=context.branch)

changelog/5460.fixed.md

@@ -0,0 +1 @@
+Validate updates to an attribute's `kind` when loading a new schema