diff --git a/go.mod b/go.mod index c58cf66e98..0e05afe9de 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 1669dbc246..70628156d7 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/compute/models/cloudsync.go b/pkg/compute/models/cloudsync.go index 7aee96b381..30add44ef8 100644 --- a/pkg/compute/models/cloudsync.go +++ b/pkg/compute/models/cloudsync.go @@ -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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 2020e47346..6f3fd138a6 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.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 diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go index 872211211f..2bc0093408 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go @@ -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 {