[DPE-2844] New interface indico test and new legacy extensions test

.github/workflows/ci.yaml

@@ -22,7 +22,7 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v5.1.2
+    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v6.1.1
 
   unit-test:
     name: Unit test charm
@@ -45,7 +45,7 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v5.1.2
+    uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v6.1.1
     permissions:
       actions: write  # Needed to manage GitHub Actions cache
 
@@ -115,14 +115,8 @@ jobs:
             echo Skipping unstable tests
             echo "mark_expression=and not unstable" >> "$GITHUB_OUTPUT"
           fi
-      - name: Select test secret usage
-        id: select-test-secrets
-        if: ${{ github.event.pull_request.head.repo.full_name != 'canonical/postgresql-k8s-operator' }}
-        run: |
-          echo Skipping tests using secrets
-          echo "mark_secrets=and not uses_secrets" >> "$GITHUB_OUTPUT"
       - name: Run integration tests
-        run: tox run -e ${{ matrix.tox-environment }} -- -m 'not ${{ matrix.exclude-mark }} ${{ steps.select-test-secrets.outputs.mark_secrets }} ${{ steps.select-test-stability.outputs.mark_expression }}' --keep-models
+        run: tox run -e ${{ matrix.tox-environment }} -- -m 'not ${{ matrix.exclude-mark }} ${{ steps.select-test-stability.outputs.mark_expression }}' --keep-models
         env:
           SECRETS_FROM_GITHUB: |
             {

.github/workflows/release.yaml

@@ -30,7 +30,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Release charm libraries
@@ -41,14 +41,14 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5.1.2
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v6.1.1
 
   release:
     name: Release charm
     needs:
       - ci-tests
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v5.1.2
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v6.1.1
     with:
       channel: 14/edge
       artifact-name: ${{ needs.build.outputs.artifact-name }}

.github/workflows/sync_issue_to_jira.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   sync:
     name: Sync GitHub issue to Jira
-    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v5.1.2
+    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v6.1.1
     with:
       jira-base-url: https://warthogs.atlassian.net
       jira-project-key: DPE

pyproject.toml

@@ -69,10 +69,10 @@ optional = true
 [tool.poetry.group.integration.dependencies]
 lightkube = "^0.14.0"
 pytest = "^7.4.3"
-pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v5.1.2", subdirectory = "python/pytest_plugins/github_secrets"}
+pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.1.1", subdirectory = "python/pytest_plugins/github_secrets"}
 pytest-operator = "^0.29.0"
-pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v5.1.2", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
-pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v5.1.2", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
+pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.1.1", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
+pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v6.1.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
 juju = "^3.2.2"
 psycopg2 = {version = "^2.9.9", extras = ["binary"]}
 boto3 = "^1.28.70"

tests/integration/ha_tests/helpers.py

@@ -7,13 +7,11 @@
 import tarfile
 import tempfile
 from datetime import datetime
-from pathlib import Path
 from typing import Dict, Optional, Set, Tuple
 
 import kubernetes as kubernetes
 import psycopg2
 import requests
-import yaml
 from kubernetes import config
 from kubernetes.client.api import core_v1_api
 from kubernetes.stream import stream
@@ -30,15 +28,14 @@
 )
 
 from tests.integration.helpers import (
+    APPLICATION_NAME,
     app_name,
     db_connect,
     get_password,
     get_primary,
     get_unit_address,
 )
 
-APPLICATION_NAME = "postgresql-test-app"
-METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
 PORT = 5432
 
 

tests/integration/ha_tests/test_replication.py

