Skip to content

feat(backup): S3 target supports optional endpoint_url (e.g. for Backblaze) #889

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
tsgoff wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −8
Open

feat(backup): S3 target supports optional endpoint_url (e.g. for Backblaze) #889

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
18 changes: 10 additions & 8 deletions cmk/utils/backup/targets/aws_s3_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
from cmk.utils.password_store import extract, PasswordId


class S3Params(TypedDict):
class S3Params(TypedDict, total=False):
access_key: str
secret: PasswordId
bucket: str
endpoint_url: str # Optional: für S3-kompatible Anbieter wie Backblaze


class S3Bucket:
Expand All @@ -27,16 +28,17 @@ def __init__(self, params: S3Params) -> None:

if not (secret_extracted := extract(params["secret"])):
raise MKGeneralException("Failed to retrieve secret")
self.client: Final = boto3.client(
"s3",

endpoint_url = params.get("endpoint_url")
client_args = dict(
aws_access_key_id=params["access_key"],
aws_secret_access_key=secret_extracted,
)
self.bucket: Final = boto3.resource(
"s3",
aws_access_key_id=params["access_key"],
aws_secret_access_key=secret_extracted,
).Bucket(params["bucket"])
if endpoint_url:
client_args["endpoint_url"] = endpoint_url

self.client: Final = boto3.client("s3", **client_args)
self.bucket: Final = boto3.resource("s3", **client_args).Bucket(params["bucket"])

def ready(self) -> None:
try:
Expand Down