Skip to content

[OSS gateway] add mgw internal host, bump 0.0.29 #121

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
yndu13 merged 1 commit into from
Apr 7, 2025
Merged

[OSS gateway] add mgw internal host, bump 0.0.29 #121

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions alibabacloud-gateway-oss/Teafile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scope": "alibabacloud",
"name": "GatewayOSS",
"version": "0.0.28",
"version": "0.0.29",
"main": "./main.tea",
"maintainers": [
{
Expand All @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions alibabacloud-gateway-oss/golang/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion alibabacloud-gateway-oss/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.aliyun</groupId>
<artifactId>alibabacloud-gateway-oss</artifactId>
<version>0.0.17</version>
<version>0.0.18</version>
<packaging>jar</packaging>
<name>alibabacloud-gateway-oss</name>
<description>
Expand Down
9 changes: 9 additions & 0 deletions alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions alibabacloud-gateway-oss/main.tea
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.16"
__version__ = "0.0.17"
10 changes: 10 additions & 0 deletions alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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}'
Expand All @@ -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}'
Expand Down
2 changes: 1 addition & 1 deletion alibabacloud-gateway-oss/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"""
setup module for alibabacloud_gateway_oss.

Created on 13/02/2025
Created on 06/04/2025

@author: Alibaba Cloud SDK
"""
Expand Down
Loading