diff --git a/alibabacloud-gateway-oss/Teafile b/alibabacloud-gateway-oss/Teafile index 21ca4501..6cfacfb8 100644 --- a/alibabacloud-gateway-oss/Teafile +++ b/alibabacloud-gateway-oss/Teafile @@ -1,7 +1,7 @@ { "scope": "alibabacloud", "name": "GatewayOSS", - "version": "0.0.28", + "version": "0.0.29", "main": "./main.tea", "maintainers": [ { @@ -26,9 +26,9 @@ }, "releases": { "ts": "@alicloud/gateway-oss:^0.0.9", - "go": "github.com/alibabacloud-go/alibabacloud-gateway-oss/client:v0.0.18", - "java": "com.aliyun:alibabacloud-gateway-oss:0.0.17", - "python": "alibabacloud_gateway_oss:0.0.15", + "go": "github.com/alibabacloud-go/alibabacloud-gateway-oss/client:v0.0.19", + "java": "com.aliyun:alibabacloud-gateway-oss:0.0.18", + "python": "alibabacloud_gateway_oss:0.0.17", "python2": "alibabacloud_gateway_oss_py2:0.0.9", "csharp": "AlibabaCloud.GatewayOss:0.0.10", "php": "alibabacloud/gateway-oss:^0.0.9" diff --git a/alibabacloud-gateway-oss/golang/client/client.go b/alibabacloud-gateway-oss/golang/client/client.go index eed9e458..69fec594 100644 --- a/alibabacloud-gateway-oss/golang/client/client.go +++ b/alibabacloud-gateway-oss/golang/client/client.go @@ -368,6 +368,13 @@ func (client *Client) GetRegionIdFromEndpoint(endpoint *string) (_result *string return _result, _err } + if tea.BoolValue(string_.HasSuffix(endpoint, tea.String(".mgw-internal.aliyuncs.com"))) { + idx = string_.Index(endpoint, tea.String(".mgw-internal.aliyuncs.com")) + _body := string_.SubString(endpoint, tea.Int(0), idx) + _result = _body + return _result, _err + } + if tea.BoolValue(string_.HasSuffix(endpoint, tea.String("-internal.oss-data-acc.aliyuncs.com"))) { idx = string_.Index(endpoint, tea.String("-internal.oss-data-acc.aliyuncs.com")) _body := string_.SubString(endpoint, tea.Int(0), idx) @@ -422,6 +429,11 @@ func (client *Client) GetHost(endpointType *string, bucketName *string, endpoint return _result, _err } + if tea.BoolValue(string_.Contains(endpoint, tea.String(".mgw-internal.aliyuncs.com"))) && !tea.BoolValue(util.IsUnset(context.Request.HostMap["userid"])) { + _result = tea.String(tea.StringValue(context.Request.HostMap["userid"]) + "." + tea.StringValue(endpoint)) + return _result, _err + } + if tea.BoolValue(util.Empty(bucketName)) { _result = endpoint return _result, _err diff --git a/alibabacloud-gateway-oss/java/pom.xml b/alibabacloud-gateway-oss/java/pom.xml index 7896dc92..65b226ce 100644 --- a/alibabacloud-gateway-oss/java/pom.xml +++ b/alibabacloud-gateway-oss/java/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.aliyun alibabacloud-gateway-oss - 0.0.17 + 0.0.18 jar alibabacloud-gateway-oss diff --git a/alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java b/alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java index c315ea6d..e543e1e4 100644 --- a/alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java +++ b/alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java @@ -355,6 +355,11 @@ public String getRegionIdFromEndpoint(String endpoint) throws Exception { return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx); } + if (com.aliyun.darabonbastring.Client.hasSuffix(endpoint, ".mgw-internal.aliyuncs.com")) { + idx = com.aliyun.darabonbastring.Client.index(endpoint, ".mgw-internal.aliyuncs.com"); + return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx); + } + if (com.aliyun.darabonbastring.Client.hasSuffix(endpoint, "-internal.oss-data-acc.aliyuncs.com")) { idx = com.aliyun.darabonbastring.Client.index(endpoint, "-internal.oss-data-acc.aliyuncs.com"); return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx); @@ -398,6 +403,10 @@ public String getHost(String endpointType, String bucketName, String endpoint, c return "" + context.request.hostMap.get("userid") + "." + endpoint + ""; } + if (com.aliyun.darabonbastring.Client.contains(endpoint, ".mgw-internal.aliyuncs.com") && !com.aliyun.teautil.Common.isUnset(context.request.hostMap.get("userid"))) { + return "" + context.request.hostMap.get("userid") + "." + endpoint + ""; + } + if (com.aliyun.teautil.Common.empty(bucketName)) { return endpoint; } diff --git a/alibabacloud-gateway-oss/main.tea b/alibabacloud-gateway-oss/main.tea index 51381cb7..06bdc2da 100644 --- a/alibabacloud-gateway-oss/main.tea +++ b/alibabacloud-gateway-oss/main.tea @@ -251,6 +251,10 @@ async function getRegionIdFromEndpoint(endpoint: string) : string { idx = String.index(endpoint, '.mgw.aliyuncs.com'); return String.subString(endpoint, 0, idx); } + if (String.hasSuffix(endpoint, '.mgw-internal.aliyuncs.com')) { + idx = String.index(endpoint, '.mgw-internal.aliyuncs.com'); + return String.subString(endpoint, 0, idx); + } if (String.hasSuffix(endpoint, '-internal.oss-data-acc.aliyuncs.com')) { idx = String.index(endpoint, '-internal.oss-data-acc.aliyuncs.com'); return String.subString(endpoint, 0, idx); @@ -286,6 +290,9 @@ async function getHost(endpointType: string, bucketName: string, endpoint: strin if (String.contains(endpoint,'.mgw.aliyuncs.com') && !Util.isUnset(context.request.hostMap.userid)) { return `${context.request.hostMap.userid}.${endpoint}`; } + if (String.contains(endpoint,'.mgw-internal.aliyuncs.com') && !Util.isUnset(context.request.hostMap.userid)) { + return `${context.request.hostMap.userid}.${endpoint}`; + } if (Util.empty(bucketName)) { return endpoint; } diff --git a/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py b/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py index d62d9673..1f658a48 100644 --- a/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py +++ b/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py @@ -1 +1 @@ -__version__ = "0.0.16" +__version__ = "0.0.17" diff --git a/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py b/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py index 1a250730..5d7c7f6b 100644 --- a/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py +++ b/alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py @@ -498,6 +498,9 @@ def get_region_id_from_endpoint( if StringClient.has_suffix(endpoint, '.mgw.aliyuncs.com'): idx = StringClient.index(endpoint, '.mgw.aliyuncs.com') return StringClient.sub_string(endpoint, 0, idx) + if StringClient.has_suffix(endpoint, '.mgw-internal.aliyuncs.com'): + idx = StringClient.index(endpoint, '.mgw-internal.aliyuncs.com') + return StringClient.sub_string(endpoint, 0, idx) if StringClient.has_suffix(endpoint, '-internal.oss-data-acc.aliyuncs.com'): idx = StringClient.index(endpoint, '-internal.oss-data-acc.aliyuncs.com') return StringClient.sub_string(endpoint, 0, idx) @@ -518,6 +521,9 @@ async def get_region_id_from_endpoint_async( if StringClient.has_suffix(endpoint, '.mgw.aliyuncs.com'): idx = StringClient.index(endpoint, '.mgw.aliyuncs.com') return StringClient.sub_string(endpoint, 0, idx) + if StringClient.has_suffix(endpoint, '.mgw-internal.aliyuncs.com'): + idx = StringClient.index(endpoint, '.mgw-internal.aliyuncs.com') + return StringClient.sub_string(endpoint, 0, idx) if StringClient.has_suffix(endpoint, '-internal.oss-data-acc.aliyuncs.com'): idx = StringClient.index(endpoint, '-internal.oss-data-acc.aliyuncs.com') return StringClient.sub_string(endpoint, 0, idx) @@ -573,6 +579,8 @@ def get_host( ) -> str: if StringClient.contains(endpoint, '.mgw.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')): return f"{context.request.host_map.get('userid')}.{endpoint}" + if StringClient.contains(endpoint, '.mgw-internal.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')): + return f"{context.request.host_map.get('userid')}.{endpoint}" if UtilClient.empty(bucket_name): return endpoint host = f'{bucket_name}.{endpoint}' @@ -592,6 +600,8 @@ async def get_host_async( ) -> str: if StringClient.contains(endpoint, '.mgw.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')): return f"{context.request.host_map.get('userid')}.{endpoint}" + if StringClient.contains(endpoint, '.mgw-internal.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')): + return f"{context.request.host_map.get('userid')}.{endpoint}" if UtilClient.empty(bucket_name): return endpoint host = f'{bucket_name}.{endpoint}' diff --git a/alibabacloud-gateway-oss/python/setup.py b/alibabacloud-gateway-oss/python/setup.py index 2eef009a..beff6f24 100644 --- a/alibabacloud-gateway-oss/python/setup.py +++ b/alibabacloud-gateway-oss/python/setup.py @@ -24,7 +24,7 @@ """ setup module for alibabacloud_gateway_oss. -Created on 13/02/2025 +Created on 06/04/2025 @author: Alibaba Cloud SDK """