Merge branch 'develop' of github.com:opsmill/infrahub into ple-global-activities

Author: pa-lem

.github/workflows/publish-pypi.yml

@@ -1,7 +1,6 @@
 ---
 # yamllint disable rule:truthy
-name: Publish Infrahub-Server Package
-
+name: Publish Infrahub-Server, Infrahub-Testcontainers Packages
 on:
   workflow_dispatch:
     inputs:
@@ -30,39 +29,40 @@ on:
 
 jobs:
   publish_to_pypi:
-    name: "Publish Infrahub SDK to PyPI"
+    name: "Publish Infrahub-Server and Infrahub-Testcontainers to PyPI"
     runs-on: "ubuntu-22.04"
+    strategy:
+      matrix:
+        package_dir: ["", "python_testcontainers"]
     steps:
       - name: "Set up Python"
         uses: "actions/setup-python@v5"
         with:
           python-version: "3.12"
-
       - name: "Install Poetry"
         uses: "snok/install-poetry@v1"
         with:
           version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
-
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
         with:
           submodules: true
-
       - name: "Install Dependencies"
         run: "poetry install"
-
+        working-directory: ${{ matrix.package_dir }}
       - name: "Add PyPI secret"
         run: "poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}"
-
+        working-directory: ${{ matrix.package_dir }}
       - name: "Poetry build"
         run: "poetry build"
-
+        working-directory: ${{ matrix.package_dir }}
       - name: "show output"
         run: "ls -la dist/"
-
+        working-directory: ${{ matrix.package_dir }}
       - name: "Poetry push PyPI"
         if: ${{ inputs.publish }}
         run: "poetry publish"
+        working-directory: ${{ matrix.package_dir }}

.vale/styles/spelling-exceptions.txt

@@ -51,6 +51,7 @@ graphene
 graphiql
 graphql
 greymatter
+healthcheck
 hfid
 hfids
 hostname
@@ -95,6 +96,7 @@ order_weight
 openconfig
 opentelemetry
 order_by
+Postgress
 Prefetch
 profile_name
 pseudocode

backend/infrahub/api/schema.py

@@ -384,6 +384,7 @@ async def load_schema(
             request_id=request_id,
             account_id=account_session.account_id,
             branch=branch,
+            context=context,
         ),
     )
     await service.event.send(event=event)

backend/infrahub/computed_attribute/tasks.py

@@ -170,6 +170,7 @@ async def trigger_update_python_computed_attributes(
                 "object_id": node.id,
                 "computed_attribute_name": computed_attribute_name,
                 "computed_attribute_kind": computed_attribute_kind,
+                "context": context,
             },
         )
 
@@ -315,6 +316,7 @@ async def trigger_update_jinja2_computed_attributes(
                 "computed_attribute_kind": computed_attribute_kind,
                 "node_kind": computed_attribute_kind,
                 "object_id": node.id,
+                "context": context,
             },
         )
 
@@ -383,6 +385,13 @@ async def computed_attribute_setup(
                             "computed_attribute_name": computed_attribute.attribute.name,
                             "computed_attribute_kind": computed_attribute.kind,
                             "updated_fields": "{{ event.payload['fields'] | tojson }}",
+                            "context": {
+                                "__prefect_kind": "json",
+                                "value": {
+                                    "__prefect_kind": "jinja",
+                                    "template": "{{ event.payload['context'] | tojson }}",
+                                },
+                            },
                         },
                         job_variables={},
                     )
@@ -407,6 +416,7 @@ async def computed_attribute_setup(
                         "branch_name": registry.default_branch,
                         "computed_attribute_name": computed_attribute.attribute.name,
                         "computed_attribute_kind": computed_attribute.kind,
+                        "context": context,
                     },
                 )
 
@@ -448,6 +458,13 @@ async def computed_attribute_setup(
                                 "computed_attribute_name": computed_attribute.attribute.name,
                                 "computed_attribute_kind": computed_attribute.kind,
                                 "updated_fields": "{{ event.payload['fields'] | tojson }}",
+                                "context": {
+                                    "__prefect_kind": "json",
+                                    "value": {
+                                        "__prefect_kind": "jinja",
+                                        "template": "{{ event.payload['context'] | tojson }}",
+                                    },
+                                },
                             },
                             job_variables={},
                         )
@@ -474,6 +491,7 @@ async def computed_attribute_setup(
                             "branch_name": branch_name,
                             "computed_attribute_name": computed_attribute.attribute.name,
                             "computed_attribute_kind": computed_attribute.kind,
+                            "context": context,
                         },
                     )
 
