Merge pull request #6637 from opsmill/pog-forbid-overwriting-generic-numberpool

Forbid overriding a generic numberpool at a node level

Author: ogenstad

backend/infrahub/core/schema/schema_branch.py

@@ -1044,11 +1044,7 @@ def validate_attribute_parameters(self) -> None:
         for name in self.nodes.keys():
             node_schema = self.get_node(name=name, duplicate=False)
             for attribute in node_schema.attributes:
-                if (
-                    attribute.kind == "NumberPool"
-                    and isinstance(attribute.parameters, NumberPoolParameters)
-                    and not attribute.parameters.number_pool_id
-                ):
+                if attribute.kind == "NumberPool" and isinstance(attribute.parameters, NumberPoolParameters):
                     self._validate_number_pool_parameters(
                         node_schema=node_schema, attribute=attribute, number_pool_parameters=attribute.parameters
                     )
@@ -1064,7 +1060,7 @@ def _validate_number_pool_parameters(
                 f"{node_schema.kind}.{attribute.name} is a NumberPool it has to be a read_only attribute"
             )
 
-        if attribute.inherited:
+        if attribute.inherited and not number_pool_parameters.number_pool_id:
             generics_with_attribute = []
             for generic_name in node_schema.inherit_from:
                 generic_schema = self.get_generic(name=generic_name, duplicate=False)
@@ -1078,9 +1074,16 @@ def _validate_number_pool_parameters(
                 raise ValidationError(
                     f"{node_schema.kind}.{attribute.name} is a NumberPool inherited from more than one generic"
                 )
+        elif not attribute.inherited:
+            for generic_name in node_schema.inherit_from:
+                generic_schema = self.get_generic(name=generic_name, duplicate=False)
+                if attribute.name in generic_schema.attribute_names:
+                    raise ValidationError(
+                        f"Overriding '{node_schema.kind}.{attribute.name}' NumberPool attribute from generic '{generic_name}' is not supported"
+                    )
 
-        else:
-            number_pool_parameters.number_pool_id = str(uuid4())
+            if not number_pool_parameters.number_pool_id:
+                number_pool_parameters.number_pool_id = str(uuid4())
 
     def validate_computed_attributes(self) -> None:
         self.computed_attributes = ComputedAttributes()

backend/tests/unit/core/schema/test_attribute_parameters.py

@@ -9,7 +9,7 @@
 from infrahub.core.node import Node
 from infrahub.core.node.resource_manager.number_pool import CoreNumberPool
 from infrahub.core.registry import registry
-from infrahub.core.schema import NodeSchema, SchemaRoot
+from infrahub.core.schema import GenericSchema, NodeSchema, SchemaRoot
 from infrahub.core.schema.attribute_parameters import (
     NumberAttributeParameters,
     NumberPoolParameters,
@@ -117,6 +117,51 @@ def test_number_pool_read_only() -> None:
         schema_branch.process()
 
 
+def test_number_pool_override_generic() -> None:
+    node_schema_definition: dict[str, Any] = {
+        "name": "NumberAttribute",
+        "namespace": "Test",
+        "inherit_from": ["BaseNumberAttribute"],
+        "attributes": [
+            {"name": "name", "kind": "Text", "unique": True},
+            {
+                "name": "number",
+                "kind": "NumberPool",
+                "optional": False,
+                "unique": True,
+                "read_only": True,
+                "parameters": {"start_range": 16, "end_range": 25},
+            },
+        ],
+    }
+    node_schema = NodeSchema(**node_schema_definition)
+    generic_node_schema_definition: dict[str, Any] = {
+        "name": "NumberAttribute",
+        "namespace": "Base",
+        "attributes": [
+            {"name": "name", "kind": "Text", "unique": True},
+            {
+                "name": "number",
+                "kind": "NumberPool",
+                "optional": False,
+                "unique": True,
+                "read_only": True,
+                "parameters": {"start_range": 10, "end_range": 25},
+            },
+        ],
+    }
+    generic_schema = GenericSchema(**generic_node_schema_definition)
+
+    schema = SchemaRoot(nodes=[node_schema], generics=[generic_schema])
+    schema_branch = SchemaBranch(cache={})
+    schema_branch.load_schema(schema=schema)
+    with pytest.raises(
+        ValidationError,
+        match="Overriding 'TestNumberAttribute.number' NumberPool attribute from generic 'BaseNumberAttribute' is not supported",
+    ):
+        schema_branch.process()
+
+
 def test_number_pool_assign_from_generics() -> None:
     schema = SchemaRoot(generics=[SNOW_TASK], nodes=[SNOW_INCIDENT, SNOW_REQUEST])
     schema_branch = SchemaBranch(cache={})