Merge pull request #5757 from opsmill/stable

Merge stable into develop

Author: ajtmccarty

.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

changelog/5739.fixed.md

@@ -0,0 +1 @@
+Fix Docker task-manager-db Postgress healthcheck test by adding database and user parameters.

development/docker-compose-deps-nats.yml

@@ -49,7 +49,9 @@ services:
     volumes:
       - workflow_db:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test:
+        - "CMD-SHELL"
+        - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"
       interval: 10s
       timeout: 5s
       retries: 5

development/docker-compose-deps.yml

@@ -51,7 +51,9 @@ services:
     volumes:
       - workflow_db:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test:
+        - "CMD-SHELL"
+        - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"
       interval: 10s
       timeout: 5s
       retries: 5

docker-compose.yml

@@ -199,7 +199,9 @@ services:
     volumes:
       - workflow_db:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test:
+        - "CMD-SHELL"
+        - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"
       interval: 10s
       timeout: 5s
       retries: 5

docs/docs/topics/computed-attributes.mdx

@@ -2,19 +2,36 @@
 title: Computed attributes
 ---
 
-The computed attributes feature enables the dynamic calculation of attribute values based on user-defined logic. Currently, Infrahub supports two main types of computed attributes: **Jinja2** and **Python**.
+The computed attributes feature enables the dynamic calculation of attribute values based on user-defined logic.
+
+Currently, Infrahub supports two main types of computed attributes:
+
+* **Jinja2** – Lightweight, but limited in relationship handling.
+* **Python** – More flexible and powerful, but requires async execution.
+
+::::info Limitations
+
+Computed attributes have some inherent restrictions due to system constraints and performance considerations. Keep these in mind when designing your schema:
+
+* Computed attributes **can only** be used on nodes, not generics.
+* Only `URL` and `Text` attribute kinds are supported for computed attributes.
+
+::::
 
 ## Jinja2 computed attributes {#jinja-computed-attribute}
 
 Users can input a concise Jinja2 template directly within the schema definition. Any change to any field used to compute the value will automatically update it.
 
 See the [guide](../guides/computed-attributes) for instructions on creating Jinja2 computed attribute in Infrahub.
 
-### Limitations
+### Restrictions
+
+::::warning
+
+* Jinja2 computed attributes **cannot** reference relationships with cardinality `many`.
+* Only **direct** relationships can be used (i.e., a relationship of a relationship is not accessible).
 
-- Jinja2 computed attributes cannot reference relationships with cardinality `many`.
-- Only direct relationships can be used (i.e., a relationship of a relationship is not accessible).
-- Only `URL` and `Text` attribute kinds are supported at the moment.
+::::
 
 ## Python computed attributes {#python-computed-attribute}
 
@@ -24,17 +41,20 @@ Python scripts do not have the limitations of Jinja2 computed attributes and can
 
 See the [guide](../guides/computed-attributes) for instructions on creating Python computed attribute in Infrahub.
 
-### Limitations
+### Restrictions
+
+::::warning
+
+* Mandatory attributes **cannot** use Python computed attributes.
+* Complex scripts **may impact system performance**.
 
-- Python computed attributes cannot be used on mandatory attribute.
-- Complex scripts can impact system performance.
-- Only `URL` and `Text` attribute kinds are supported at the moment.
+::::
 
 ## Choosing Between Jinja2 and Python
 
-Computed attribute kind | Mandatory attributes | Relationship limitations                  | Complexity Handling
-------------------------|----------------------|-------------------------------------------|---------------------
-Jinja2                  | Compatible           | No use of `many` cardinality; direct only | Straightforward operations
-Python                  | Not compatible       | No limitations                            | Handles complex logic
+| Computed Attribute Kind | Mandatory Attribute Support | Relationship Constraints                                 | Complexity Handling                   |
+|-------------------------|-----------------------------|----------------------------------------------------------|---------------------------------------|
+| **Jinja2**              | ✅ Supported                | Cannot use `many` cardinality; only direct relationships | Best for straightforward operations   |
+| **Python**              | ❌ Not supported            | No restrictions                                          | Suitable for complex logic            |
 
 See the [guide](../guides/computed-attributes) for instructions on creating computed attribute in Infrahub.