Skip to content

Commit dced440

Browse files
dddinaryyndu13
dddinary
authored and
yndu13
committed
[OSS gateway] add mgw internal host, bump 0.0.29
gateway bump: go v0.0.19, java v0.0.18, python v0.0.17
1 parent 776501c commit dced440

File tree

8 files changed

+45
-7
lines changed

8 files changed

+45
-7
lines changed

‎alibabacloud-gateway-oss/Teafile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"scope": "alibabacloud",
33
"name": "GatewayOSS",
4-
"version": "0.0.28",
4+
"version": "0.0.29",
55
"main": "./main.tea",
66
"maintainers": [
77
{
@@ -26,9 +26,9 @@
2626
},
2727
"releases": {
2828
"ts": "@alicloud/gateway-oss:^0.0.9",
29-
"go": "github.com/alibabacloud-go/alibabacloud-gateway-oss/client:v0.0.18",
30-
"java": "com.aliyun:alibabacloud-gateway-oss:0.0.17",
31-
"python": "alibabacloud_gateway_oss:0.0.15",
29+
"go": "github.com/alibabacloud-go/alibabacloud-gateway-oss/client:v0.0.19",
30+
"java": "com.aliyun:alibabacloud-gateway-oss:0.0.18",
31+
"python": "alibabacloud_gateway_oss:0.0.17",
3232
"python2": "alibabacloud_gateway_oss_py2:0.0.9",
3333
"csharp": "AlibabaCloud.GatewayOss:0.0.10",
3434
"php": "alibabacloud/gateway-oss:^0.0.9"

‎alibabacloud-gateway-oss/golang/client/client.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,13 @@ func (client *Client) GetRegionIdFromEndpoint(endpoint *string) (_result *string
368368
return _result, _err
369369
}
370370

371+
if tea.BoolValue(string_.HasSuffix(endpoint, tea.String(".mgw-internal.aliyuncs.com"))) {
372+
idx = string_.Index(endpoint, tea.String(".mgw-internal.aliyuncs.com"))
373+
_body := string_.SubString(endpoint, tea.Int(0), idx)
374+
_result = _body
375+
return _result, _err
376+
}
377+
371378
if tea.BoolValue(string_.HasSuffix(endpoint, tea.String("-internal.oss-data-acc.aliyuncs.com"))) {
372379
idx = string_.Index(endpoint, tea.String("-internal.oss-data-acc.aliyuncs.com"))
373380
_body := string_.SubString(endpoint, tea.Int(0), idx)
@@ -422,6 +429,11 @@ func (client *Client) GetHost(endpointType *string, bucketName *string, endpoint
422429
return _result, _err
423430
}
424431

432+
if tea.BoolValue(string_.Contains(endpoint, tea.String(".mgw-internal.aliyuncs.com"))) && !tea.BoolValue(util.IsUnset(context.Request.HostMap["userid"])) {
433+
_result = tea.String(tea.StringValue(context.Request.HostMap["userid"]) + "." + tea.StringValue(endpoint))
434+
return _result, _err
435+
}
436+
425437
if tea.BoolValue(util.Empty(bucketName)) {
426438
_result = endpoint
427439
return _result, _err

‎alibabacloud-gateway-oss/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.aliyun</groupId>
55
<artifactId>alibabacloud-gateway-oss</artifactId>
6-
<version>0.0.17</version>
6+
<version>0.0.18</version>
77
<packaging>jar</packaging>
88
<name>alibabacloud-gateway-oss</name>
99
<description>

‎alibabacloud-gateway-oss/java/src/main/java/com/aliyun/gateway/oss/Client.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,11 @@ public String getRegionIdFromEndpoint(String endpoint) throws Exception {
355355
return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx);
356356
}
357357

358+
if (com.aliyun.darabonbastring.Client.hasSuffix(endpoint, ".mgw-internal.aliyuncs.com")) {
359+
idx = com.aliyun.darabonbastring.Client.index(endpoint, ".mgw-internal.aliyuncs.com");
360+
return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx);
361+
}
362+
358363
if (com.aliyun.darabonbastring.Client.hasSuffix(endpoint, "-internal.oss-data-acc.aliyuncs.com")) {
359364
idx = com.aliyun.darabonbastring.Client.index(endpoint, "-internal.oss-data-acc.aliyuncs.com");
360365
return com.aliyun.darabonbastring.Client.subString(endpoint, 0, idx);
@@ -398,6 +403,10 @@ public String getHost(String endpointType, String bucketName, String endpoint, c
398403
return "" + context.request.hostMap.get("userid") + "." + endpoint + "";
399404
}
400405

406+
if (com.aliyun.darabonbastring.Client.contains(endpoint, ".mgw-internal.aliyuncs.com") && !com.aliyun.teautil.Common.isUnset(context.request.hostMap.get("userid"))) {
407+
return "" + context.request.hostMap.get("userid") + "." + endpoint + "";
408+
}
409+
401410
if (com.aliyun.teautil.Common.empty(bucketName)) {
402411
return endpoint;
403412
}

‎alibabacloud-gateway-oss/main.tea‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ async function getRegionIdFromEndpoint(endpoint: string) : string {
251251
idx = String.index(endpoint, '.mgw.aliyuncs.com');
252252
return String.subString(endpoint, 0, idx);
253253
}
254+
if (String.hasSuffix(endpoint, '.mgw-internal.aliyuncs.com')) {
255+
idx = String.index(endpoint, '.mgw-internal.aliyuncs.com');
256+
return String.subString(endpoint, 0, idx);
257+
}
254258
if (String.hasSuffix(endpoint, '-internal.oss-data-acc.aliyuncs.com')) {
255259
idx = String.index(endpoint, '-internal.oss-data-acc.aliyuncs.com');
256260
return String.subString(endpoint, 0, idx);
@@ -286,6 +290,9 @@ async function getHost(endpointType: string, bucketName: string, endpoint: strin
286290
if (String.contains(endpoint,'.mgw.aliyuncs.com') && !Util.isUnset(context.request.hostMap.userid)) {
287291
return `${context.request.hostMap.userid}.${endpoint}`;
288292
}
293+
if (String.contains(endpoint,'.mgw-internal.aliyuncs.com') && !Util.isUnset(context.request.hostMap.userid)) {
294+
return `${context.request.hostMap.userid}.${endpoint}`;
295+
}
289296
if (Util.empty(bucketName)) {
290297
return endpoint;
291298
}

‎alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.0.16"
1+
__version__ = "0.0.17"

‎alibabacloud-gateway-oss/python/alibabacloud_gateway_oss/client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,9 @@ def get_region_id_from_endpoint(
498498
if StringClient.has_suffix(endpoint, '.mgw.aliyuncs.com'):
499499
idx = StringClient.index(endpoint, '.mgw.aliyuncs.com')
500500
return StringClient.sub_string(endpoint, 0, idx)
501+
if StringClient.has_suffix(endpoint, '.mgw-internal.aliyuncs.com'):
502+
idx = StringClient.index(endpoint, '.mgw-internal.aliyuncs.com')
503+
return StringClient.sub_string(endpoint, 0, idx)
501504
if StringClient.has_suffix(endpoint, '-internal.oss-data-acc.aliyuncs.com'):
502505
idx = StringClient.index(endpoint, '-internal.oss-data-acc.aliyuncs.com')
503506
return StringClient.sub_string(endpoint, 0, idx)
@@ -518,6 +521,9 @@ async def get_region_id_from_endpoint_async(
518521
if StringClient.has_suffix(endpoint, '.mgw.aliyuncs.com'):
519522
idx = StringClient.index(endpoint, '.mgw.aliyuncs.com')
520523
return StringClient.sub_string(endpoint, 0, idx)
524+
if StringClient.has_suffix(endpoint, '.mgw-internal.aliyuncs.com'):
525+
idx = StringClient.index(endpoint, '.mgw-internal.aliyuncs.com')
526+
return StringClient.sub_string(endpoint, 0, idx)
521527
if StringClient.has_suffix(endpoint, '-internal.oss-data-acc.aliyuncs.com'):
522528
idx = StringClient.index(endpoint, '-internal.oss-data-acc.aliyuncs.com')
523529
return StringClient.sub_string(endpoint, 0, idx)
@@ -573,6 +579,8 @@ def get_host(
573579
) -> str:
574580
if StringClient.contains(endpoint, '.mgw.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')):
575581
return f"{context.request.host_map.get('userid')}.{endpoint}"
582+
if StringClient.contains(endpoint, '.mgw-internal.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')):
583+
return f"{context.request.host_map.get('userid')}.{endpoint}"
576584
if UtilClient.empty(bucket_name):
577585
return endpoint
578586
host = f'{bucket_name}.{endpoint}'
@@ -592,6 +600,8 @@ async def get_host_async(
592600
) -> str:
593601
if StringClient.contains(endpoint, '.mgw.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')):
594602
return f"{context.request.host_map.get('userid')}.{endpoint}"
603+
if StringClient.contains(endpoint, '.mgw-internal.aliyuncs.com') and not UtilClient.is_unset(context.request.host_map.get('userid')):
604+
return f"{context.request.host_map.get('userid')}.{endpoint}"
595605
if UtilClient.empty(bucket_name):
596606
return endpoint
597607
host = f'{bucket_name}.{endpoint}'

‎alibabacloud-gateway-oss/python/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"""
2525
setup module for alibabacloud_gateway_oss.
2626
27-
Created on 13/02/2025
27+
Created on 06/04/2025
2828
2929
@author: Alibaba Cloud SDK
3030
"""

0 commit comments

Comments
 (0)