Skip to content

fix: [CPCAP-11196] use default storageName in AwsS3Vault to support S… #504

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

Open
yerkennz wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −3
Open

fix: [CPCAP-11196] use default storageName in AwsS3Vault to support S… #504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4880f1e
fix: [CPCAP-11196] use default storageName in AwsS3Vault to support S…
yerkennz Jun 30, 2026
e52aeb4
fix: add fallback bucket for backward compatability
yerkennz Jul 1, 2026
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
11 changes: 8 additions & 3 deletions services/backup-daemon/docker/granular/storage_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ def get_s3_aliases(cls):
if not aliases:
raise Exception("S3 aliases are enabled, but /aliases/s3_aliases.json is empty")

if "default" not in aliases:
raise Exception("Default S3 alias is not configured in /aliases/s3_aliases.json")

cls.__s3_aliases_cache = aliases

Expand All @@ -67,7 +65,14 @@ def get_s3_alias_config(cls, storage_name=None):
return None

if not storage_name or not storage_name.strip():
raise Exception("storageName is required when S3 aliases are enabled")
fallback_bucket = cls.get_s3_bucket_name(alias=None)
if fallback_bucket:
cls.__log.info(
"storageName not provided, falling back to s3Storage configuration (bucket: %s)",
fallback_bucket
)
return None
raise Exception("storageName is required when S3 aliases are enabled and no s3Storage fallback is configured")

storage_name = storage_name.strip()

Expand Down
Loading