Skip to content

Revert "DPE-8395 Remove old revision of Juju Secret (#1195)" #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

Revert "DPE-8395 Remove old revision of Juju Secret (#1195)" #1216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
InstallEvent,
LeaderElectedEvent,
RelationDepartedEvent,
SecretRemoveEvent,
StartEvent,
)
from ops.framework import EventBase
Expand Down Expand Up @@ -202,7 +201,6 @@ def __init__(self, *args):
self.framework.observe(self.on.set_password_action, self._on_set_password)
self.framework.observe(self.on.promote_to_primary_action, self._on_promote_to_primary)
self.framework.observe(self.on.update_status, self._on_update_status)
self.framework.observe(self.on.secret_remove, self._on_secret_remove)
self.cluster_name = self.app.name
self._member_name = self.unit.name.replace("/", "-")

Expand Down Expand Up @@ -437,17 +435,6 @@ def get_hostname_by_unit(self, _) -> str:
# the underlying provider (LXD, MAAS, etc.), the unit IP is returned.
return self._unit_ip

def _on_secret_remove(self, event: SecretRemoveEvent) -> None:
# A secret removal (entire removal, not just a revision removal) causes
# https://github.com/juju/juju/issues/20794. This check is to avoid the
# errors that would happen if we tried to remove the revision in that case
# (in the revision removal, the label is present).
if event.secret.label is None:
logger.debug("Secret with no label cannot be removed")
return
logger.debug(f"Removing secret with label {event.secret.label} revision {event.revision}")
event.remove_revision()

def _on_get_primary(self, event: ActionEvent) -> None:
"""Get primary instance."""
try:
Expand Down
Loading