From 06ca635327bfd3c54c55fc3ef7a435e2af89a056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 22 Oct 2024 19:57:54 +0800 Subject: [PATCH] fix(region): vendor update (#21441) --- go.mod | 6 ++-- go.sum | 10 +++--- pkg/mcclient/cloudpods/storagecache.go | 3 +- vendor/modules.txt | 4 +-- .../x/cloudmux/pkg/cloudprovider/waf.go | 2 +- .../cloudmux/pkg/multicloud/huawei/huawei.go | 2 +- .../qcloud/loadbalancer_listener.go | 4 +-- vendor/yunion.io/x/jsonutils/jsonutils.go | 33 ++++++++++--------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index a50aabba79..5678cbc295 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/360EntSecGroup-Skylar/excelize v1.4.0 github.com/LeeEirc/terminalparser v0.0.0-20240205084113-fbf78c8480f2 github.com/aliyun/alibaba-cloud-sdk-go v1.61.684 - github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 github.com/anacrolix/torrent v0.0.0-20181129073333-cc531b8c4a80 github.com/benbjohnson/clock v1.0.0 github.com/bitly/go-simplejson v0.5.0 @@ -88,9 +87,9 @@ 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.20240926044403-b549642e9ab3 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241021095524-bf7da369f379 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 - yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 + yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f 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.1-0.20240905110705-77c46e716318 @@ -130,6 +129,7 @@ require ( github.com/anacrolix/log v0.0.0-20180808012509-286fcf906b48 // indirect github.com/anacrolix/missinggo v0.0.0-20181129073415-3237bf955fed // indirect github.com/anacrolix/mmsg v0.0.0-20180808012353-5adb2c1127c0 // indirect + github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 // indirect github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 // indirect github.com/aokoli/goutils v1.0.1 // indirect github.com/apache/thrift v0.13.0 // indirect diff --git a/go.sum b/go.sum index ac8abfb044..eb47378ac3 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,6 @@ github.com/DataDog/dd-trace-go v0.6.1 h1:nsZ2lohbSw1CKtfNRu3wPh1jFirv6XSz8vqNpuI github.com/DataDog/dd-trace-go v0.6.1/go.mod h1:SmQTTcC37XMyEm75HV0AWiZIYxDiaNhRi49zorIpW+o= github.com/DataDog/zstd v1.3.4 h1:LAGHkXuvC6yky+C2CUG2tD7w8QlrUwpue8XwIh0X4AY= github.com/DataDog/zstd v1.3.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/LeeEirc/terminalparser v0.0.0-20220328021224-de16b7643ea4 h1:Gk7m4Nu2jqVqJAJqNlTYqkiq96WkANAtB4fVi+t7Xv8= -github.com/LeeEirc/terminalparser v0.0.0-20220328021224-de16b7643ea4/go.mod h1:tiLv6VBLH4Z3KdBSe2qIKRwQDGCVQ9/F5fOKpQGvyoA= github.com/LeeEirc/terminalparser v0.0.0-20240205084113-fbf78c8480f2 h1:XGB3B0651J1uKOE1KJa1gsrV/DO1kthhk2NTDUHATgs= github.com/LeeEirc/terminalparser v0.0.0-20240205084113-fbf78c8480f2/go.mod h1:tiLv6VBLH4Z3KdBSe2qIKRwQDGCVQ9/F5fOKpQGvyoA= github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3 h1:gImoAO1xAcC1oDlYmD/X7dggsodGf2DFJOVE5m0ssms= @@ -1276,13 +1274,13 @@ 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.20240926044403-b549642e9ab3 h1:Ee7IeQHhfzA6wuutvWkidNpp65dWjlLXJahapW3L0tA= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240926044403-b549642e9ab3/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241021095524-bf7da369f379 h1:53ncGcuIFZFJDeJBwgams6c84xKx9so/vRxXR2fwmgU= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241021095524-bf7da369f379/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= -yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 h1:4l6ELFSQ0MBVInscZ8/yOtSWF0cwH5BT1ATN6dCtAqc= -yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401/go.mod h1:VK4Z93dgiKgAijcSqbMKmGaBMJuHulR16Hz4K015ZPo= +yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f h1:N7V0uLqX9mED1HEPeIKcYpkWglnHL5hyn4ENX+VBeqM= +yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f/go.mod h1:VK4Z93dgiKgAijcSqbMKmGaBMJuHulR16Hz4K015ZPo= yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXcevLsJLKixV+sR/E7WSYTSx1fE= yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U= yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 h1:inY5o3LDa/zgsIZuPN0HmpzKIsu/lLgsBmMttuDPGj4= diff --git a/pkg/mcclient/cloudpods/storagecache.go b/pkg/mcclient/cloudpods/storagecache.go index 2b54003095..e1463d885b 100644 --- a/pkg/mcclient/cloudpods/storagecache.go +++ b/pkg/mcclient/cloudpods/storagecache.go @@ -23,6 +23,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" + "yunion.io/x/onecloud/pkg/apis" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/mcclient/modules/compute" ) @@ -48,7 +49,7 @@ func (self *SStoragecache) GetGlobalId() string { } func (self *SStoragecache) GetStatus() string { - return "available" + return apis.STATUS_AVAILABLE } func (self *SStoragecache) GetICustomizedCloudImages() ([]cloudprovider.ICloudImage, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0260e5f3b6..0898e38251 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1576,7 +1576,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.20240926044403-b549642e9ab3 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241021095524-bf7da369f379 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1659,7 +1659,7 @@ yunion.io/x/cloudmux/pkg/multicloud/zstack/provider yunion.io/x/executor/apis yunion.io/x/executor/client yunion.io/x/executor/server -# yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 +# yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f ## explicit; go 1.18 yunion.io/x/jsonutils # yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go index 2f01b4bd30..b3c9f96a53 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go @@ -159,7 +159,7 @@ type SWafStatement struct { // 是否取反操作, 仅对Azure生效 Negation bool `nullable:"false" list:"user"` // 操作类型 - // enum: EQ, NE, LE, LT, GE, GT + // enum: ["EQ", "NE", "LE", "LT", "GE", "GT"] Operator TWafOperator `width:"20" charset:"ascii" nullable:"false" list:"user"` // 匹配字段 // enmu: Body, JsonBody, Query, Method, Header, UriPath, PostArgs, Cookie diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go index ac5b190bd6..da94abf6bf 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go @@ -308,7 +308,7 @@ func (self *SHuaweiClient) request(method httputils.THttpMethod, regionId, url s return nil, err } if gotypes.IsNil(resp) { - return nil, fmt.Errorf("empty response return") + return jsonutils.NewDict(), nil } return resp, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go index 6ea691fbd5..c49adba0ac 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go @@ -587,7 +587,7 @@ func healthCheck(params map[string]string, listenerType string, opts *cloudprovi params["HealthCheck.IntervalTime"] = fmt.Sprintf("%d", opts.HealthCheckInterval) params["HealthCheck.HealthNum"] = fmt.Sprintf("%d", opts.HealthCheckRise) params["HealthCheck.UnHealthNum"] = fmt.Sprintf("%d", opts.HealthCheckFail) - switch opts.HealthCheck { + switch opts.HealthCheckType { case api.LB_HEALTH_CHECK_TCP: params["HealthCheck.CheckType"] = "TCP" case api.LB_HEALTH_CHECK_HTTP: @@ -620,7 +620,7 @@ func healthCheck(params map[string]string, listenerType string, opts *cloudprovi params["HealthCheck.IntervalTime"] = fmt.Sprintf("%d", opts.HealthCheckInterval) params["HealthCheck.HealthNum"] = fmt.Sprintf("%d", opts.HealthCheckRise) params["HealthCheck.UnHealthNum"] = fmt.Sprintf("%d", opts.HealthCheckFail) - switch opts.HealthCheck { + switch opts.HealthCheckType { case api.LB_HEALTH_CHECK_PING: params["HealthCheck.CheckType"] = "PING" params["HealthCheck.CheckPort"] = "-1" diff --git a/vendor/yunion.io/x/jsonutils/jsonutils.go b/vendor/yunion.io/x/jsonutils/jsonutils.go index ae51a90865..ab0d60607c 100644 --- a/vendor/yunion.io/x/jsonutils/jsonutils.go +++ b/vendor/yunion.io/x/jsonutils/jsonutils.go @@ -27,6 +27,7 @@ import ( "yunion.io/x/pkg/sortedmap" ) +// swagger:type object type JSONObject interface { gotypes.ISerializable @@ -68,6 +69,7 @@ var ( JSONFalse = &JSONBool{data: false} ) +// swagger:type object type JSONDict struct { JSONValue data sortedmap.SSortedMap @@ -294,26 +296,25 @@ func (s *sJsonParseSession) parseJSONValue(str []byte, offset int) (JSONObject, // https://www.ietf.org/rfc/rfc4627.txt // -// string = quotation-mark *char quotation-mark +// string = quotation-mark *char quotation-mark // -// char = unescaped / -// escape ( -// %x22 / ; " quotation mark U+0022 -// %x5C / ; \ reverse solidus U+005C -// %x2F / ; / solidus U+002F -// %x62 / ; b backspace U+0008 -// %x66 / ; f form feed U+000C -// %x6E / ; n line feed U+000A -// %x72 / ; r carriage return U+000D -// %x74 / ; t tab U+0009 -// %x75 4HEXDIG ) ; uXXXX U+XXXX +// char = unescaped / +// escape ( +// %x22 / ; " quotation mark U+0022 +// %x5C / ; \ reverse solidus U+005C +// %x2F / ; / solidus U+002F +// %x62 / ; b backspace U+0008 +// %x66 / ; f form feed U+000C +// %x6E / ; n line feed U+000A +// %x72 / ; r carriage return U+000D +// %x74 / ; t tab U+0009 +// %x75 4HEXDIG ) ; uXXXX U+XXXX // -// escape = %x5C ; \ +// escape = %x5C ; \ // -// quotation-mark = %x22 ; " -// -// unescaped = %x20-21 / %x23-5B / %x5D-10FFFF +// quotation-mark = %x22 ; " // +// unescaped = %x20-21 / %x23-5B / %x5D-10FFFF func escapeJsonChar(sb *strings.Builder, ch byte) { switch ch { case '"':