From 40b92399784b2df4599315a29dd319919ecfacac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sun, 28 Sep 2025 14:58:50 +0800 Subject: [PATCH] fix(region): vendor update (#23404) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/huawei/bucket.go | 9 +++------ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index a964aba643..fdb3fca3e1 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250926093128-3c98faf09bff + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032011-ee13d87fc4b0 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 1df43cd72a..95342d9467 100644 --- a/go.sum +++ b/go.sum @@ -1426,8 +1426,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.20250926093128-3c98faf09bff h1:kYU7pC++N1GNqzYLG6QJ9Z216sRrOZDGMnblpxHL7ic= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250926093128-3c98faf09bff/go.mod h1:R5iP/4nGCluuekoa30B5hM/49IfPpGHXwFK3yT7m6Vw= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032011-ee13d87fc4b0 h1:2GI1XxhFRVxl+XClmsnadGuJcrZx1SB7muABOud780M= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032011-ee13d87fc4b0/go.mod h1:R5iP/4nGCluuekoa30B5hM/49IfPpGHXwFK3yT7m6Vw= 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/vendor/modules.txt b/vendor/modules.txt index 8dc9f0bf49..7e4b766cdb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1900,7 +1900,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.20250926093128-3c98faf09bff +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032011-ee13d87fc4b0 ## explicit; go 1.24 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/bucket.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/bucket.go index 60e274cb27..55c2728881 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/bucket.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/bucket.go @@ -1018,12 +1018,9 @@ func getLocalPrincipalId(principals []string) []string { res = append(res, principal+":"+principal) continue } - temp := strings.Split(principal, "domain:") - temp1 := strings.Split(temp[1], ":user/") - if temp1[1] == "*" { - temp1[1] = temp1[0] - } - res = append(res, fmt.Sprintf("%s:%s", temp1[0], temp1[1])) + principal = strings.Replace(principal, "domain/", "", 1) + principal = strings.Replace(principal, "user/", "", 1) + res = append(res, principal) } return res }