@@ -565,6 +583,13 @@ async def computed_attribute_setup_python(
                             "object_id": "{{ event.resource['infrahub.node.id'] }}",
                             "computed_attribute_name": computed_attribute.computed_attribute.attribute.name,
                             "computed_attribute_kind": computed_attribute.computed_attribute.kind,
+                            "context": {
+                                "__prefect_kind": "json",
+                                "value": {
+                                    "__prefect_kind": "jinja",
+                                    "template": "{{ event.payload['context'] | tojson }}",
+                                },
+                            },
                         },
                         job_variables={},
                     )
@@ -613,6 +638,13 @@ async def computed_attribute_setup_python(
                             "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
                             "node_kind": "{{ event.resource['infrahub.node.kind'] }}",
                             "object_id": "{{ event.resource['infrahub.node.id'] }}",
+                            "context": {
+                                "__prefect_kind": "json",
+                                "value": {
+                                    "__prefect_kind": "jinja",
+                                    "template": "{{ event.payload['context'] | tojson }}",
+                                },
+                            },
                         },
                         job_variables={},
                     )
@@ -641,6 +673,7 @@ async def computed_attribute_setup_python(
                         "branch_name": branch_name,
                         "computed_attribute_name": computed_attribute.computed_attribute.attribute.name,
                         "computed_attribute_kind": computed_attribute.computed_attribute.kind,
+                        "context": context,
                     },
                 )
 

backend/infrahub/computed_attribute/triggers.py

@@ -16,6 +16,10 @@
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
                 "trigger_updates": False,
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
             },
         )
     ],
@@ -31,6 +35,10 @@
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
                 "commit": "{{ event.payload['commit'] }}",
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
             },
         )
     ],
@@ -45,6 +53,10 @@
             name=COMPUTED_ATTRIBUTE_REMOVE_PYTHON.name,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
             },
         )
     ],
@@ -58,12 +70,20 @@
             name=COMPUTED_ATTRIBUTE_SETUP.name,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
             },
         ),
         ExecuteWorkflow(
             name=COMPUTED_ATTRIBUTE_SETUP_PYTHON.name,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
             },
         ),
     ],

backend/infrahub/core/branch/tasks.py

@@ -155,7 +155,9 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
     # -------------------------------------------------------------
     # TODO Add account information
     await service.event.send(
-        event=BranchRebasedEvent(branch_name=obj.name, branch_id=str(obj.uuid), meta=EventMeta(branch=obj))
+        event=BranchRebasedEvent(
+            branch_name=obj.name, branch_id=str(obj.uuid), meta=EventMeta(branch=obj, context=context)
+        )
     )
 
 
