Merge branch 'release-1.2' into dga-20250309-stable-2-release

Author: dgarros

backend/infrahub/core/schema/schema_branch.py

@@ -1833,12 +1833,11 @@ def add_relationships_to_template(self, node: NodeSchema) -> None:
         template_schema.relationships = [
             r for r in template_schema.relationships if r.kind == RelationshipKind.TEMPLATE
         ]
+        # Tell if the user explicitely requested this template
+        is_autogenerated_subtemplate = node.generate_template is False
 
         for relationship in node.relationships:
-            if relationship.peer in [
-                InfrahubKind.GENERICGROUP,
-                InfrahubKind.PROFILE,
-            ] or relationship.kind not in [
+            if relationship.peer in [InfrahubKind.GENERICGROUP, InfrahubKind.PROFILE] or relationship.kind not in [
                 RelationshipKind.COMPONENT,
                 RelationshipKind.PARENT,
                 RelationshipKind.ATTRIBUTE,
@@ -1856,8 +1855,9 @@ def add_relationships_to_template(self, node: NodeSchema) -> None:
                     name=relationship.name,
                     peer=rel_template_peer,
                     kind=relationship.kind,
-                    optional=relationship.kind
-                    in [RelationshipKind.COMPONENT, RelationshipKind.ATTRIBUTE, RelationshipKind.GENERIC],
+                    optional=relationship.optional
+                    if is_autogenerated_subtemplate
+                    else relationship.kind != RelationshipKind.PARENT,
                     cardinality=relationship.cardinality,
                     branch=relationship.branch,
                     identifier=self._generate_identifier_string(template_schema.kind, rel_template_peer),
@@ -1928,12 +1928,15 @@ def generate_object_template_from_node(
                 if inherited in need_template_kinds:
                     template.inherit_from.append(self._get_object_template_kind(node_kind=inherited))
 
+        # Tell if the user explicitely requested this template
+        is_autogenerated_subtemplate = node.generate_template is False
         for node_attr in node.attributes:
             if node_attr.unique:
                 continue
 
             attr = AttributeSchema(
-                optional=True, **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only", "inherited"])
+                optional=node_attr.optional if is_autogenerated_subtemplate else True,
+                **node_attr.model_dump(exclude=["id", "unique", "optional", "read_only", "inherited"]),
             )
             template.attributes.append(attr)
 

backend/infrahub/message_bus/messages/__init__.py

@@ -1,12 +1,7 @@
 from infrahub.message_bus import InfrahubMessage, InfrahubResponse
 
 from .check_generator_run import CheckGeneratorRun
-from .event_branch_create import EventBranchCreate
-from .event_branch_delete import EventBranchDelete
 from .event_branch_merge import EventBranchMerge
-from .event_branch_rebased import EventBranchRebased
-from .event_node_mutated import EventNodeMutated
-from .event_schema_update import EventSchemaUpdate
 from .event_worker_newprimaryapi import EventWorkerNewPrimaryAPI
 from .finalize_validator_execution import FinalizeValidatorExecution
 from .git_file_get import GitFileGet, GitFileGetResponse
@@ -21,12 +16,7 @@
 
 MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
     "check.generator.run": CheckGeneratorRun,
-    "event.branch.create": EventBranchCreate,
-    "event.branch.delete": EventBranchDelete,
     "event.branch.merge": EventBranchMerge,
-    "event.branch.rebased": EventBranchRebased,
-    "event.node.mutated": EventNodeMutated,
-    "event.schema.update": EventSchemaUpdate,
     "event.worker.new_primary_api": EventWorkerNewPrimaryAPI,
     "finalize.validator.execution": FinalizeValidatorExecution,
     "git.file.get": GitFileGet,
@@ -49,7 +39,7 @@
     "check.artifact.create": 2,
     "check.repository.check_definition": 2,
     "check.repository.merge_conflicts": 2,
-    "event.branch.create": 5,
+    "send.echo.request": 5,  # Currently only for testing purposes, will be removed once all message bus have been migrated to prefect
     "event.branch.delete": 5,
     "event.branch.merge": 5,
     "event.schema.update": 5,

backend/infrahub/message_bus/messages/event_branch_create.py

@@ -18,8 +18,6 @@
 COMMAND_MAP = {
     "check.generator.run": check.generator.run,
     "event.branch.merge": event.branch.merge,
-    "event.node.mutated": event.node.mutated,
-    "event.schema.update": event.schema.update,
     "event.worker.new_primary_api": event.worker.new_primary_api,
     "finalize.validator.execution": finalize.validator.execution,
     "git.file.get": git.file.get,

backend/infrahub/message_bus/messages/event_branch_delete.py

@@ -1,3 +1,3 @@
-from . import branch, node, schema, worker
+from . import branch, worker
 
-__all__ = ["branch", "node", "schema", "worker"]
+__all__ = ["branch", "worker"]