Skip to content

[DPE-6323] Handle missing stanza output #866

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
Feb 24, 2025
Merged

[DPE-6323] Handle missing stanza output #866

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,10 @@ def can_use_s3_repository(self) -> tuple[bool, str | None]:
for line in system_identifier_from_instance.splitlines()
if "Database system identifier" in line
).split(" ")[-1]
system_identifier_from_stanza = str(stanza.get("db")[0]["system-id"])
stanza_dbs = stanza.get("db")
system_identifier_from_stanza = (
str(stanza_dbs[0]["system-id"]) if len(stanza_dbs) else None
)
if system_identifier_from_instance != system_identifier_from_stanza:
logger.debug(
f"can_use_s3_repository: incompatible system identifier s3={system_identifier_from_stanza}, local={system_identifier_from_instance}"
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/test_backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,18 @@ def test_can_use_s3_repository(harness):
]
assert harness.charm.backup.can_use_s3_repository() == (True, None)

# Empty db
_execute_command.side_effect = [
(
f'[{{"db": [], "name": "another-model.{harness.charm.cluster_name}"}}]',
None,
)
]
assert harness.charm.backup.can_use_s3_repository() == (
False,
ANOTHER_CLUSTER_REPOSITORY_ERROR_MESSAGE,
)


def test_construct_endpoint(harness):
# Test with an AWS endpoint without region.
Expand Down
Loading