@@ -250,7 +252,10 @@ async def delete_branch(branch: str, context: InfrahubContext, service: Infrahub
         await obj.delete(db=db)
 
         event = BranchDeletedEvent(
-            branch_name=branch, branch_id=str(obj.uuid), sync_with_git=obj.sync_with_git, meta=EventMeta(branch=obj)
+            branch_name=branch,
+            branch_id=str(obj.uuid),
+            sync_with_git=obj.sync_with_git,
+            meta=EventMeta(branch=obj, context=context),
         )
 
         await service.workflow.submit_workflow(
@@ -318,7 +323,9 @@ async def create_branch(model: BranchCreateModel, context: InfrahubContext, serv
             branch_name=obj.name,
             branch_id=str(obj.uuid),
             sync_with_git=obj.sync_with_git,
-            meta=EventMeta(branch=obj, account_id=context.account.account_id, initiator_id=WORKER_IDENTITY),
+            meta=EventMeta(
+                branch=obj, account_id=context.account.account_id, initiator_id=WORKER_IDENTITY, context=context
+            ),
         )
         await service.event.send(event=event)
 

backend/infrahub/core/changelog/models.py

@@ -9,9 +9,11 @@
 
 if TYPE_CHECKING:
     from infrahub.core.attribute import BaseAttribute
+    from infrahub.core.branch import Branch
     from infrahub.core.manager import RelationshipSchema
     from infrahub.core.query.relationship import RelationshipPeerData
     from infrahub.core.relationship.model import Relationship
+    from infrahub.database import InfrahubDatabase
 
 
 class PropertyChangelog(BaseModel):
@@ -221,6 +223,11 @@ class NodeChangelog(BaseModel):
     def parent(self) -> ChangelogNodeParent | None:
         return self._parent
 
+    @property
+    def updated_fields(self) -> list[str]:
+        """Return a list of update fields i.e. attributes and relationships"""
+        return list(self.relationships.keys()) + list(self.attributes.keys())
+
     @property
     def root_node_id(self) -> str:
         """Return the top level node_id"""
@@ -404,3 +411,50 @@ def changelog(self) -> RelationshipCardinalityOneChangelog | RelationshipCardina
                 return self.cardinality_one_relationship
             case RelationshipCardinality.MANY:
                 return self.cardinality_many_relationship
+
+
+class RelationshipChangelogGetter:
+    def __init__(self, db: InfrahubDatabase, branch: Branch) -> None:
+        self._db = db
+        self._branch = branch
+
+    async def get_changelogs(self, primary_changelog: NodeChangelog) -> list[NodeChangelog]:
+        """Return secondary changelogs based on this update
+
+        These will typically include updates to relationships on other nodes.
+        """
+        schema_branch = self._db.schema.get_schema_branch(name=self._branch.name)
+        node_schema = schema_branch.get(name=primary_changelog.node_kind)
+        secondaries: list[NodeChangelog] = []
+
+        for relationship in primary_changelog.relationships.values():
+            rel_schema = node_schema.get_relationship(name=relationship.name)
+            if isinstance(relationship, RelationshipCardinalityOneChangelog):
+                # For now this code only looks at the scenario when a cardinality=one relationship
+                # is added to a node and it has a cardinality=many relationship coming back from
+                # another node, it will be expanded to include all variations.
+                if relationship.peer_status == DiffAction.ADDED:
+                    peer_schema = schema_branch.get(name=str(relationship.peer_kind))
+                    peer_relation = peer_schema.get_relationship_by_identifier(
+                        id=str(rel_schema.identifier), raise_on_error=False
+                    )
+                    if peer_relation:
+                        node_changelog = NodeChangelog(
+                            node_id=str(relationship.peer_id),
+                            node_kind=str(relationship.peer_kind),
+                            display_label="n/a",
+                        )
+                        if peer_relation.cardinality == RelationshipCardinality.MANY:
+                            node_changelog.relationships[peer_relation.name] = RelationshipCardinalityManyChangelog(
+                                name=peer_relation.name,
+                                peers=[
+                                    RelationshipPeerChangelog(
+                                        peer_id=primary_changelog.node_id,
+                                        peer_kind=primary_changelog.node_kind,
+                                        peer_status=DiffAction.ADDED,
+                                    )
+                                ],
+                            )
+                            secondaries.append(node_changelog)
+
+        return secondaries

backend/infrahub/core/constants/__init__.py

@@ -289,18 +289,6 @@ class AttributeDBNodeType(InfrahubStringEnum):
     IPNETWORK = "ipnetwork"
 
 
-class EventLevel(InfrahubStringEnum):
-    ZERO = "zero"
-    ONE = "one"
-
-    def to_int(self) -> int:
-        match self:
-            case EventLevel.ZERO:
-                return 0
-            case EventLevel.ONE:
-                return 1
-
-
 RESTRICTED_NAMESPACES: list[str] = [
     "Account",
     "Branch",

backend/infrahub/core/diff/combiner.py

@@ -342,6 +342,8 @@ def _combine_relationships(
 
     def _copy_node_without_parents(self, node: EnrichedDiffNode) -> EnrichedDiffNode:
         rels_without_parents = {replace(r, nodes=set()) for r in node.relationships}
+        for rel in rels_without_parents:
+            rel.reset_summaries()
         node_without_parents = replace(node, relationships=rels_without_parents)
         return deepcopy(node_without_parents)
 
@@ -351,15 +353,11 @@ def _combine_nodes(self, node_pairs: list[NodePair]) -> set[EnrichedDiffNode]:
             if node_pair.earlier is None:
                 if node_pair.later is not None:
                     copied = self._copy_node_without_parents(node_pair.later)
-                    for rel in copied.relationships:
-                        rel.reset_summaries()
                     combined_nodes.add(copied)
                 continue
             if node_pair.later is None:
                 if node_pair.earlier is not None:
                     copied = self._copy_node_without_parents(node_pair.earlier)
-                    for rel in copied.relationships:
-                        rel.reset_summaries()
                     combined_nodes.add(copied)
                 continue
             combined_attributes = self._combine_attributes(