diff --git a/go.mod b/go.mod index b1bba0b1ed..de5b240ae1 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,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.20221229070431-7ec90c4ba88a + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index ff53be07f8..fbf8c627e2 100644 --- a/go.sum +++ b/go.sum @@ -1158,8 +1158,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.20221229070431-7ec90c4ba88a h1:jkfjsQWUQTuLhqYWn0O2M/avyQlEIhWkfbwubVZ73sc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070431-7ec90c4ba88a/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b h1:FOm2nMJ8ljQuvFSFADeQRaX86SuoENGqjWI8LlM/dqo= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 71db9dab97..5e206c4910 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,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.20221229070431-7ec90c4ba88a +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waitstatus.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waitstatus.go index 9f09e68aff..58d57fe796 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waitstatus.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waitstatus.go @@ -28,7 +28,7 @@ func WaitStatus(res ICloudResource, expect string, interval time.Duration, timeo if err != nil { return err } - log.Debugf("status %s expect %s", res.GetStatus(), expect) + log.Infof("%s status %s expect %s", res.GetName(), res.GetStatus(), expect) if res.GetStatus() == expect { return nil } @@ -44,7 +44,7 @@ func WaitMultiStatus(res ICloudResource, expects []string, interval time.Duratio if err != nil { return errors.Wrap(err, "resource.Refresh()") } - log.Debugf("status %s expect %s", res.GetStatus(), expects) + log.Infof("%s status %s expect %s", res.GetName(), res.GetStatus(), expects) for _, expect := range expects { if res.GetStatus() == expect { return nil @@ -67,7 +67,7 @@ func WaitStatusWithInstanceErrorCheck(res ICloudResource, expect string, interva if err != nil { return err } - log.Debugf("status %s expect %s", res.GetStatus(), expect) + log.Infof("%s status %s expect %s", res.GetName(), res.GetStatus(), expect) if res.GetStatus() == expect { return nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go index 5094876884..4a5faba5f4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go @@ -297,11 +297,11 @@ func (self *SQcloudClient) CreateCDNDomain(opts *cloudprovider.CdnCreateOptions) params["Origin.OriginType"] = origin.Type if origin.Type == api.CDN_DOMAIN_ORIGIN_TYPE_BUCKET { params["Origin.OriginType"] = "cos" - } - if len(origin.ServerName) > 0 { - params["Origin.ServerName"] = origin.ServerName - } else { - params["Origin.ServerName"] = origin.Origin + if len(origin.ServerName) > 0 { + params["Origin.ServerName"] = origin.ServerName + } else { + params["Origin.ServerName"] = origin.Origin + } } if len(origin.Protocol) > 0 { params["Origin.OriginPullProtocol"] = origin.Protocol