[MISC] Revert upgrade tests to 16/edge (#988)

* Switch back the upgrade tests

* Bump libs

* Bump lib version

Author: dragomirp

lib/charms/grafana_k8s/v0/grafana_dashboard.py

@@ -219,7 +219,7 @@ def __init__(self, *args):
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
 
-LIBPATCH = 43
+LIBPATCH = 44
 
 PYDEPS = ["cosl >= 0.0.50"]
 
@@ -1676,14 +1676,22 @@ def _set_default_data(self) -> None:
 
     def set_peer_data(self, key: str, data: Any) -> None:
         """Put information into the peer data bucket instead of `StoredState`."""
-        self._charm.peers.data[self._charm.app][key] = json.dumps(data)  # type: ignore[attr-defined]
+        peers = self._charm.peers  # type: ignore[attr-defined]
+        if not peers or not peers.data:
+            logger.info("set_peer_data: no peer relation. Is the charm being installed/removed?")
+            return
+        peers.data[self._charm.app][key] = json.dumps(data)  # type: ignore[attr-defined]
 
     def get_peer_data(self, key: str) -> Any:
         """Retrieve information from the peer data bucket instead of `StoredState`."""
-        if rel := self._charm.peers:  # type: ignore[attr-defined]
-            data = rel.data[self._charm.app].get(key, "")
-            return json.loads(data) if data else {}
-        return {}
+        peers = self._charm.peers  # type: ignore[attr-defined]
+        if not peers or not peers.data:
+            logger.warning(
+                "get_peer_data: no peer relation. Is the charm being installed/removed?"
+            )
+            return {}
+        data = peers.data[self._charm.app].get(key, "")
+        return json.loads(data) if data else {}
 
 
 class GrafanaDashboardAggregator(Object):

lib/charms/postgresql_k8s/v0/postgresql.py

@@ -35,7 +35,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 53
+LIBPATCH = 55
 
 # Groups to distinguish HBA access
 ACCESS_GROUP_IDENTITY = "identity_access"

lib/charms/prometheus_k8s/v0/prometheus_scrape.py

@@ -362,7 +362,7 @@ def _on_scrape_targets_changed(self, event):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 52
+LIBPATCH = 53
 
 # Version 0.0.53 needed for cosl.rules.generic_alert_groups
 PYDEPS = ["cosl>=0.0.53"]
@@ -1265,6 +1265,15 @@ def _dedupe_job_names(jobs: List[dict]):
     return deduped_jobs
 
 
+def _dedupe_list(items: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+    """Deduplicate items in the list via object identity."""
+    unique_items = []
+    for item in items:
+        if item not in unique_items:
+            unique_items.append(item)
+    return unique_items
+
+
 def _resolve_dir_against_charm_path(charm: CharmBase, *path_elements: str) -> str:
     """Resolve the provided path items against the directory of the main file.
 
@@ -1538,7 +1547,7 @@ def set_scrape_job_spec(self, _=None):
         if self._forward_alert_rules:
             alert_rules.add_path(self._alert_rules_path, recursive=True)
             alert_rules.add(
-                generic_alert_groups.application_rules, group_name_prefix=self.topology.identifier
+                copy.deepcopy(generic_alert_groups.application_rules), group_name_prefix=self.topology.identifier
             )
         alert_rules_as_dict = alert_rules.as_dict()
 
@@ -1889,6 +1898,9 @@ def _set_prometheus_data(self, event: Optional[RelationJoinedEvent] = None):
         )
         groups.extend(alert_rules.as_dict()["groups"])
 
+        groups = _dedupe_list(groups)
+        jobs = _dedupe_list(jobs)
+
         # Set scrape jobs and alert rules in relation data
         relations = [event.relation] if event else self.model.relations[self._prometheus_relation]
         for rel in relations:
@@ -2141,10 +2153,12 @@ def _on_alert_rules_changed(self, event):
         self.set_alert_rule_data(app_name, unit_rules)
 
     def set_alert_rule_data(self, name: str, unit_rules: dict, label_rules: bool = True) -> None:
-        """Update alert rule data.
+        """Consolidate incoming alert rules (from stored-state or event) with those from relation data.
 
-        The unit rules should be a dict, which is has additional Juju topology labels added. For
+        The unit rules should be a dict, which have additional Juju topology labels added. For
         rules generated by the NRPE exporter, they are pre-labeled so lookups can be performed.
+        The unit rules are combined with the alert rules from relation data before being written
+        back to relation data and stored-state.
         """
         if not self._charm.unit.is_leader():
             return
@@ -2166,6 +2180,9 @@ def set_alert_rule_data(self, name: str, unit_rules: dict, label_rules: bool = T
 
             if updated_group["name"] not in [g["name"] for g in groups]:
                 groups.append(updated_group)
+
+            groups = _dedupe_list(groups)
+
             relation.data[self._charm.app]["alert_rules"] = json.dumps(
                 {"groups": groups if self._forward_alert_rules else []}
             )
@@ -2216,6 +2233,8 @@ def remove_alert_rules(self, group_name: str, unit_name: str) -> None:
                 changed_group["rules"] = rules_kept  # type: ignore
                 groups.append(changed_group)
 
+            groups = _dedupe_list(groups)
+
             relation.data[self._charm.app]["alert_rules"] = json.dumps(
                 {"groups": groups if self._forward_alert_rules else []}
             )

templates/patroni.yml.j2

@@ -165,24 +165,21 @@ postgresql:
     replication:
       password: {{ replication_password }}
       {%- if enable_tls %}
-      sslrootcert: {{ conf_path }}/ca.pem
-      sslcert: {{ conf_path }}/cert.pem
-      sslkey: {{ conf_path }}/key.pem
+      sslcert: {{ conf_path }}/nonexistent_cert.pem
+      sslkey: {{ conf_path }}/nonexistent_key.pem
       {%- endif %}
     rewind:
       username: {{ rewind_user }}
       password: {{ rewind_password }}
       {%- if enable_tls %}
-      sslrootcert: {{ conf_path }}/ca.pem
-      sslcert: {{ conf_path }}/cert.pem
-      sslkey: {{ conf_path }}/key.pem
+      sslcert: {{ conf_path }}/nonexistent_cert.pem
+      sslkey: {{ conf_path }}/nonexistent_key.pem
       {%- endif %}
     superuser:
       password: {{ superuser_password }}
       {%- if enable_tls %}
-      sslrootcert: {{ conf_path }}/ca.pem
-      sslcert: {{ conf_path }}/cert.pem
-      sslkey: {{ conf_path }}/key.pem
+      sslcert: {{ conf_path }}/nonexistent_cert.pem
+      sslkey: {{ conf_path }}/nonexistent_key.pem
       {%- endif %}
 use_endpoints: true
 use_unix_socket: true

tests/integration/ha_tests/test_upgrade.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 
-# import asyncio
+import asyncio
 import logging
 import shutil
 from pathlib import Path
@@ -38,25 +38,21 @@
 @pytest.mark.abort_on_fail
 async def test_deploy_latest(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
-    # TODO: rollback to ops_test.model.deploy syntax when we release to edge.
-    await ops_test.juju(
-        "deploy",
-        DATABASE_APP_NAME,
-        "-n",
-        3,
-        "--channel",
-        "16/edge/multiple-storages",
-        "--trust",
-        "--config",
-        "profile=testing",
-        "--base",
-        CHARM_BASE_NOBLE,
-    )
-    await ops_test.model.deploy(
-        APPLICATION_NAME,
-        num_units=1,
-        channel="latest/edge",
-        base=CHARM_BASE,
+    await asyncio.gather(
+        ops_test.model.deploy(
+            DATABASE_APP_NAME,
+            num_units=3,
+            channel="16/edge",
+            trust=True,
+            config={"profile": "testing"},
+            base=CHARM_BASE_NOBLE,
+        ),
+        ops_test.model.deploy(
+            APPLICATION_NAME,
+            num_units=1,
+            channel="latest/edge",
+            base=CHARM_BASE,
+        ),
     )
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():

tests/integration/ha_tests/test_upgrade_from_stable.py

@@ -1,7 +1,7 @@
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 
-# import asyncio
+import asyncio
 import logging
 
 import pytest
@@ -35,24 +35,22 @@
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
-    # TODO: rollback to ops_test.model.deploy syntax when we release to stable.
-    await ops_test.juju(
-        "deploy",
-        DATABASE_APP_NAME,
-        "-n",
-        3,
-        # TODO: move to stable once we release.
-        "--channel",
-        "16/beta/multiple-storages",
-        "--trust",
-        "--base",
-        CHARM_BASE_NOBLE,
-    )
-    await ops_test.model.deploy(
-        APPLICATION_NAME,
-        num_units=1,
-        channel="latest/edge",
-        base=CHARM_BASE,
+    await asyncio.gather(
+        ops_test.model.deploy(
+            DATABASE_APP_NAME,
+            num_units=3,
+            # TODO: move to stable once we release.
+            channel="16/edge",
+            trust=True,
+            config={"profile": "testing"},
+            base=CHARM_BASE_NOBLE,
+        ),
+        ops_test.model.deploy(
+            APPLICATION_NAME,
+            num_units=1,
+            channel="latest/edge",
+            base=CHARM_BASE,
+        ),
     )
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():