infrahub-server 1.2.9rc0__py3-none-any.whl → 1.3.0a0__py3-none-any.whl

infrahub/task_manager/models.py

@@ -84,11 +84,15 @@ class FlowProgress(BaseModel):
 
 
 class InfrahubEventFilter(EventFilter):
-    matching_related: list[EventRelatedFilter] = Field(default_factory=list)
+    def add_related_filter(self, related: EventRelatedFilter) -> None:
+        if not isinstance(self.related, list):
+            self.related = []
+
+        self.related.append(related)
 
     def add_account_filter(self, account__ids: list[str] | None) -> None:
         if account__ids:
-            self.matching_related.append(
+            self.add_related_filter(
                 EventRelatedFilter(
                     labels=ResourceSpecification(
                         {"prefect.resource.role": "infrahub.account", "infrahub.resource.id": account__ids}
@@ -98,7 +102,7 @@ class InfrahubEventFilter(EventFilter):
 
     def add_branch_filter(self, branches: list[str] | None = None) -> None:
         if branches:
-            self.matching_related.append(
+            self.add_related_filter(
                 EventRelatedFilter(
                     labels=ResourceSpecification(
                         {"prefect.resource.role": "infrahub.branch", "infrahub.resource.label": branches}
@@ -116,7 +120,7 @@ class InfrahubEventFilter(EventFilter):
 
         if event_filter:
             event_filter["prefect.resource.role"] = "infrahub.event"
-            self.matching_related.append(EventRelatedFilter(labels=ResourceSpecification(event_filter)))
+            self.add_related_filter(EventRelatedFilter(labels=ResourceSpecification(event_filter)))
 
     def add_event_id_filter(self, ids: list[str] | None = None) -> None:
         if ids:
@@ -151,7 +155,7 @@ class InfrahubEventFilter(EventFilter):
 
     def add_parent_filter(self, parent__ids: list[str] | None) -> None:
         if parent__ids:
-            self.matching_related.append(
+            self.add_related_filter(
                 EventRelatedFilter(
                     labels=ResourceSpecification(
                         {"prefect.resource.role": "infrahub.child_event", "infrahub.event_parent.id": parent__ids}
@@ -161,7 +165,7 @@ class InfrahubEventFilter(EventFilter):
 
     def add_related_node_filter(self, related_node__ids: list[str] | None) -> None:
         if related_node__ids:
-            self.matching_related.append(
+            self.add_related_filter(
                 EventRelatedFilter(
                     labels=ResourceSpecification(
                         {"prefect.resource.role": "infrahub.related.node", "prefect.resource.id": related_node__ids}

infrahub/telemetry/database.py

@@ -49,7 +49,7 @@ async def get_system_info(db: InfrahubDatabase) -> TelemetryDatabaseSystemInfoDa
 
 @task(name="telemetry-gather-db", task_run_name="Gather Database Information", cache_policy=NONE)
 async def gather_database_information(db: InfrahubDatabase) -> TelemetryDatabaseData:
-    async with db.start_session() as dbs:
+    async with db.start_session(read_only=True) as dbs:
         server_info = []
         system_info = None
         database_type = db.db_type.value

infrahub/telemetry/tasks.py

@@ -38,7 +38,7 @@ async def gather_schema_information(branch: Branch) -> TelemetrySchemaData:
 
 @task(name="telemetry-feature-information", task_run_name="Gather Feature Information", cache_policy=NONE)
 async def gather_feature_information(service: InfrahubServices) -> dict[str, int]:
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=True) as db:
         data = {}
         features_to_count = [
             InfrahubKind.ARTIFACT,

infrahub/trigger/catalogue.py

@@ -1,3 +1,4 @@
+from infrahub.actions.triggers import TRIGGER_ACTION_RULE_UPDATE
 from infrahub.computed_attribute.triggers import (
     TRIGGER_COMPUTED_ATTRIBUTE_ALL_SCHEMA,
     TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_SETUP_COMMIT,
@@ -6,6 +7,7 @@ from infrahub.trigger.models import TriggerDefinition
 from infrahub.webhook.triggers import TRIGGER_WEBHOOK_DELETE, TRIGGER_WEBHOOK_SETUP_UPDATE
 
 builtin_triggers: list[TriggerDefinition] = [
+    TRIGGER_ACTION_RULE_UPDATE,
     TRIGGER_COMPUTED_ATTRIBUTE_ALL_SCHEMA,
     TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_SETUP_COMMIT,
     TRIGGER_WEBHOOK_DELETE,

infrahub/trigger/models.py

@@ -5,8 +5,11 @@ from enum import Enum
 from typing import TYPE_CHECKING, Any
 
 from prefect.events.actions import RunDeployment
+from prefect.events.schemas.automations import (
+    Automation,  # noqa: TC002
+    Posture,
+)
 from prefect.events.schemas.automations import EventTrigger as PrefectEventTrigger
-from prefect.events.schemas.automations import Posture
 from prefect.events.schemas.events import ResourceSpecification
 from pydantic import BaseModel, Field
 
@@ -19,7 +22,15 @@ if TYPE_CHECKING:
     from uuid import UUID
 
 
+class TriggerSetupReport(BaseModel):
+    created: list[TriggerDefinition] = Field(default_factory=list)
+    updated: list[TriggerDefinition] = Field(default_factory=list)
+    deleted: list[Automation] = Field(default_factory=list)
+    unchanged: list[TriggerDefinition] = Field(default_factory=list)
+
+
 class TriggerType(str, Enum):
+    ACTION_TRIGGER_RULE = "action_trigger_rule"
     BUILTIN = "builtin"
     WEBHOOK = "webhook"
     COMPUTED_ATTR_JINJA2 = "computed_attr_jinja2"
@@ -28,10 +39,15 @@ class TriggerType(str, Enum):
     # OBJECT = "object"
 
 
+def _match_related_dict() -> dict:
+    # Make Mypy happy as match related is a dict[str, Any] | list[dict[str, Any]]
+    return {}
+
+
 class EventTrigger(BaseModel):
     events: set = Field(default_factory=set)
     match: dict[str, Any] = Field(default_factory=dict)
-    match_related: dict[str, Any] = Field(default_factory=dict)
+    match_related: dict[str, Any] | list[dict[str, Any]] = Field(default_factory=_match_related_dict)
 
     def get_prefect(self) -> PrefectEventTrigger:
         return PrefectEventTrigger(
@@ -39,10 +55,20 @@ class EventTrigger(BaseModel):
             expect=self.events,
             within=timedelta(0),
             match=ResourceSpecification(self.match),
-            match_related=ResourceSpecification(self.match_related),
+            match_related=self.related_resource_specification,
             threshold=1,
         )
 
+    @property
+    def related_resource_specification(self) -> ResourceSpecification | list[ResourceSpecification]:
+        if isinstance(self.match_related, dict):
+            return ResourceSpecification(self.match_related)
+
+        if len(self.match_related) == 1:
+            return ResourceSpecification(self.match_related[0])
+
+        return [ResourceSpecification(related_match) for related_match in self.match_related]
+
 
 class ExecuteWorkflow(BaseModel):
     workflow: WorkflowDefinition

infrahub/trigger/setup.py

@@ -5,27 +5,43 @@ from prefect.automations import AutomationCore
 from prefect.cache_policies import NONE
 from prefect.client.orchestration import PrefectClient
 from prefect.client.schemas.filters import DeploymentFilter, DeploymentFilterName
+from prefect.events.schemas.automations import Automation
 
 from infrahub.trigger.models import TriggerDefinition
 
-from .models import TriggerType
+from .models import TriggerSetupReport, TriggerType
 
 if TYPE_CHECKING:
     from uuid import UUID
 
 
+def compare_automations(target: AutomationCore, existing: Automation) -> bool:
+    """Compare an AutomationCore with an existing Automation object to identify if they are identical or not
+
+    Return True if the target is identical to the existing automation
+    """
+
+    target_dump = target.model_dump(exclude_defaults=True, exclude_none=True)
+    existing_dump = existing.model_dump(exclude_defaults=True, exclude_none=True, exclude={"id"})
+
+    return target_dump == existing_dump
+
+
 @task(name="trigger-setup", task_run_name="Setup triggers", cache_policy=NONE)  # type: ignore[arg-type]
 async def setup_triggers(
     client: PrefectClient,
     triggers: list[TriggerDefinition],
     trigger_type: TriggerType | None = None,
-) -> None:
+    force_update: bool = False,
+) -> TriggerSetupReport:
     log = get_run_logger()
 
+    report = TriggerSetupReport()
+
     if trigger_type:
-        log.info(f"Setting up triggers of type {trigger_type.value}")
+        log.debug(f"Setting up triggers of type {trigger_type.value}")
     else:
-        log.info("Setting up all triggers")
+        log.debug("Setting up all triggers")
 
     # -------------------------------------------------------------
     # Retrieve existing Deployments and Automation from the server
@@ -38,23 +54,24 @@ async def setup_triggers(
         )
     }
     deployments_mapping: dict[str, UUID] = {name: item.id for name, item in deployments.items()}
-    existing_automations = {item.name: item for item in await client.read_automations()}
 
     # If a trigger type is provided, narrow down the list of existing triggers to know which one to delete
+    existing_automations: dict[str, Automation] = {}
     if trigger_type:
-        trigger_automations = [
-            item.name for item in await client.read_automations() if item.name.startswith(trigger_type.value)
-        ]
+        existing_automations = {
+            item.name: item for item in await client.read_automations() if item.name.startswith(trigger_type.value)
+        }
     else:
-        trigger_automations = [item.name for item in await client.read_automations()]
+        existing_automations = {item.name: item for item in await client.read_automations()}
 
     trigger_names = [trigger.generate_name() for trigger in triggers]
+    automation_names = list(existing_automations.keys())
 
-    log.debug(f"{len(trigger_automations)} existing triggers ({trigger_automations})")
-    log.debug(f"{len(trigger_names)}  triggers to configure ({trigger_names})")
+    log.debug(f"{len(automation_names)} existing triggers ({automation_names})")
+    log.debug(f"{len(trigger_names)} triggers to configure ({trigger_names})")
 
-    to_delete = set(trigger_automations) - set(trigger_names)
-    log.debug(f"{len(trigger_names)} triggers to delete ({to_delete})")
+    to_delete = set(automation_names) - set(trigger_names)
+    log.debug(f"{len(to_delete)} triggers to delete ({to_delete})")
 
     # -------------------------------------------------------------
     # Create or Update all triggers
@@ -71,11 +88,16 @@ async def setup_triggers(
         existing_automation = existing_automations.get(trigger.generate_name(), None)
 
         if existing_automation:
-            await client.update_automation(automation_id=existing_automation.id, automation=automation)
-            log.info(f"{trigger.generate_name()} Updated")
+            if force_update or not compare_automations(target=automation, existing=existing_automation):
+                await client.update_automation(automation_id=existing_automation.id, automation=automation)
+                log.info(f"{trigger.generate_name()} Updated")
+                report.updated.append(trigger)
+            else:
+                report.unchanged.append(trigger)
         else:
             await client.create_automation(automation=automation)
             log.info(f"{trigger.generate_name()} Created")
+            report.created.append(trigger)
 
     # -------------------------------------------------------------
     # Delete Triggers that shouldn't be there
@@ -86,5 +108,19 @@ async def setup_triggers(
         if not existing_automation:
             continue
 
+        report.deleted.append(existing_automation)
         await client.delete_automation(automation_id=existing_automation.id)
         log.info(f"{item_to_delete} Deleted")
+
+    if trigger_type:
+        log.info(
+            f"Processed triggers of type {trigger_type.value}: "
+            f"{len(report.created)} created, {len(report.updated)} updated, {len(report.unchanged)} unchanged, {len(report.deleted)} deleted"
+        )
+    else:
+        log.info(
+            f"Processed all triggers: "
+            f"{len(report.created)} created, {len(report.updated)} updated, {len(report.unchanged)} unchanged, {len(report.deleted)} deleted"
+        )
+
+    return report

infrahub/trigger/tasks.py

@@ -1,6 +1,7 @@
 from prefect import flow
 from prefect.client.orchestration import get_client
 
+from infrahub.actions.gather import gather_trigger_action_rules
 from infrahub.computed_attribute.gather import (
     gather_trigger_computed_attribute_jinja2,
     gather_trigger_computed_attribute_python,
@@ -21,17 +22,15 @@ async def trigger_configure_all(service: InfrahubServices) -> None:
             computed_attribute_python_triggers,
             computed_attribute_python_query_triggers,
         ) = await gather_trigger_computed_attribute_python(db=db)
-
+        action_rules = await gather_trigger_action_rules(db=db)
         triggers = (
             computed_attribute_j2_triggers
             + computed_attribute_python_triggers
             + computed_attribute_python_query_triggers
             + builtin_triggers
             + webhook_trigger
+            + action_rules
         )
 
         async with get_client(sync_client=False) as prefect_client:
-            await setup_triggers(
-                client=prefect_client,
-                triggers=triggers,
-            )
+            await setup_triggers(client=prefect_client, triggers=triggers, force_update=True)

infrahub/types.py

@@ -366,7 +366,7 @@ ATTRIBUTE_PYTHON_TYPES: dict[str, type] = {
 ATTRIBUTE_KIND_LABELS = list(ATTRIBUTE_TYPES.keys())
 
 # Data types supporting large values, which can therefore not be indexed in neo4j.
-LARGE_ATTRIBUTE_TYPES = [TextArea, JSON]
+LARGE_ATTRIBUTE_TYPES = [TextArea, JSON, List]
 
 
 def get_attribute_type(kind: str = "Default") -> type[InfrahubDataType]:

infrahub/webhook/models.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import base64
 import hashlib
 import hmac
+import json
 from typing import TYPE_CHECKING, Any
 from uuid import UUID, uuid4
 
@@ -170,7 +171,7 @@ class StandardWebhook(Webhook):
     def _assign_headers(self, uuid: UUID | None = None, at: Timestamp | None = None) -> None:
         message_id = f"msg_{uuid.hex}" if uuid else f"msg_{uuid4().hex}"
         timestamp = str(at.to_timestamp()) if at else str(Timestamp().to_timestamp())
-        payload = self._payload or {}
+        payload = json.dumps(self._payload or {})
         unsigned_data = f"{message_id}.{timestamp}.{payload}".encode()
         signature = self._sign(data=unsigned_data)
 

infrahub/workflows/catalogue.py

@@ -6,6 +6,35 @@ from .models import WorkerPoolDefinition, WorkflowDefinition
 INFRAHUB_WORKER_POOL = WorkerPoolDefinition(name="infrahub-worker", description="Default Pool for internal tasks")
 
 
+ACTION_ADD_NODE_TO_GROUP = WorkflowDefinition(
+    name="action-add-node-to-group",
+    type=WorkflowType.CORE,
+    module="infrahub.actions.tasks",
+    function="add_node_to_group",
+)
+
+ACTION_RUN_GENERATOR = WorkflowDefinition(
+    name="action-run-generator",
+    type=WorkflowType.CORE,
+    module="infrahub.actions.tasks",
+    function="run_generator",
+)
+
+ACTION_RUN_GENERATOR_GROUP_EVENT = WorkflowDefinition(
+    name="action-run-generator-group-event",
+    type=WorkflowType.CORE,
+    module="infrahub.actions.tasks",
+    function="run_generator_group_event",
+)
+
+
+CONFIGURE_ACTION_RULES = WorkflowDefinition(
+    name="configure-action-rules",
+    type=WorkflowType.CORE,
+    module="infrahub.actions.tasks",
+    function="configure_action_rules",
+)
+
 TRANSFORM_JINJA2_RENDER = WorkflowDefinition(
     name="transform_render_jinja2_template",
     type=WorkflowType.USER,
@@ -66,6 +95,13 @@ IPAM_RECONCILIATION = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+REMOVE_ADD_NODE_FROM_GROUP = WorkflowDefinition(
+    name="action-remove-node-from-group",
+    type=WorkflowType.CORE,
+    module="infrahub.actions.tasks",
+    function="remove_node_from_group",
+)
+
 REQUEST_GENERATOR_RUN = WorkflowDefinition(
     name="generator-run",
     type=WorkflowType.USER,
@@ -74,6 +110,14 @@ REQUEST_GENERATOR_RUN = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+RUN_GENERATOR_AS_CHECK = WorkflowDefinition(
+    name="run-generator-as-check",
+    type=WorkflowType.USER,
+    module="infrahub.proposed_change.tasks",
+    function="run_generator_as_check",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
 REQUEST_GENERATOR_DEFINITION_RUN = WorkflowDefinition(
     name="request-generator-definition-run",
     type=WorkflowType.CORE,
@@ -82,6 +126,14 @@ REQUEST_GENERATOR_DEFINITION_RUN = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+REQUEST_GENERATOR_DEFINITION_CHECK = WorkflowDefinition(
+    name="request-generator-definition-check",
+    type=WorkflowType.CORE,
+    module="infrahub.proposed_change.tasks",
+    function="request_generator_definition_check",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
 REQUEST_ARTIFACT_GENERATE = WorkflowDefinition(
     name="artifact-generate",
     type=WorkflowType.CORE,  # NOTE need to check
@@ -251,6 +303,14 @@ COMPUTED_ATTRIBUTE_PROCESS_JINJA2 = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+COMPUTED_ATTRIBUTE_JINJA2_UPDATE_VALUE = WorkflowDefinition(
+    name="computed-attribute-jinja2-update-value",
+    type=WorkflowType.CORE,
+    module="infrahub.computed_attribute.tasks",
+    function="computed_attribute_jinja2_update_value",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
 TRIGGER_UPDATE_JINJA_COMPUTED_ATTRIBUTES = WorkflowDefinition(
     name="trigger_update_jinja2_computed_attributes",
     type=WorkflowType.CORE,
@@ -330,6 +390,21 @@ GIT_REPOSITORIES_IMPORT_OBJECTS = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+REQUEST_PROPOSED_CHANGE_PIPELINE = WorkflowDefinition(
+    name="proposed-changed-pipeline",
+    type=WorkflowType.INTERNAL,
+    module="infrahub.proposed_change.tasks",
+    function="run_proposed_change_pipeline",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+REQUEST_PROPOSED_CHANGE_REFRESH_ARTIFACTS = WorkflowDefinition(
+    name="proposed-changed-refresh-artifacts",
+    type=WorkflowType.INTERNAL,
+    module="infrahub.proposed_change.tasks",
+    function="refresh_artifacts",
+)
+
 REQUEST_PROPOSED_CHANGE_RUN_GENERATORS = WorkflowDefinition(
     name="proposed-changed-run-generator",
     type=WorkflowType.INTERNAL,
@@ -434,6 +509,9 @@ TRIGGER_CONFIGURE_ALL = WorkflowDefinition(
 worker_pools = [INFRAHUB_WORKER_POOL]
 
 workflows = [
+    ACTION_ADD_NODE_TO_GROUP,
+    ACTION_RUN_GENERATOR,
+    ACTION_RUN_GENERATOR_GROUP_EVENT,
     ANONYMOUS_TELEMETRY_SEND,
     BRANCH_CANCEL_PROPOSED_CHANGES,
     BRANCH_CREATE,
@@ -443,10 +521,12 @@ workflows = [
     BRANCH_MERGE_POST_PROCESS,
     BRANCH_REBASE,
     BRANCH_VALIDATE,
+    COMPUTED_ATTRIBUTE_JINJA2_UPDATE_VALUE,
     COMPUTED_ATTRIBUTE_PROCESS_JINJA2,
     COMPUTED_ATTRIBUTE_PROCESS_TRANSFORM,
     COMPUTED_ATTRIBUTE_SETUP_JINJA2,
     COMPUTED_ATTRIBUTE_SETUP_PYTHON,
+    CONFIGURE_ACTION_RULES,
     DIFF_REFRESH,
     DIFF_REFRESH_ALL,
     DIFF_UPDATE,
@@ -468,16 +548,21 @@ workflows = [
     IPAM_RECONCILIATION,
     PROPOSED_CHANGE_MERGE,
     QUERY_COMPUTED_ATTRIBUTE_TRANSFORM_TARGETS,
+    REMOVE_ADD_NODE_FROM_GROUP,
     REQUEST_ARTIFACT_DEFINITION_CHECK,
     REQUEST_ARTIFACT_DEFINITION_GENERATE,
     REQUEST_ARTIFACT_GENERATE,
+    REQUEST_GENERATOR_DEFINITION_CHECK,
     REQUEST_GENERATOR_DEFINITION_RUN,
     REQUEST_GENERATOR_RUN,
     REQUEST_PROPOSED_CHANGE_DATA_INTEGRITY,
+    REQUEST_PROPOSED_CHANGE_PIPELINE,
+    REQUEST_PROPOSED_CHANGE_REFRESH_ARTIFACTS,
     REQUEST_PROPOSED_CHANGE_REPOSITORY_CHECKS,
     REQUEST_PROPOSED_CHANGE_RUN_GENERATORS,
     REQUEST_PROPOSED_CHANGE_SCHEMA_INTEGRITY,
     REQUEST_PROPOSED_CHANGE_USER_TESTS,
+    RUN_GENERATOR_AS_CHECK,
     SCHEMA_APPLY_MIGRATION,
     SCHEMA_VALIDATE_MIGRATION,
     TRANSFORM_JINJA2_RENDER,

infrahub/workflows/initialization.py

@@ -71,7 +71,5 @@ async def setup_task_manager() -> None:
         await setup_worker_pools(client=client)
         await setup_deployments(client=client)
         await setup_triggers(
-            client=client,
-            triggers=builtin_triggers,
-            trigger_type=TriggerType.BUILTIN,
+            client=client, triggers=builtin_triggers, trigger_type=TriggerType.BUILTIN, force_update=True
         )

infrahub_sdk/timestamp.py

@@ -153,7 +153,7 @@ class Timestamp:
         nanoseconds: int = 0,
         disambiguate: Literal["compatible"] = "compatible",
     ) -> Timestamp:
-        return Timestamp(
+        return self.__class__(
             self._obj.add(
                 years=years,
                 months=months,
@@ -183,7 +183,7 @@ class Timestamp:
         nanoseconds: int = 0,
         disambiguate: Literal["compatible"] = "compatible",
     ) -> Timestamp:
-        return Timestamp(
+        return self.__class__(
             self._obj.subtract(
                 years=years,
                 months=months,

{infrahub_server-1.2.9rc0.dist-info → infrahub_server-1.3.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infrahub-server
-Version: 1.2.9rc0
+Version: 1.3.0a0
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 Home-page: https://opsmill.com
 License: AGPL-3.0-only
@@ -39,7 +39,7 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (==1.28.1)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.28.1)
 Requires-Dist: opentelemetry-instrumentation-aio-pika (==0.49b1)
 Requires-Dist: opentelemetry-instrumentation-fastapi (==0.49b1)
-Requires-Dist: prefect (==3.3.7)
+Requires-Dist: prefect (==3.4.1)
 Requires-Dist: prefect-redis (==0.2.2)
 Requires-Dist: pyarrow (>=14,<15)
 Requires-Dist: pydantic (>=2.10,<2.11)
@@ -77,7 +77,7 @@ Description-Content-Type: text/markdown
 
 Infrahub from [OpsMill](https://opsmill.com) is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run. Infrahub offers a central hub to manage the data, templates and playbooks that powers your infrastructure by combining the version control and branch management capabilities similar to Git with the flexible data model and UI of a graph database.
 
-If you just want to try Infrahub out, you can use our [Always-On Sandbox](https://demo.infrahub.app/) to get started.
+If you just want to try Infrahub out, you can use our [Infrahub Sandbox](https://sandbox.infrahub.app/) to get started.
 
 ![infrahub screenshot](docs/docs/media/infrahub-readme.gif)
 
@@ -103,7 +103,7 @@ If you just want to try Infrahub out, you can use our [Always-On Sandbox](https:
 
 ## Quick Start
 
-[Always-On Sandbox](https://demo.infrahub.app/) - Instantly login to the UI of a demo environment of Infrahub with sample data pre-loaded.
+[Infrahub Sandbox](https://sandbox.infrahub.app/) - Instantly login to the UI of a demo environment of Infrahub with sample data pre-loaded.
 
 [Getting Started Environment & Tutorial](https://opsmill.instruqt.com/pages/labs) - It spins up an instance of Infrahub on our cloud, provides a browser, terminal, code editor and walks you through the basic concepts: