Skip to content

Commit d24f848

Browse files
authored
fix/tos_region (#475)
* fix/tos_region * fix/tos_region
1 parent c8f6923 commit d24f848

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

veadk/integrations/ve_tos/ve_tos.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,31 @@ def __init__(
3737
ak: str = "",
3838
sk: str = "",
3939
session_token: str = "",
40+
region: str = "",
4041
bucket_name: str = DEFAULT_TOS_BUCKET_NAME,
4142
) -> None:
4243
self.ak = ak if ak else os.getenv("VOLCENGINE_ACCESS_KEY", "")
4344
self.sk = sk if sk else os.getenv("VOLCENGINE_SECRET_KEY", "")
4445
self.session_token = session_token
4546

46-
# get provider
47-
provider = os.getenv("CLOUD_PROVIDER")
47+
# get provider from env
48+
provider = (os.getenv("CLOUD_PROVIDER") or "").lower()
4849
logger.info(f"Cloud provider: {provider}")
49-
if provider and provider.lower() == "byteplus":
50-
self.region = "ap-southeast-1"
50+
51+
if provider == "byteplus":
5152
self.sld = "bytepluses"
53+
default_region = "ap-southeast-1"
5254
else:
53-
self.region = "cn-beijing"
5455
self.sld = "volces"
56+
default_region = "cn-beijing"
57+
58+
self.region = region
59+
if not self.region:
60+
self.region = (
61+
os.getenv("REGION")
62+
or os.getenv("DATABASE_TOS_REGION")
63+
or default_region
64+
)
5565

5666
logger.info(
5767
f"TOS client ready: region={self.region}, endpoint=tos-{self.region}.{self.sld}.com"

0 commit comments

Comments
 (0)