@@ -8,13 +8,13 @@
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
 from tests.integration.ha_tests.helpers import (
-    APPLICATION_NAME,
     are_writes_increasing,
     check_writes,
     is_cluster_updated,
     start_continuous_writes,
 )
 from tests.integration.helpers import (
+    APPLICATION_NAME,
     CHARM_SERIES,
     app_name,
     build_and_deploy,

tests/integration/ha_tests/test_self_healing.py

@@ -10,8 +10,6 @@
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
 from tests.integration.ha_tests.helpers import (
-    APPLICATION_NAME,
-    METADATA,
     are_all_db_processes_down,
     are_writes_increasing,
     change_patroni_setting,
@@ -32,7 +30,9 @@
     start_continuous_writes,
 )
 from tests.integration.helpers import (
+    APPLICATION_NAME,
     CHARM_SERIES,
+    METADATA,
     app_name,
     build_and_deploy,
     db_connect,

tests/integration/ha_tests/test_upgrade.py

@@ -16,12 +16,12 @@
 from tenacity import Retrying, stop_after_attempt, wait_fixed
 
 from tests.integration.ha_tests.helpers import (
-    APPLICATION_NAME,
     are_writes_increasing,
     check_writes,
     start_continuous_writes,
 )
 from tests.integration.helpers import (
+    APPLICATION_NAME,
     DATABASE_APP_NAME,
     METADATA,
     count_switchovers,

tests/integration/ha_tests/test_upgrade_from_stable.py

@@ -11,12 +11,12 @@
 from tenacity import Retrying, stop_after_attempt, wait_fixed
 
 from tests.integration.ha_tests.helpers import (
-    APPLICATION_NAME,
     are_writes_increasing,
     check_writes,
     start_continuous_writes,
 )
 from tests.integration.helpers import (
+    APPLICATION_NAME,
     DATABASE_APP_NAME,
     METADATA,
     count_switchovers,

tests/integration/helpers.py

@@ -32,6 +32,7 @@
 CHARM_SERIES = "jammy"
 METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
 DATABASE_APP_NAME = METADATA["name"]
+APPLICATION_NAME = "postgresql-test-app"
 
 charm = None
 

tests/integration/new_relations/test_new_relations.py

@@ -569,3 +569,39 @@ async def test_invalid_extra_user_roles(ops_test: OpsTest):
             raise_on_blocked=False,
             timeout=1000,
         )
+
+
+async def test_indico_datatabase(ops_test: OpsTest) -> None:
+    """Tests deploying and relating to the Indico charm."""
+    async with ops_test.fast_forward(fast_interval="30s"):
+        await ops_test.model.deploy(
+            "indico",
+            channel="stable",
+            application_name="indico",
+            num_units=1,
+        )
+        await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-broker")
+        await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-cache")
+        await asyncio.gather(
+            ops_test.model.relate("redis-broker", "indico"),
+            ops_test.model.relate("redis-cache", "indico"),
+        )
+
+        # Wait for model to stabilise
+        await ops_test.model.wait_for_idle(
+            apps=["indico"],
+            status="waiting",
+            timeout=1000,
+        )
+
+        # Verify that the charm doesn't block when the extensions are enabled.
+        logger.info("Verifying that the charm doesn't block when the extensions are enabled")
+        config = {"plugin_pg_trgm_enable": "True", "plugin_unaccent_enable": "True"}
+        await ops_test.model.applications[DATABASE_APP_NAME].set_config(config)
+        await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active")
+        await ops_test.model.relate(DATABASE_APP_NAME, "indico")
+        await ops_test.model.wait_for_idle(
+            apps=[DATABASE_APP_NAME, "indico"],
+            status="active",
+            timeout=2000,
+        )

tests/integration/test_backups.py

@@ -85,7 +85,6 @@ async def test_none() -> None:
     pass
 
 
-@pytest.mark.uses_secrets
 @pytest.mark.abort_on_fail
 async def test_backup_and_restore(ops_test: OpsTest, cloud_configs: Tuple[Dict, Dict]) -> None:
     """Build and deploy two units of PostgreSQL and then test the backup and restore actions."""
@@ -209,8 +208,7 @@ async def test_backup_and_restore(ops_test: OpsTest, cloud_configs: Tuple[Dict,
     await ops_test.model.remove_application(TLS_CERTIFICATES_APP_NAME, block_until_done=True)
 
 
-@pytest.mark.uses_secrets
-async def test_restore_on_new_cluster(ops_test: OpsTest) -> None:
+async def test_restore_on_new_cluster(ops_test: OpsTest, github_secrets) -> None:
     """Test that is possible to restore a backup to another PostgreSQL cluster."""
     database_app_name = f"new-{DATABASE_APP_NAME}"
     await build_and_deploy(ops_test, 1, database_app_name=database_app_name, wait_for_idle=False)
@@ -282,7 +280,6 @@ async def test_restore_on_new_cluster(ops_test: OpsTest) -> None:
     connection.close()
 
 
-@pytest.mark.uses_secrets
 async def test_invalid_config_and_recovery_after_fixing_it(
     ops_test: OpsTest, cloud_configs: Tuple[Dict, Dict]
 ) -> None: