[MISC] Handle on start secret exception and remove stale test (#550)

* Handle on start secret exception and remove stale test

* Bump libs

Author: dragomirp

lib/charms/tempo_k8s/v2/tracing.py

@@ -107,7 +107,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 = 7
+LIBPATCH = 8
 
 PYDEPS = ["pydantic"]
 
@@ -116,14 +116,13 @@ def __init__(self, *args):
 DEFAULT_RELATION_NAME = "tracing"
 RELATION_INTERFACE_NAME = "tracing"
 
+# Supported list rationale https://github.com/canonical/tempo-coordinator-k8s-operator/issues/8
 ReceiverProtocol = Literal[
     "zipkin",
-    "kafka",
-    "opencensus",
-    "tempo_http",
-    "tempo_grpc",
     "otlp_grpc",
     "otlp_http",
+    "jaeger_grpc",
+    "jaeger_thrift_http",
 ]
 
 RawReceiver = Tuple[ReceiverProtocol, str]
@@ -141,14 +140,12 @@ class TransportProtocolType(str, enum.Enum):
     grpc = "grpc"
 
 
-receiver_protocol_to_transport_protocol = {
+receiver_protocol_to_transport_protocol: Dict[ReceiverProtocol, TransportProtocolType] = {
     "zipkin": TransportProtocolType.http,
-    "kafka": TransportProtocolType.http,
-    "opencensus": TransportProtocolType.http,
-    "tempo_http": TransportProtocolType.http,
-    "tempo_grpc": TransportProtocolType.grpc,
     "otlp_grpc": TransportProtocolType.grpc,
     "otlp_http": TransportProtocolType.http,
+    "jaeger_thrift_http": TransportProtocolType.http,
+    "jaeger_grpc": TransportProtocolType.grpc,
 }
 """A mapping between telemetry protocols and their corresponding transport protocol.
 """

src/charm.py

@@ -1063,7 +1063,11 @@ def _on_start(self, event: StartEvent) -> None:
         if not self._can_start(event):
             return
 
-        postgres_password = self._get_password()
+        try:
+            postgres_password = self._get_password()
+        except ModelError:
+            logger.debug("_on_start: secrets not yet available")
+            postgres_password = None
         # If the leader was not elected (and the needed passwords were not generated yet),
         # the cluster cannot be bootstrapped yet.
         if not postgres_password or not self._replication_password:

tests/integration/test_tls.py

@@ -2,7 +2,6 @@
 # Copyright 2022 Canonical Ltd.
 # See LICENSE file for licensing details.
 import logging
-import os
 
 import pytest as pytest
 from pytest_operator.plugin import OpsTest
@@ -25,7 +24,6 @@
     get_primary,
     get_unit_address,
     primary_changed,
-    restart_machine,
     run_command_on_unit,
 )
 from .juju_ import juju_major_version
@@ -188,50 +186,3 @@ async def test_tls_enabled(ops_test: OpsTest) -> None:
         for unit in ops_test.model.applications[DATABASE_APP_NAME].units:
             assert await check_tls(ops_test, unit.name, enabled=False)
             assert await check_tls_patroni_api(ops_test, unit.name, enabled=False)
-
-
-@pytest.mark.group(1)
-@pytest.mark.skipif(
-    not os.environ.get("RESTART_MACHINE_TEST"),
-    reason="RESTART_MACHINE_TEST environment variable not set",
-)
-async def test_restart_machine(ops_test: OpsTest) -> None:
-    async with ops_test.fast_forward():
-        # Relate it to the PostgreSQL to enable TLS.
-        await ops_test.model.relate(DATABASE_APP_NAME, tls_certificates_app_name)
-        await ops_test.model.wait_for_idle(status="active", timeout=1000)
-
-    # Wait for all units enabling TLS.
-    for unit in ops_test.model.applications[DATABASE_APP_NAME].units:
-        assert await check_tls(ops_test, unit.name, enabled=True)
-        assert await check_tls_patroni_api(ops_test, unit.name, enabled=True)
-
-    unit_name = "postgresql/0"
-    issue_found = False
-    for attempt in Retrying(stop=stop_after_attempt(10)):
-        with attempt:
-            # Restart the machine of the unit.
-            logger.info(f"restarting {unit_name}")
-            await restart_machine(ops_test, unit_name)
-
-            # Check whether the issue happened (the storage wasn't mounted).
-            logger.info(
-                f"checking whether storage was mounted - attempt {attempt.retry_state.attempt_number}"
-            )
-            result = await run_command_on_unit(ops_test, unit_name, "lsblk")
-            if "/var/lib/postgresql/data" not in result:
-                issue_found = True
-
-            assert (
-                issue_found
-            ), "Couldn't reproduce the issue from https://bugs.launchpad.net/juju/+bug/1999758"
-
-    # Wait for the unit to be ready again. Some errors in the start hook may happen due
-    # to rebooting in the middle of a hook.
-    await ops_test.model.wait_for_idle(status="active", timeout=1000, raise_on_error=False)
-
-    # Wait for the unit enabling TLS again.
-    logger.info(f"checking TLS on {unit_name}")
-    assert await check_tls(ops_test, "postgresql/0", enabled=True)
-    logger.info(f"checking TLS on Patroni API from {unit_name}")
-    assert await check_tls_patroni_api(ops_test, "postgresql/0", enabled=True)

tests/unit/test_charm.py

@@ -21,6 +21,7 @@
     ActiveStatus,
     BlockedStatus,
     MaintenanceStatus,
+    ModelError,
     RelationDataTypeError,
     WaitingStatus,
 )
@@ -590,7 +591,7 @@ def test_on_start(harness):
         patch("upgrade.PostgreSQLUpgrade.idle", return_value=True) as _idle,
         patch(
             "charm.PostgresqlOperatorCharm._is_storage_attached",
-            side_effect=[False, True, True, True, True],
+            side_effect=[False, True, True, True, True, True],
         ) as _is_storage_attached,
     ):
         _get_postgresql_version.return_value = "14.0"
@@ -606,7 +607,14 @@ def test_on_start(harness):
         _bootstrap_cluster.assert_not_called()
         assert isinstance(harness.model.unit.status, WaitingStatus)
 
+        # ModelError in get password
+        _get_password.side_effect = ModelError
+        harness.charm.on.start.emit()
+        _bootstrap_cluster.assert_not_called()
+        assert isinstance(harness.model.unit.status, WaitingStatus)
+
         # Mock the passwords.
+        _get_password.side_effect = None
         _get_password.return_value = "fake-operator-password"
         _replication_password.return_value = "fake-replication-password"