openstack/sunbeam-charms
Code Issues Proposed changes

Handle secret retrieval on depature

Browse Source 
Gracefully handle failure to access tls key secret when unit is
departing.

Change-Id: Ic27e059f09f0900192007b84e68ff7ded1f0f06f
This commit is contained in:
Liam Young 2023-10-10 13:54:41 +00:00
parent f24edf6a06
commit dcac4b5f5f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ops-sunbeam/ops_sunbeam/relation_handlers.py
View File

@ -32,6 +32,7 @@ import ops.framework
from ops.model import ( from ops.model import (
ActiveStatus, ActiveStatus,
BlockedStatus, BlockedStatus,
SecretNotFoundError,
UnknownStatus, UnknownStatus,
WaitingStatus, WaitingStatus,
) )
@ -890,6 +891,21 @@ class TlsCertificatesHandler(RelationHandler):
logger.debug("Private key already present") logger.debug("Private key already present")
self._private_key = self.store.get_private_key() self._private_key = self.store.get_private_key()
private_key_secret_id = self.store.get_private_key() private_key_secret_id = self.store.get_private_key()
try:
private_key_secret = self.model.get_secret(
id=private_key_secret_id
)
except SecretNotFoundError:
# When a unit is departing its secrets are removed by Juju.
# So trying to access the secret will result in
# SecretNotFoundError. Given this secret is set by this
# unit and only consumed by this unit it is unlikely there
# is any other reason for the secret to be missing.
logger.debug(
"SecretNotFoundError not found, likely due to departing "
"unit."
)
return
private_key_secret = self.model.get_secret( private_key_secret = self.model.get_secret(
id=private_key_secret_id id=private_key_secret_id
) )