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

fix(region): vendor update (#22279)

Browse Source
This commit is contained in:
屈轩
2025-03-16 00:03:52 +08:00
committed by GitHub
parent e5d1bbd245
commit bd2ccad027
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -87,7 +87,7 @@ 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.20250313094508-c236d94eecef
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250314073043-eb2bca5e01ed
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256
yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
go.sum
+2 -2
View File
@@ -1274,8 +1274,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.20250313094508-c236d94eecef h1:Qd+jyLWWaDNal5c11m1UZ2VMB9NDAEFxGfi+sjbT63A=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250313094508-c236d94eecef/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250314073043-eb2bca5e01ed h1:CP6lMvZsIFYx/srsjeynA5DXZn0CV9nrh9iPFZlemT8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250314073043-eb2bca5e01ed/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y=
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8=
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
pkg/compute/models/cloudsync.go
+9
View File
@@ -1600,6 +1600,9 @@ func syncWafIPSets(
return remoteRegion.GetICloudWafIPSets()
}()
if err != nil {
if errors.Cause(err) == cloudprovider.ErrNotImplemented || errors.Cause(err) == cloudprovider.ErrNotSupported {
return nil
}
msg := fmt.Sprintf("GetICloudWafIPSets for region %s failed %s", remoteRegion.GetName(), err)
log.Errorf(msg)
return err
@@ -1634,6 +1637,9 @@ func syncWafRegexSets(
return remoteRegion.GetICloudWafRegexSets()
}()
if err != nil {
if errors.Cause(err) == cloudprovider.ErrNotImplemented || errors.Cause(err) == cloudprovider.ErrNotSupported {
return nil
}
msg := fmt.Sprintf("GetICloudWafRegexSets for region %s failed %s", remoteRegion.GetName(), err)
log.Errorf(msg)
return err
@@ -1954,6 +1960,9 @@ func syncWafRules(ctx context.Context, userCred mcclient.TokenCredential, syncRe
return remoteWafs.GetRules()
}()
if err != nil {
if errors.Cause(err) == cloudprovider.ErrNotImplemented || errors.Cause(err) == cloudprovider.ErrNotSupported {
return nil
}
msg := fmt.Sprintf("GetRules for waf instance %s failed %s", localWaf.Name, err)
log.Errorf(msg)
return err
vendor/modules.txt
Vendored
+1 -1
View File
@@ -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.20250313094508-c236d94eecef
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250314073043-eb2bca5e01ed
## explicit; go 1.21
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go
Generated Vendored
+1 -1
View File
@@ -79,7 +79,7 @@ func (self *SWafInstance) GetName() string {
}
func (self *SWafInstance) GetGlobalId() string {
return self.Domain
return self.DomainId
}
func (self *SWafInstance) GetId() string {