From 60ae50c608c5c3ecb2f17ebf1bc3d3980f89ace1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 23 Jan 2026 17:03:48 +0800 Subject: [PATCH] fix(region): vendor update (#24121) --- go.mod | 2 +- go.sum | 4 ++-- pkg/compute/models/guest_queries.go | 1 + vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/volcengine/region.go | 8 +++++++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b09a7e976f..97866fa74a 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260114022913-2a24ba2aff38 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023413-f5d35910430c yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 7b90e19fbb..107c7516a1 100644 --- a/go.sum +++ b/go.sum @@ -1266,8 +1266,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260114022913-2a24ba2aff38 h1:+0jS0XGwzm4ck0hveCdTo8gwFIgb0DUmK+vwTsfgHhk= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260114022913-2a24ba2aff38/go.mod h1:GdAwZ78fiqj13i2r1zNuE/D6YOlhh2q4jZjuyHiZTq8= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023413-f5d35910430c h1:x+vf8gAXmf1CYfMTKO7BAdXa1a8iMpffNUW0B3P3wNg= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023413-f5d35910430c/go.mod h1:GdAwZ78fiqj13i2r1zNuE/D6YOlhh2q4jZjuyHiZTq8= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/compute/models/guest_queries.go b/pkg/compute/models/guest_queries.go index 3e37abfca1..1d1388e294 100644 --- a/pkg/compute/models/guest_queries.go +++ b/pkg/compute/models/guest_queries.go @@ -566,6 +566,7 @@ func fetchGuestNICs(ctx context.Context, guestIds []string, virtual tristate.Tri gnwq.Field("team_with"), gnwq.Field("network_id"), // caution: do not alias netq.id as network_id wirq.Field("vpc_id"), + gnwq.Field("ifname"), subIP.Field("sub_ips"), ) q = q.Join(netq, sqlchemy.Equals(netq.Field("id"), gnwq.Field("network_id"))) diff --git a/vendor/modules.txt b/vendor/modules.txt index c122c6213a..808643910f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1579,7 +1579,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260114022913-2a24ba2aff38 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023413-f5d35910430c ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go index 28a39c801d..ec11582df7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go @@ -36,6 +36,7 @@ var RegionLocations = map[string]string{ "cn-shanghai": "华东2(上海)", "cn-guangzhou": "华南1(广州)", "ap-southeast-1": "亚太东南(柔佛)", + "ap-southeast-3": "亚太东南(雅加达)", "cn-hongkong": "中国香港", } @@ -45,6 +46,7 @@ var RegionEndpoint = map[string]string{ "cn-guangzhou": "cn-beijing.volces.com", "ap-southeast-1": "ap-southeast-1.volces.com", "cn-hongkong": "cn-hongkong.volces.com", + "ap-southeast-3": "ap-southeast-3.volces.com", } type sStorageType struct { @@ -509,7 +511,11 @@ func (region *SRegion) instanceOperation(instanceId string, apiName string, extr } func (region *SRegion) getBaseEndpoint() string { - return RegionEndpoint[region.RegionId] + endpoint, ok := RegionEndpoint[region.RegionId] + if ok { + return endpoint + } + return fmt.Sprintf("%s.volces.com", region.RegionId) } func (region *SRegion) getS3Endpoint() string {