Skip to content

feat(s3): support credential-scoped endpoint and OSS storage provider #2019

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
benflexcompute merged 1 commit into from
Apr 24, 2026
Merged

feat(s3): support credential-scoped endpoint and OSS storage provider #2019

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
14 changes: 13 additions & 1 deletion flow360/cloud/s3_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from abc import ABCMeta, abstractmethod
from datetime import datetime
from enum import Enum
from typing import Optional

# pylint: disable=unused-import
from pydantic.v1 import BaseModel, Field
Expand Down Expand Up @@ -115,6 +116,8 @@ class _UserCredential(BaseModel):
secret_access_key: str = Field(alias="secretAccessKey")
session_token: str = Field(alias="sessionToken")
region: str
endpoint: Optional[str] = None
storage_provider: Optional[str] = Field(alias="storageProvider", default=None)


class _S3STSToken(BaseModel):
Expand Down Expand Up @@ -149,7 +152,13 @@ def get_client(self):

# pylint: disable=no-member
config_kwargs = {"max_pool_connections": MAX_POOL}
if Env.current.s3_endpoint_url is not None:
if (self.user_credential.storage_provider or "").upper() == "OSS":
# OSS does not support aws integrity check
config_kwargs["request_checksum_calculation"] = "when_required"
config_kwargs["response_checksum_validation"] = "when_required"
# OSS recommends virtual-hosted style addressing (http://bucket.host/key).
config_kwargs["s3"] = {"addressing_style": "virtual"}
elif Env.current.s3_endpoint_url is not None:
# S3-compatible stores (s3proxy, MinIO) may not implement the
# checksum headers that newer boto3 versions send by default.
config_kwargs["request_checksum_calculation"] = "when_required"
Expand All @@ -175,6 +184,9 @@ def get_client(self):
"config": config,
}

if self.user_credential.endpoint is not None:
kwargs["endpoint_url"] = self.user_credential.endpoint

if Env.current.s3_endpoint_url is not None:
kwargs["endpoint_url"] = Env.current.s3_endpoint_url

Expand Down
Loading