From 4f07f7f705a2aa3bbaa09b519d94dd611d45d7c5 Mon Sep 17 00:00:00 2001 From: Noctua Date: Fri, 14 Jun 2024 22:01:24 +0200 Subject: [PATCH] chore: update charm libraries (#621) --- lib/charms/observability_libs/v1/cert_handler.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/charms/observability_libs/v1/cert_handler.py b/lib/charms/observability_libs/v1/cert_handler.py index f6a3eda4..362240ab 100644 --- a/lib/charms/observability_libs/v1/cert_handler.py +++ b/lib/charms/observability_libs/v1/cert_handler.py @@ -67,7 +67,7 @@ LIBID = "b5cd5cd580f3428fa5f59a8876dcbe6a" LIBAPI = 1 -LIBPATCH = 9 +LIBPATCH = 10 VAULT_SECRET_LABEL = "cert-handler-private-vault" @@ -274,6 +274,7 @@ def __init__( *, key: str, certificates_relation_name: str = "certificates", + peer_relation_name: str = "peers", cert_subject: Optional[str] = None, sans: Optional[List[str]] = None, ): @@ -285,7 +286,11 @@ def __init__( charm: The owning charm. key: A manually-crafted, static, unique identifier used by ops to identify events. It shouldn't change between one event to another. - certificates_relation_name: Must match metadata.yaml. + certificates_relation_name: Name of the certificates relation over which we obtain TLS certificates. + Must match metadata.yaml. + peer_relation_name: Name of a peer relation used to store our secrets. + Only used on older Juju versions where secrets are not supported. + Must match metadata.yaml. cert_subject: Custom subject. Name collisions are under the caller's responsibility. sans: DNS names. If none are given, use FQDN. """ @@ -309,7 +314,7 @@ def __init__( # self.framework.observe(self.charm.on.secret_remove, self._rotate_csr) else: - vault_backend = _RelationVaultBackend(charm, relation_name="peers") + vault_backend = _RelationVaultBackend(charm, relation_name=peer_relation_name) self.vault = Vault(vault_backend) self.certificates_relation_name = certificates_relation_name @@ -514,7 +519,7 @@ def _csr(self) -> Optional[str]: # ignoring all but the last one. if len(csrs) > 1: logger.warning( - "Multiple CSRs found in `certificates` relation. " + f"Multiple CSRs found in {self.certificates_relation_name!r} relation. " "cert_handler is not ready to expect it." )