fix(region): vendor update (#23405)

This commit is contained in:
屈轩
2025-09-28 14:58:55 +08:00
committed by GitHub
parent af73e7e93a
commit 65492d196c
4 changed files with 7 additions and 10 deletions
+1 -1
View File
@@ -95,7 +95,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.20250926093134-932d0643fbc0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032037-9bef78dbdb8c
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
+2 -2
View File
@@ -1411,8 +1411,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.20250926093134-932d0643fbc0 h1:Tz+EbZ2QUrvOOBYdAx2zY2cUv0SwOQX4UJX9pDOdjhI=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250926093134-932d0643fbc0/go.mod h1:R5iP/4nGCluuekoa30B5hM/49IfPpGHXwFK3yT7m6Vw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032037-9bef78dbdb8c h1:cp9M4/G1aykoLwb70FiyhyRc91XPt9RXAV6enN8HjDM=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032037-9bef78dbdb8c/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=
+1 -1
View File
@@ -1875,7 +1875,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.20250926093134-932d0643fbc0
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250928032037-9bef78dbdb8c
## explicit; go 1.24
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
+3 -6
View File
@@ -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
}