Skip to content

Commit 77daacd

Browse files
swordqiuQiu Jian
andauthored
fix: update vendor to fix keystone user join project not found (#22643)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
1 parent cea0bdd commit 77daacd

File tree

9 files changed

+166
-99
lines changed

9 files changed

+166
-99
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
github.com/go-yaml/yaml v2.1.0+incompatible
2525
github.com/golang-plus/uuid v1.0.0
2626
github.com/golang/mock v1.4.4
27+
github.com/golang/protobuf v1.5.3
2728
github.com/google/cadvisor v0.38.5
2829
github.com/google/gopacket v1.1.17
2930
github.com/google/uuid v1.6.0
@@ -93,14 +94,14 @@ require (
9394
k8s.io/cri-api v0.22.17
9495
k8s.io/klog/v2 v2.20.0
9596
moul.io/http2curl/v2 v2.3.0
96-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250528153742-2296b9b7287c
97+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120035-500191be2aeb
9798
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
9899
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
99100
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
100101
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
101102
yunion.io/x/pkg v1.10.4-0.20250519013345-54017bf6c1f0
102103
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1
103-
yunion.io/x/sqlchemy v1.1.3-0.20250513031856-ce9f71063b3a
104+
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833
104105
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
105106
)
106107

@@ -195,7 +196,6 @@ require (
195196
github.com/gogo/protobuf v1.3.2 // indirect
196197
github.com/golang-plus/errors v1.0.0 // indirect
197198
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
198-
github.com/golang/protobuf v1.5.3 // indirect
199199
github.com/golang/snappy v0.0.4 // indirect
200200
github.com/google/btree v1.0.1 // indirect
201201
github.com/google/go-querystring v1.0.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,8 +1376,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
13761376
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
13771377
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
13781378
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1379-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250528153742-2296b9b7287c h1:DGnSo1KJS+0dZQTz76vArY+D1dEB8LoINmQP257Miso=
1380-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250528153742-2296b9b7287c/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
1379+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120035-500191be2aeb h1:T2I2F35yKnu94plsfRDRbSVyFtip/PGQ6s4BNrYjl9I=
1380+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120035-500191be2aeb/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
13811381
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
13821382
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
13831383
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
@@ -1395,7 +1395,7 @@ yunion.io/x/pkg v1.10.4-0.20250519013345-54017bf6c1f0 h1:iKWkBMKazSijYNhOaSh4qBu
13951395
yunion.io/x/pkg v1.10.4-0.20250519013345-54017bf6c1f0/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
13961396
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4=
13971397
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
1398-
yunion.io/x/sqlchemy v1.1.3-0.20250513031856-ce9f71063b3a h1:mDW1VyYJxZ4ORITZGDWacUiBNyqX6rMObnQk77NvUOg=
1399-
yunion.io/x/sqlchemy v1.1.3-0.20250513031856-ce9f71063b3a/go.mod h1:vCIZpqhZ5Jzaq3tFyrti/vv8BijQKtkzSgNT/uH4H5A=
1398+
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833 h1:XTFC1naKYkciCQDLm9izpzHXfTenmmtYsTpVKrsN5hE=
1399+
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833/go.mod h1:vCIZpqhZ5Jzaq3tFyrti/vv8BijQKtkzSgNT/uH4H5A=
14001400
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ=
14011401
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
17851785
# sigs.k8s.io/yaml v1.2.0
17861786
## explicit; go 1.12
17871787
sigs.k8s.io/yaml
1788-
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250528153742-2296b9b7287c
1788+
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120035-500191be2aeb
17891789
## explicit; go 1.21
17901790
yunion.io/x/cloudmux/pkg/apis
17911791
yunion.io/x/cloudmux/pkg/apis/billing
@@ -1936,7 +1936,7 @@ yunion.io/x/pkg/utils
19361936
# yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1
19371937
## explicit; go 1.12
19381938
yunion.io/x/s3cli
1939-
# yunion.io/x/sqlchemy v1.1.3-0.20250513031856-ce9f71063b3a
1939+
# yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833
19401940
## explicit; go 1.17
19411941
yunion.io/x/sqlchemy
19421942
yunion.io/x/sqlchemy/backends

vendor/yunion.io/x/cloudmux/pkg/apis/compute/waf_instance.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/waf_domain.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf_rules.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)