opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update (#23080)

Browse Source
This commit is contained in:
屈轩
2025-08-14 15:13:23 +08:00
committed by GitHub
parent c6de8a9479
commit dcbec86134
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+2 -2
View File
@@ -96,12 +96,12 @@ 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.20250807082238-ddfb05be205b
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250813115411-5660a2f63397
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
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
yunion.io/x/pkg v1.10.4-0.20250810004221-0a408931e156
yunion.io/x/pkg v1.10.4-0.20250814065738-8df5d9d07297
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1
yunion.io/x/sqlchemy v1.1.3-0.20250806073422-e37f5197cec0
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
go.sum
+4 -4
View File
@@ -1408,8 +1408,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.20250807082238-ddfb05be205b h1:Gn3hVmtSz10NVgmAdCU2idgCb+0XnrpG3cv+nKL6zDo=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250807082238-ddfb05be205b/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250813115411-5660a2f63397 h1:r9bYIrW/2Hr6yefxHF615oRflbPvx02xRn/IjpB6XbE=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250813115411-5660a2f63397/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
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=
@@ -1423,8 +1423,8 @@ yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVB
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc=
yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
yunion.io/x/pkg v1.10.4-0.20250810004221-0a408931e156 h1:ONxzK7UJhLKrDUM7vH6EQPNhwkCXaWDtmC67fF12/RE=
yunion.io/x/pkg v1.10.4-0.20250810004221-0a408931e156/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
yunion.io/x/pkg v1.10.4-0.20250814065738-8df5d9d07297 h1:rnU78gHJ+2nEgjpwWN+FclED/nFeuMkrrBWgnTz0ykc=
yunion.io/x/pkg v1.10.4-0.20250814065738-8df5d9d07297/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4=
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
yunion.io/x/sqlchemy v1.1.3-0.20250806073422-e37f5197cec0 h1:Eha/ywh4foMJm7VJ8ibFOi+WPHacuTWtosAGpOld5vo=
vendor/modules.txt
Vendored
+2 -2
View File
@@ -1852,7 +1852,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.20250807082238-ddfb05be205b
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250813115411-5660a2f63397
## explicit; go 1.21
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
@@ -1949,7 +1949,7 @@ yunion.io/x/log/hooks
yunion.io/x/ovsdb/cli_util
yunion.io/x/ovsdb/schema/ovn_nb
yunion.io/x/ovsdb/types
# yunion.io/x/pkg v1.10.4-0.20250810004221-0a408931e156
# yunion.io/x/pkg v1.10.4-0.20250814065738-8df5d9d07297
## explicit; go 1.18
yunion.io/x/pkg/appctx
yunion.io/x/pkg/errors
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/snapshot.go
Generated Vendored
+4 -1
View File
@@ -59,7 +59,10 @@ func (self *SSnapshot) GetId() string {
}
func (self *SSnapshot) GetName() string {
return self.SnapshotName
if len(self.SnapshotName) > 0 {
return self.SnapshotName
}
return self.SnapshotId
}
func (self *SSnapshot) GetStatus() string {
vendor/yunion.io/x/pkg/util/httputils/httputils.go
Generated Vendored
+11 -14
View File
@@ -281,27 +281,24 @@ func ErrorMsg(err error) string {
func GetAddrPort(urlStr string) (string, int, error) {
parts, err := url.Parse(urlStr)
if err != nil {
return "", 0, err
return "", 0, errors.Wrapf(err, "url.Parse %s", urlStr)
}
host := parts.Host
hostAddr, hostPortStr, err := net.SplitHostPort(host)
if err == nil {
hostPort, err := strconv.ParseInt(hostPortStr, 10, 32)
if err != nil {
return "", 0, errors.Wrapf(err, "strconv.ParseInt port string %s", hostPortStr)
} else {
return hostAddr, int(hostPort), nil
}
} else {
portStr := parts.Port()
if len(portStr) == 0 {
switch parts.Scheme {
case "http":
return parts.Host, 80, nil
return parts.Hostname(), 80, nil
case "https":
return parts.Host, 443, nil
return parts.Hostname(), 443, nil
default:
return "", 0, errors.Wrapf(errors.ErrInvalidFormat, "Unknown schema %s", parts.Scheme)
return "", 0, errors.Errorf("Unknown schema %s", parts.Scheme)
}
}
port, err := strconv.Atoi(portStr)
if err != nil {
return "", 0, errors.Wrapf(err, "strconv.Atoi port string %s", portStr)
}
return parts.Hostname(), port, nil
}
func GetTransport(insecure bool) *http.Transport {