From d04b1250c8a3ae55c6d1a39aaa7ef2e3dbe18985 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Mon, 16 Sep 2024 19:09:15 +0800 Subject: [PATCH] fix: update vendor 20240916 (#21246) Co-authored-by: Qiu Jian --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 4 ++-- .../pkg/multicloud/openstack/securitygroup.go | 2 +- vendor/yunion.io/x/sqlchemy/backends/dameng/dameng.go | 11 +++++++++++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 32f1d1031cd..4df7c2b90ab 100644 --- a/go.mod +++ b/go.mod @@ -94,14 +94,14 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.2.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913034220-ec4262b17acd + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913071039-481af55395be yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 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 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e - yunion.io/x/sqlchemy v1.1.3-0.20240831153043-4030cea8d4b9 + yunion.io/x/sqlchemy v1.1.3-0.20240916001724-cb6bf30b6f63 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c ) diff --git a/go.sum b/go.sum index 73f5226498a..8d57fceb8d5 100644 --- a/go.sum +++ b/go.sum @@ -1308,8 +1308,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.20240913034220-ec4262b17acd h1:HQ2Iny3sT10kJPiEfmdOewpmRHSCVXbw1GPBtJvvLC0= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913034220-ec4262b17acd/go.mod h1:iLoBHVR2Eur/1WJSGcbZaEwpzh/iqXvbFCsX9/xt8CI= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913071039-481af55395be h1:L5TzrYKeF9XUsjZ1ndB73ectCLVg4xUSXYR50Jc7OO0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913071039-481af55395be/go.mod h1:iLoBHVR2Eur/1WJSGcbZaEwpzh/iqXvbFCsX9/xt8CI= 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= @@ -1327,7 +1327,7 @@ yunion.io/x/pkg v1.10.1-0.20240905110705-77c46e716318 h1:Fm7I8ypXHxeObY4u/VUGz78 yunion.io/x/pkg v1.10.1-0.20240905110705-77c46e716318/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= -yunion.io/x/sqlchemy v1.1.3-0.20240831153043-4030cea8d4b9 h1:vJSHj5jalKW7Vx5dqPmdI/jmpqMxR6nqHHtZSTQUZYM= -yunion.io/x/sqlchemy v1.1.3-0.20240831153043-4030cea8d4b9/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ= +yunion.io/x/sqlchemy v1.1.3-0.20240916001724-cb6bf30b6f63 h1:55d4elb3Jy4VuQ8QpsgC8R/FmEZkGSHiarAJbZqGHE0= +yunion.io/x/sqlchemy v1.1.3-0.20240916001724-cb6bf30b6f63/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ= yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng= diff --git a/vendor/modules.txt b/vendor/modules.txt index 9ce16868dad..183d1769905 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1690,7 +1690,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.20240913034220-ec4262b17acd +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240913071039-481af55395be ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1842,7 +1842,7 @@ yunion.io/x/pkg/utils # yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e ## explicit; go 1.12 yunion.io/x/s3cli -# yunion.io/x/sqlchemy v1.1.3-0.20240831153043-4030cea8d4b9 +# yunion.io/x/sqlchemy v1.1.3-0.20240916001724-cb6bf30b6f63 ## explicit; go 1.17 yunion.io/x/sqlchemy yunion.io/x/sqlchemy/backends diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/securitygroup.go index e3a78af0461..7b46a1f4112 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/securitygroup.go @@ -97,7 +97,7 @@ func (region *SRegion) GetSecurityGroups(projectId, name string) ([]SSecurityGro } func (secgroup *SSecurityGroup) GetVpcId() string { - return "normal" + return "" } func (secgroup *SSecurityGroup) GetId() string { diff --git a/vendor/yunion.io/x/sqlchemy/backends/dameng/dameng.go b/vendor/yunion.io/x/sqlchemy/backends/dameng/dameng.go index 26dc8714a77..8afe7b63e33 100644 --- a/vendor/yunion.io/x/sqlchemy/backends/dameng/dameng.go +++ b/vendor/yunion.io/x/sqlchemy/backends/dameng/dameng.go @@ -15,6 +15,7 @@ package dameng import ( + "bytes" "fmt" "log" "reflect" @@ -278,3 +279,13 @@ func (dameng *SDamengBackend) GetColumnSpecByFieldType(table *sqlchemy.STableSpe func (dameng *SDamengBackend) QuoteChar() string { return "\"" } + +func (dameng *SDamengBackend) RegexpWhereClause(cond *sqlchemy.SRegexpConition) string { + var buf bytes.Buffer + buf.WriteString("REGEXP_LIKE(") + buf.WriteString(cond.GetLeft().Reference()) + buf.WriteString(", ") + buf.WriteString(sqlchemy.VarConditionWhereClause(cond.GetRight())) + buf.WriteString(")") + return buf.String() +}