diff --git a/services/backup-daemon/docker/granular/storage_s3.py b/services/backup-daemon/docker/granular/storage_s3.py index 17cd43d6..d6d87305 100644 --- a/services/backup-daemon/docker/granular/storage_s3.py +++ b/services/backup-daemon/docker/granular/storage_s3.py @@ -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 @@ -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()