From f3337ed55297d714ee1c3c7002e5c54118450255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 9 Sep 2025 19:27:44 +0800 Subject: [PATCH] fix(region): cloudpods ipmi info sync (#23261) --- go.mod | 2 +- go.sum | 4 +- pkg/compute/models/hosts.go | 19 ++++++++ pkg/mcclient/cloudpods/host.go | 9 ++++ vendor/modules.txt | 4 +- .../x/cloudmux/pkg/cloudprovider/metric.md | 2 +- .../x/cloudmux/pkg/cloudprovider/metrics.go | 2 +- .../x/cloudmux/pkg/cloudprovider/resources.go | 1 + .../pkg/multicloud/aliyun/access_groups.go | 2 +- .../cloudmux/pkg/multicloud/aliyun/aliyun.go | 8 ++-- .../x/cloudmux/pkg/multicloud/aliyun/cdn.go | 4 +- .../x/cloudmux/pkg/multicloud/aliyun/disk.go | 2 +- .../x/cloudmux/pkg/multicloud/aliyun/eip.go | 2 +- .../aliyun/elasticcache_instance.go | 4 +- .../pkg/multicloud/aliyun/filesystem.go | 4 +- .../x/cloudmux/pkg/multicloud/aliyun/host.go | 2 +- .../pkg/multicloud/aliyun/instance.go | 2 +- .../x/cloudmux/pkg/multicloud/aliyun/kafka.go | 2 +- .../cloudmux/pkg/multicloud/aliyun/mongodb.go | 24 +++++++++-- .../pkg/multicloud/aliyun/natgateway.go | 2 +- .../pkg/multicloud/aliyun/securitygroup.go | 2 +- .../pkg/multicloud/aliyun/snapshot_policy.go | 4 +- .../x/cloudmux/pkg/multicloud/aliyun/vpc.go | 2 +- .../cloudmux/pkg/multicloud/apsara/apsara.go | 8 ++-- .../x/cloudmux/pkg/multicloud/apsara/disk.go | 2 +- .../apsara/elasticcache_instance.go | 4 +- .../cloudmux/pkg/multicloud/apsara/region.go | 4 +- .../pkg/multicloud/apsara/securitygroup.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/aws.go | 4 +- .../cloudmux/pkg/multicloud/aws/aws_invoke.go | 4 +- .../pkg/multicloud/aws/aws_request.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/cdn.go | 2 +- .../cloudmux/pkg/multicloud/aws/dbinstance.go | 2 +- .../pkg/multicloud/aws/dbinstance_cluster.go | 2 +- .../aws/dbinstance_gloable_cluster.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/disk.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/eip.go | 4 +- .../multicloud/aws/elasticache_instance.go | 4 +- .../multicloud/aws/elasticache_memcached.go | 2 +- .../multicloud/aws/elasticache_snapshot.go | 5 +-- .../pkg/multicloud/aws/elasticache_user.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/host.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/image.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/instance.go | 4 +- .../x/cloudmux/pkg/multicloud/aws/keypair.go | 2 +- .../pkg/multicloud/aws/loadbalancer.go | 2 +- .../aws/loadbalancerbackendgroup.go | 2 +- .../multicloud/aws/loadbalancerlistener.go | 4 +- .../cloudmux/pkg/multicloud/aws/natgateway.go | 6 +-- .../x/cloudmux/pkg/multicloud/aws/network.go | 2 +- .../pkg/multicloud/aws/networkinterface.go | 2 +- .../pkg/multicloud/aws/provider/provider.go | 2 +- .../cloudmux/pkg/multicloud/aws/routetable.go | 2 +- .../pkg/multicloud/aws/securitygroup.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/sku.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/snapshot.go | 2 +- .../pkg/multicloud/aws/storagecache.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/vpc.go | 6 +-- .../multicloud/aws/vpc_peering_connection.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/waf.go | 2 +- .../x/cloudmux/pkg/multicloud/aws/zone.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/azure.go | 6 +-- .../cloudmux/pkg/multicloud/azure/azure_v2.go | 2 +- .../pkg/multicloud/azure/loadbalancer.go | 4 +- .../azure/loadbalancerbackendgroup.go | 2 +- .../cloudmux/pkg/multicloud/azure/monitor.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/redis.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/region.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/vpc.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/waf.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/wire.go | 2 +- .../x/cloudmux/pkg/multicloud/azure/zone.go | 4 +- .../x/cloudmux/pkg/multicloud/baidu/baidu.go | 6 +-- .../x/cloudmux/pkg/multicloud/baidu/disk.go | 2 +- .../x/cloudmux/pkg/multicloud/baidu/region.go | 2 +- .../x/cloudmux/pkg/multicloud/baidu/zone.go | 2 +- .../pkg/multicloud/bingocloud/bingo.go | 4 +- .../pkg/multicloud/bingocloud/cluster.go | 2 +- .../pkg/multicloud/bingocloud/disk.go | 2 +- .../cloudmux/pkg/multicloud/bingocloud/eip.go | 2 +- .../pkg/multicloud/bingocloud/image.go | 4 +- .../pkg/multicloud/bingocloud/network.go | 2 +- .../pkg/multicloud/bingocloud/node.go | 2 +- .../pkg/multicloud/bingocloud/region.go | 6 +-- .../multicloud/bingocloud/securitygroup.go | 2 +- .../pkg/multicloud/bingocloud/storage.go | 2 +- .../pkg/multicloud/bingocloud/wire.go | 2 +- .../x/cloudmux/pkg/multicloud/cephfs/dirs.go | 4 +- .../x/cloudmux/pkg/multicloud/ctyun/ctyun.go | 8 ++-- .../x/cloudmux/pkg/multicloud/ctyun/host.go | 2 +- .../x/cloudmux/pkg/multicloud/ctyun/image.go | 2 +- .../cloudmux/pkg/multicloud/ctyun/instance.go | 2 +- .../x/cloudmux/pkg/multicloud/ctyun/region.go | 4 +- .../x/cloudmux/pkg/multicloud/ctyun/vpc.go | 2 +- .../pkg/multicloud/cucloud/cucloud.go | 2 +- .../cloudmux/pkg/multicloud/cucloud/region.go | 4 +- .../cloudmux/pkg/multicloud/ecloud/request.go | 2 +- .../x/cloudmux/pkg/multicloud/esxi/host.go | 2 +- .../pkg/multicloud/esxi/storagecache.go | 2 +- .../pkg/multicloud/esxi/virtualmachine.go | 43 ++++++++++--------- .../pkg/multicloud/google/bigquery.go | 2 +- .../cloudmux/pkg/multicloud/google/google.go | 2 +- .../cloudmux/pkg/multicloud/google/region.go | 23 +++++++--- .../pkg/multicloud/google/securitygroup.go | 2 +- .../x/cloudmux/pkg/multicloud/google/wire.go | 2 +- .../hcso/client/modules/manager_base.go | 2 +- .../pkg/multicloud/hcso/cloudgroup.go | 4 +- .../multicloud/hcso/elasticcache_account.go | 2 +- .../x/cloudmux/pkg/multicloud/hcso/hcso.go | 2 +- .../x/cloudmux/pkg/multicloud/host_base.go | 4 ++ .../x/cloudmux/pkg/multicloud/huawei/cdn.go | 4 +- .../pkg/multicloud/huawei/dbinstance.go | 2 +- .../multicloud/huawei/enterpriseprojects.go | 2 +- .../cloudmux/pkg/multicloud/huawei/huawei.go | 4 +- .../x/cloudmux/pkg/multicloud/huawei/image.go | 4 +- .../huawei/loadbalancer_backendgroup.go | 2 +- .../pkg/multicloud/huawei/obs/client_base.go | 2 +- .../pkg/multicloud/huawei/obs/http.go | 3 +- .../huawei/obs/temporary_createSignedUrl.go | 3 +- .../pkg/multicloud/huawei/obs/transfer.go | 12 +++--- .../pkg/multicloud/huawei/routetables.go | 4 +- .../x/cloudmux/pkg/multicloud/huawei/vpc.go | 2 +- .../x/cloudmux/pkg/multicloud/huawei/zone.go | 2 +- .../pkg/multicloud/jdcloud/balance.go | 2 +- .../x/cloudmux/pkg/multicloud/jdcloud/disk.go | 4 +- .../x/cloudmux/pkg/multicloud/jdcloud/eip.go | 2 +- .../cloudmux/pkg/multicloud/jdcloud/image.go | 6 +-- .../pkg/multicloud/jdcloud/instance.go | 2 +- .../pkg/multicloud/jdcloud/network.go | 4 +- .../x/cloudmux/pkg/multicloud/jdcloud/rds.go | 4 +- .../pkg/multicloud/jdcloud/rds_account.go | 2 +- .../pkg/multicloud/jdcloud/rds_backup.go | 2 +- .../pkg/multicloud/jdcloud/rds_database.go | 2 +- .../pkg/multicloud/jdcloud/securitygroup.go | 2 +- .../pkg/multicloud/jdcloud/snapshot.go | 4 +- .../x/cloudmux/pkg/multicloud/jdcloud/vpc.go | 2 +- .../pkg/multicloud/ksyun/dbinstance.go | 2 +- .../pkg/multicloud/ksyun/instances.go | 2 +- .../x/cloudmux/pkg/multicloud/ksyun/ksyun.go | 2 +- .../pkg/multicloud/nutanix/nutanix.go | 4 +- .../cloudmux/pkg/multicloud/nutanix/region.go | 2 +- .../pkg/multicloud/nutanix/storage.go | 4 +- .../x/cloudmux/pkg/multicloud/nutanix/zone.go | 4 +- .../pkg/multicloud/openstack/openstack.go | 2 +- .../cloudmux/pkg/multicloud/openstack/wire.go | 2 +- .../cloudmux/pkg/multicloud/oracle/oracle.go | 2 +- .../cloudmux/pkg/multicloud/oracle/region.go | 2 +- .../x/cloudmux/pkg/multicloud/oracle/vpc.go | 2 +- .../x/cloudmux/pkg/multicloud/proxmox/disk.go | 4 +- .../pkg/multicloud/proxmox/instance.go | 2 +- .../pkg/multicloud/proxmox/proxmox.go | 2 +- .../pkg/multicloud/proxmox/storage.go | 4 +- .../x/cloudmux/pkg/multicloud/qcloud/cdn.go | 6 +-- .../pkg/multicloud/qcloud/certificate.go | 6 +-- .../pkg/multicloud/qcloud/dnspod_domain.go | 4 +- .../x/cloudmux/pkg/multicloud/qcloud/eip.go | 2 +- .../pkg/multicloud/qcloud/elastic_search.go | 2 +- .../pkg/multicloud/qcloud/kube_clusters.go | 4 +- .../pkg/multicloud/qcloud/loadbalancer.go | 4 +- .../qcloud/loadbalancer_listener.go | 6 +-- .../cloudmux/pkg/multicloud/qcloud/mongodb.go | 2 +- .../cloudmux/pkg/multicloud/qcloud/monitor.go | 3 ++ .../cloudmux/pkg/multicloud/qcloud/qcloud.go | 8 ++-- .../pkg/multicloud/qcloud/rds_mysql.go | 6 +-- .../cloudmux/pkg/multicloud/qcloud/region.go | 6 +-- .../pkg/multicloud/qcloud/securitygroup.go | 2 +- .../x/cloudmux/pkg/multicloud/qcloud/waf.go | 2 +- .../pkg/multicloud/qingcloud/qingcloud.go | 6 +-- .../pkg/multicloud/remotefile/zone.go | 2 +- .../cloudmux/pkg/multicloud/ucloud/client.go | 2 +- .../pkg/multicloud/ucloud/securitygroup.go | 2 +- .../pkg/multicloud/volcengine/disk.go | 4 +- .../cloudmux/pkg/multicloud/volcengine/eip.go | 2 +- .../pkg/multicloud/volcengine/image.go | 4 +- .../pkg/multicloud/volcengine/instance.go | 2 +- .../pkg/multicloud/volcengine/policy.go | 2 +- .../multicloud/volcengine/securitygroup.go | 2 +- .../pkg/multicloud/volcengine/snapshot.go | 2 +- .../cloudmux/pkg/multicloud/volcengine/vpc.go | 4 +- .../pkg/multicloud/volcengine/zone.go | 4 +- .../pkg/multicloud/zstack/network_service.go | 2 +- .../cloudmux/pkg/multicloud/zstack/zstack.go | 10 ++--- 182 files changed, 359 insertions(+), 294 deletions(-) diff --git a/go.mod b/go.mod index 3296ffd38e..6c8ae28b83 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250909094125-d6c9c20a9d38 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index e9e029cbfe..7244076e74 100644 --- a/go.sum +++ b/go.sum @@ -1409,8 +1409,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.20250904062553-2e7d040a1d28 h1:4PDFt1V4ti4pbWfh7VEhX/5tfhA+1jcn9qTIE6je3Fs= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250909094125-d6c9c20a9d38 h1:V54cxF3E3kSZDYMivoULheOgfZwUt8daMoWiSd2iWpw= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250909094125-d6c9c20a9d38/go.mod h1:7P/TJZk8o4JjhFnF1nGZcsPg+sIpMoV0dWPPuG6yGLg= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/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/hosts.go b/pkg/compute/models/hosts.go index 361d93c8f3..0b481f4170 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -36,6 +36,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/tristate" "yunion.io/x/pkg/util/compare" "yunion.io/x/pkg/util/fileutils" @@ -2318,6 +2319,15 @@ func (hh *SHost) SyncWithCloudHost(ctx context.Context, userCred mcclient.TokenC hh.StorageDriver = storageDriver } hh.OvnVersion = extHost.GetOvnVersion() + if ipmiInfo := extHost.GetIpmiInfo(); !gotypes.IsNil(ipmiInfo) { + info := jsonutils.Marshal(ipmiInfo).(*jsonutils.JSONDict) + passwd, _ := info.GetString("password") + if len(passwd) > 0 { + passwd, _ = utils.EncryptAESBase64(hh.Id, passwd) + info.Set("password", jsonutils.NewString(passwd)) + } + hh.IpmiInfo = info + } if provider != nil && !utils.IsInStringArray(provider.Provider, strings.Split(options.Options.SkipSyncHostConfigInfoProviders, ",")) { hh.CpuCount = extHost.GetCpuCount() @@ -2565,6 +2575,15 @@ func (manager *SHostManager) NewFromCloudHost(ctx context.Context, userCred mccl host.StorageInfo = extHost.GetStorageInfo() host.OvnVersion = extHost.GetOvnVersion() + if ipmiInfo := extHost.GetIpmiInfo(); !gotypes.IsNil(ipmiInfo) { + info := jsonutils.Marshal(ipmiInfo).(*jsonutils.JSONDict) + passwd, _ := info.GetString("password") + if len(passwd) > 0 { + passwd, _ = utils.EncryptAESBase64(host.Id, passwd) + info.Set("password", jsonutils.NewString(passwd)) + } + host.IpmiInfo = info + } host.Status = extHost.GetStatus() host.HostStatus = extHost.GetHostStatus() diff --git a/pkg/mcclient/cloudpods/host.go b/pkg/mcclient/cloudpods/host.go index bf55f31e48..d348940bfa 100644 --- a/pkg/mcclient/cloudpods/host.go +++ b/pkg/mcclient/cloudpods/host.go @@ -196,6 +196,10 @@ func (host *SHost) GetSchedtags() ([]string, error) { return ret, nil } +func (host *SHost) GetIpmiInfo() jsonutils.JSONObject { + return host.zone.region.GetIpmiInfo(host.Id) +} + type SHostNic struct { host *SHost @@ -318,6 +322,11 @@ func (region *SRegion) GetHost(id string) (*SHost, error) { return host, nil } +func (region *SRegion) GetIpmiInfo(hostId string) jsonutils.JSONObject { + resp, _ := modules.Hosts.GetIpmiInfo(region.cli.s, hostId, nil) + return resp +} + func (zone *SZone) GetIHostById(id string) (cloudprovider.ICloudHost, error) { host, err := zone.region.GetHost(id) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index e1432a2060..dff480cdf4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1852,8 +1852,8 @@ 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.20250904062553-2e7d040a1d28 -## explicit; go 1.21 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250909094125-d6c9c20a9d38 +## explicit; go 1.24 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing yunion.io/x/cloudmux/pkg/apis/cloudid diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metric.md b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metric.md index afae5c7385..fba2114409 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metric.md +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metric.md @@ -27,7 +27,7 @@ |---------|-----|--------|--------|------|-------|--------|--------|--------|-----|--------|--------|---------|--------|----------|--------|--------|--------|------------| | CPU使用率(vm_cpu.usage_active) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | 内存使用率(vm_mem.used_percent) | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| 磁盘使用率(vm_disk.used_percent) | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ | +| 磁盘使用率(vm_disk.used_percent) | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ | | 磁盘读速率(vm_diskio.read_bps) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | | 磁盘写速率(vm_diskio.write_bps) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | | 磁盘读IOPS(vm_diskio.read_iops) | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metrics.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metrics.go index 76455c0626..3fb76166e0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metrics.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metrics.go @@ -127,7 +127,7 @@ const ( // 支持平台: kvm, aliyun, apsara, azure, esxi, bingocloud, jdcloud, ecloud, qcloud, volcengine, baidu, ctyun, oracle VM_METRIC_TYPE_MEM_USAGE TMetricType = "vm_mem.used_percent" // 虚拟机磁盘使用率 - // 支持平台: aliyun, apsara, jdcloud, azure, baidu, ctyun, huawei, hcso, volcengine + // 支持平台: aliyun, apsara, jdcloud, azure, baidu, ctyun, huawei, hcso, volcengine, qcloud // 支持按盘符(group_by=device)平台: aliyun, apsara VM_METRIC_TYPE_DISK_USAGE TMetricType = "vm_disk.used_percent" diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go index 47b7efc830..e7da430128 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go @@ -324,6 +324,7 @@ type ICloudHost interface { GetOvnVersion() string // just for cloudpods host GetIsolateDevices() ([]IsolateDevice, error) + GetIpmiInfo() jsonutils.JSONObject } type IsolateDevice interface { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/access_groups.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/access_groups.go index aa9e50394f..9af51300fd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/access_groups.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/access_groups.go @@ -278,5 +278,5 @@ func (self *SAccessGroup) CreateRule(opts *cloudprovider.AccessGroupRule) (cloud return &rules[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, ruleId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", ruleId) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/aliyun.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/aliyun.go index 93c6377eb4..509345ae80 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/aliyun.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/aliyun.go @@ -241,9 +241,9 @@ func doRequest(client *sdk.Client, domain, apiVersion, apiName string, params ma "InvalidAccessKeyId.Inactive", "Forbidden.AccessKeyDisabled", "Forbidden.AccessKey": - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) case "Forbidden.RAM": - return nil, errors.Wrapf(cloudprovider.ErrForbidden, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrForbidden, "%s", err.Error()) case "404 Not Found", "InstanceNotFound": return nil, errors.Wrap(cloudprovider.ErrNotFound, err.Error()) case "OperationDenied.NoStock": @@ -393,7 +393,7 @@ func _jsonRequest(client *sdk.Client, domain string, version string, apiName str if respBody.Contains("Code") { code, _ := respBody.GetString("Code") if len(code) > 0 && !utils.IsInStringArray(code, []string{"200", "Success"}) { - return nil, fmt.Errorf(respBody.String()) + return nil, fmt.Errorf("%s", respBody.String()) } } return respBody, nil @@ -513,7 +513,7 @@ func (self *SAliyunClient) _getSdkClient(regionId string) (*sdk.Client, error) { } } if self.cpcfg.ReadOnly { - return respCheck, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action) + return respCheck, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s", action) } return respCheck, nil }) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/cdn.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/cdn.go index a145dbfe03..2eb80b95cf 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/cdn.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/cdn.go @@ -234,9 +234,9 @@ func (self *SAliyunClient) GetCDNDomainByName(name string) (*SCdnDomain, error) return &domains[0], nil } if total == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, name) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", name) } func (client *SAliyunClient) DescribeDomainsBySource(origin string) (SCdnDomainsList, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/disk.go index f7adc09cd9..d60df339c9 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/disk.go @@ -331,7 +331,7 @@ func (self *SRegion) getDisk(diskId string) (*SDisk, error) { return &disks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, diskId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", diskId) } func (self *SRegion) DeleteDisk(diskId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/eip.go index fb4071fe69..ddc318aa9c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/eip.go @@ -303,7 +303,7 @@ func (region *SRegion) GetEip(eipId string) (*SEipAddress, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, eipId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", eipId) } func (region *SRegion) AllocateEIP(opts *cloudprovider.SEip) (*SEipAddress, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go index 5a09d86888..fbadf596b4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go @@ -457,7 +457,7 @@ func (self *SElasticcache) GetAttribute() (*SElasticcacheAttribute, error) { for i := range ret { return &ret[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.GetId()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.GetId()) } func (self *SElasticcache) GetNetInfo() ([]SNetInfo, error) { @@ -582,7 +582,7 @@ func (self *SRegion) GetElasticCacheAccountByName(instanceId string, accountName for i := range ret { return &ret[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, accountName) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", accountName) } // https://help.aliyun.com/document_detail/63889.html?spm=a2c4g.11186623.6.764.3cb43852R7lnoS diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/filesystem.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/filesystem.go index 2718b13fd1..4756111cef 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/filesystem.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/filesystem.go @@ -235,9 +235,9 @@ func (self *SRegion) GetFileSystem(id string) (*SFileSystem, error) { return &nas[0], nil } if total == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, id) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", id) } func (self *SRegion) GetICloudFileSystemById(id string) (cloudprovider.ICloudFileSystem, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go index d26b5ab182..d67473bd0a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go @@ -64,7 +64,7 @@ func (self *SHost) GetIVMById(id string) (cloudprovider.ICloudVM, error) { return &vms[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SHost) GetId() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go index c0d6ca540d..e49ed97227 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go @@ -555,7 +555,7 @@ func (self *SRegion) GetInstance(instanceId string) (*SInstance, error) { return &instances[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (self *SRegion) CreateInstance(name, hostname string, imageId string, instanceType string, securityGroupIds []string, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kafka.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kafka.go index 9ae155de26..ea63136545 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kafka.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kafka.go @@ -207,7 +207,7 @@ func (self *SRegion) GetKafka(id string) (*SKafka, error) { return &kafkas[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetKafkas(ids []string) ([]SKafka, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/mongodb.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/mongodb.go index c8a26ae0e7..1f510d5d84 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/mongodb.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/mongodb.go @@ -87,6 +87,7 @@ type SMongoDB struct { VSwitchId string `json:"VSwitchId"` VpcAuthMode string `json:"VpcAuthMode"` ReplicationFactor string `json:"ReplicationFactor"` + KindCode string `json:"KindCode"` } var mongoSpec = map[string]struct { @@ -128,6 +129,16 @@ func (self *SMongoDB) GetStatus() string { } } +func (self *SMongoDB) GetSysTags() map[string]string { + ret := self.AliyunTags.GetSysTags() + if len(self.KindCode) == 0 { + self.Refresh() + } + // 用户需要通过KindCode区分是否是快照备份 + ret["KindCode"] = self.KindCode + return ret +} + func (self *SMongoDB) GetProjectId() string { return self.ResourceGroupId } @@ -233,6 +244,9 @@ func (self *SMongoDB) GetPort() int { } func (self *SMongoDB) GetReplicationNum() int { + if self.DBInstanceType == "sharding" { + return len(self.ShardList.ShardAttribute) + } if len(self.ReplicationFactor) == 0 { self.Refresh() } @@ -410,11 +424,13 @@ func (self *SRegion) GetMongoDB(id string) (*SMongoDB, error) { if err != nil { return nil, errors.Wrapf(err, "resp.Unmarshal") } - if len(ret) == 1 { - ret[0].region = self - return &ret[0], nil + for i := range ret { + ret[i].region = self + if ret[i].DBInstanceId == id { + return &ret[i], nil + } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) DeleteMongoDB(id string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/natgateway.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/natgateway.go index bfda2a615c..677efcd704 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/natgateway.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/natgateway.go @@ -141,7 +141,7 @@ func (self *SNatGateway) Refresh() error { return errors.Wrapf(cloudprovider.ErrDuplicateId, "get %d natgateways by id %s", total, self.NatGatewayId) } if total == 0 { - return errors.Wrapf(cloudprovider.ErrNotFound, self.NatGatewayId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.NatGatewayId) } return jsonutils.Update(self, nat[0]) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go index f50b5b39ee..30aab4427e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go @@ -209,7 +209,7 @@ func (self *SRegion) GetSecurityGroup(id string) (*SSecurityGroup, error) { return &groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) CreateSecurityGroup(opts *cloudprovider.SecurityGroupCreateInput) (string, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/snapshot_policy.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/snapshot_policy.go index e36c76be4f..73d83cbd0a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/snapshot_policy.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/snapshot_policy.go @@ -77,7 +77,7 @@ func (self *SSnapshotPolicy) Refresh() error { return jsonutils.Update(self, policies[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.AutoSnapshotPolicyId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.AutoSnapshotPolicyId) } func (self *SSnapshotPolicy) IsEmulated() bool { @@ -215,7 +215,7 @@ func (self *SRegion) GetISnapshotPolicyById(id string) (cloudprovider.ICloudSnap return &policies[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) CreateSnapshotPolicy(input *cloudprovider.SnapshotPolicyInput) (string, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/vpc.go index 6a8fb8e63a..821212c0f8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/vpc.go @@ -227,7 +227,7 @@ func (self *SVpc) GetIRouteTableById(routeTableId string) (cloudprovider.ICloudR return tables[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, routeTableId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", routeTableId) } func (self *SVpc) Delete() error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/apsara.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/apsara.go index 6bec63bb57..d8d1692b96 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/apsara.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/apsara.go @@ -159,7 +159,7 @@ func jsonRequest(client *sdk.Client, domain, apiVersion, apiName string, params } for _, code := range []string{"404 Not Found", "EntityNotExist.Role", "EntityNotExist.Group"} { if strings.Contains(err.Error(), code) { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", err.Error()) } } for _, code := range []string{ @@ -236,11 +236,11 @@ func _jsonRequest(client *sdk.Client, domain string, version string, apiName str if body.Contains("Code") { code, _ := body.GetString("Code") if len(code) > 0 && !utils.IsInStringArray(code, []string{"200"}) { - return nil, fmt.Errorf(body.String()) + return nil, fmt.Errorf("%s", body.String()) } } if body.Contains("errorKey") { - return nil, errors.Errorf(body.String()) + return nil, errors.Errorf("%s", body.String()) } return body, nil } @@ -297,7 +297,7 @@ func (self *SApsaraClient) getDefaultClient(regionId string) (*sdk.Client, error return respCheck, nil } } - return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action) + return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s", action) } return respCheck, nil }), diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go index 1fb17642a2..839524556a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go @@ -288,7 +288,7 @@ func (self *SRegion) getDisk(diskId string) (*SDisk, error) { return &disks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, diskId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", diskId) } func (self *SRegion) DeleteDisk(diskId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go index f0006fa7d7..a8702be656 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go @@ -443,7 +443,7 @@ func (self *SElasticcache) GetAttribute() (*SElasticcacheAttribute, error) { for i := range ret { return &ret[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.GetId()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.GetId()) } func (self *SElasticcache) GetNetInfo() ([]SNetInfo, error) { @@ -568,7 +568,7 @@ func (self *SRegion) GetElasticCacheAccountByName(instanceId string, accountName for i := range ret { return &ret[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, accountName) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", accountName) } // https://help.aliyun.com/document_detail/63889.html?spm=a2c4g.11186623.6.764.3cb43852R7lnoS diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/region.go index 674a1db2f8..d0b38cdd9b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/region.go @@ -158,7 +158,7 @@ func (self *SRegion) lbRequest(apiName string, params map[string]string) (jsonut return self.productRequest(client, APSARA_PRODUCT_SLB, domain, APSARA_API_VERSION_LB, apiName, params, self.client.debug) } -///////////////////////////////////////////////////////////////////////////// +// /////////////////////////////////////////////////////////////////////////// func (self *SRegion) GetId() string { return self.RegionId } @@ -1058,7 +1058,7 @@ func (self *SRegion) GetIBucketById(name string) (cloudprovider.ICloudBucket, er return &buckets[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (region *SRegion) GetIBucketByName(name string) (cloudprovider.ICloudBucket, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/securitygroup.go index 5ef88dc6b8..16d81a1b0f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/securitygroup.go @@ -144,7 +144,7 @@ func (self *SRegion) GetSecurityGroup(id string) (*SSecurityGroup, error) { return &groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetSecurityGroups(vpcId, name string, securityGroupIds []string, offset int, limit int) ([]SSecurityGroup, int, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go index f29c6a7b9a..167e63d6ff 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go @@ -222,7 +222,7 @@ func (client *SAwsClient) getAwsSession(regionId string, assumeRole bool) (*sess return respCheck, nil } } - return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action) + return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s", action) } // organization if service == "organizations" { @@ -301,7 +301,7 @@ func (client *SAwsClient) fetchBuckets() error { output, err := s3cli.ListBuckets(&s3.ListBucketsInput{}) if err != nil { if e, ok := err.(awserr.Error); ok && e.Code() == "AccessDenied" { - return errors.Wrapf(cloudprovider.ErrForbidden, e.Message()) + return errors.Wrapf(cloudprovider.ErrForbidden, "%s", e.Message()) } return errors.Wrap(err, "ListBuckets") } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_invoke.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_invoke.go index bb992324d0..8639aaa202 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_invoke.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_invoke.go @@ -228,7 +228,7 @@ func UnmarshalJsonError(r *request.Request) { } if r.HTTPResponse.StatusCode == 404 { - r.Error = errors.Wrapf(cloudprovider.ErrNotFound, string(result)) + r.Error = errors.Wrapf(cloudprovider.ErrNotFound, "%s", string(result)) return } @@ -245,7 +245,7 @@ func UnmarshalJsonError(r *request.Request) { respErr := &sAwsInvokeError{} err = obj.Unmarshal(respErr) if err != nil { - r.Error = errors.Wrapf(err, obj.String()) + r.Error = errors.Wrapf(err, "%s", obj.String()) return } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_request.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_request.go index 186dab7718..2f9a3f08ab 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_request.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws_request.go @@ -226,7 +226,7 @@ func UnmarshalError(r *request.Request) { } if strings.Contains(respErr.Errors.Code, "NotFound") || strings.HasPrefix(respErr.Errors.Code, "NoSuch") { - r.Error = errors.Wrapf(cloudprovider.ErrNotFound, jsonutils.Marshal(respErr).String()) + r.Error = errors.Wrapf(cloudprovider.ErrNotFound, "%s", jsonutils.Marshal(respErr).String()) return } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/cdn.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/cdn.go index 5030f72e35..0aedb567a5 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/cdn.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/cdn.go @@ -216,7 +216,7 @@ func (ac *SAwsClient) GetCDNDomainByName(name string) (*SCdnDomain, error) { } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (ac *SAwsClient) GetCdnDomains() ([]SCdnDomain, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go index eb400bd102..282a87b4ec 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go @@ -321,7 +321,7 @@ func (region *SRegion) GetDBInstance(instanceId string) (*SDBInstance, error) { return &instances[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (rds *SDBInstance) GetZone1Id() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_cluster.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_cluster.go index 5b4e67ca00..197ce60ffc 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_cluster.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_cluster.go @@ -306,5 +306,5 @@ func (region *SRegion) GetDBInstanceCluster(id string) (*SDBInstanceCluster, err return &clusters[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_gloable_cluster.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_gloable_cluster.go index 15a87f11d2..146d498ebf 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_gloable_cluster.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance_gloable_cluster.go @@ -66,5 +66,5 @@ func (region *SRegion) GetDBInstanceGlobalCluster(id string) (*SDBInstanceGlobal return &clusters[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go index e717ceb769..cf728d458f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go @@ -323,7 +323,7 @@ func (self *SRegion) GetDisk(diskId string) (*SDisk, error) { return &disks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, diskId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", diskId) } func (self *SRegion) DeleteDisk(diskId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go index 75a0e4cc5f..5f37b75ede 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/eip.go @@ -231,7 +231,7 @@ func (self *SRegion) GetEip(id string) (*SEipAddress, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetEipByIpAddress(eipAddress string) (*SEipAddress, error) { @@ -245,7 +245,7 @@ func (self *SRegion) GetEipByIpAddress(eipAddress string) (*SEipAddress, error) return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, eipAddress) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", eipAddress) } func (self *SRegion) AllocateEIP(opts *cloudprovider.SEip) (*SEipAddress, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_instance.go index e0faf849fb..9f47c8df3f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_instance.go @@ -178,7 +178,7 @@ func (self *SReplicationGroup) Refresh() error { return jsonutils.Update(&self, caches[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.GetGlobalId()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.GetGlobalId()) } func (self *SReplicationGroup) GetBillingType() string { @@ -650,7 +650,7 @@ func (region *SRegion) GetIElasticcacheById(id string) (cloudprovider.ICloudElas return &memcaches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } type SubnetOutpost struct { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_memcached.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_memcached.go index 16c3c0a563..8a3adde5c7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_memcached.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_memcached.go @@ -110,7 +110,7 @@ func (self *SElasticache) Refresh() error { return jsonutils.Update(&self, caches[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.GetGlobalId()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.GetGlobalId()) } func (self *SElasticache) GetBillingType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_snapshot.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_snapshot.go index 1364f08f11..3762902cf3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_snapshot.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_snapshot.go @@ -110,7 +110,7 @@ func (self *SElasticacheSnapshop) Refresh() error { return jsonutils.Update(self, snapshots[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.GetName()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.GetName()) } func (self *SElasticacheSnapshop) GetBackupSizeMb() int { @@ -151,7 +151,6 @@ func (self *SElasticacheSnapshop) GetBackupMode() string { default: return self.SnapshotSource } - return "" } func (self *SElasticacheSnapshop) GetDownloadURL() string { @@ -197,7 +196,7 @@ func (region *SRegion) GetCacheSnapshots(replicaGroupId string, snapshotName str } ret = append(ret, part.Snapshots...) if len(part.Snapshots) == 0 || len(part.Marker) == 0 { - return nil, err + break } params["Marker"] = part.Marker } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_user.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_user.go index 924da59d73..e40c8675f6 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_user.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/elasticache_user.go @@ -79,7 +79,7 @@ func (self *SElasticacheUser) Refresh() error { return jsonutils.Update(self, users[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.UserId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.UserId) } func (self *SElasticacheUser) GetAccountType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go index c5d55189f7..19ecbec1d7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go @@ -80,7 +80,7 @@ func (self *SHost) GetIVMById(id string) (cloudprovider.ICloudVM, error) { return &vms[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SHost) GetIStorages() ([]cloudprovider.ICloudStorage, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go index 2db8010131..d501cb174d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go @@ -158,7 +158,7 @@ func (self *SRegion) GetImportImageTask(id string) (*ImageImportTask, error) { return &tasks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *ImageImportTask) IsEmulated() bool { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go index 02c6760c38..973a4c599a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go @@ -750,7 +750,7 @@ func (self *SRegion) GetInstance(instanceId string) (*SInstance, error) { return &instances[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (self *SRegion) GetInstanceIdByImageId(imageId string) (string, error) { @@ -1120,7 +1120,7 @@ func (self *SInstance) SetTags(tags map[string]string, replace bool) error { func (self *SInstance) GetAccountId() string { identity, err := self.host.zone.region.client.GetCallerIdentity() if err != nil { - log.Errorf(err.Error() + "self.region.client.GetCallerIdentity()") + log.Errorf("GetCallerIdentity %v", err) return "" } return identity.Account diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/keypair.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/keypair.go index 4186d99c07..c3fa61f74a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/keypair.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/keypair.go @@ -132,7 +132,7 @@ func (self *SRegion) lookUpAwsKeypair(publicKey string) (string, error) { if len(keyparis) > 0 { return keyparis[0].KeyName, nil } - return "", errors.Wrapf(cloudprovider.ErrNotFound, publicKey) + return "", errors.Wrapf(cloudprovider.ErrNotFound, "%s", publicKey) } func (self *SRegion) importAwsKeypair(publicKey string) (string, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancer.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancer.go index 8af26a46fa..9897ad0a96 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancer.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancer.go @@ -343,7 +343,7 @@ func (self *SRegion) GetElbBackendgroup(id string) (*SElbBackendGroup, error) { return &groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func ToAwsHealthCode(s string) string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerbackendgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerbackendgroup.go index f1a79e96b6..673e522fc7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerbackendgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerbackendgroup.go @@ -233,7 +233,7 @@ func (self *SRegion) GetELbBackend(backendId string) (*SElbBackend, error) { return &ret.TargetHealthDescriptions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, backendId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", backendId) } func parseElbBackendId(id string) (string, string, int, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerlistener.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerlistener.go index da013b66bd..98bfb4a0ce 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerlistener.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancerlistener.go @@ -563,7 +563,7 @@ func (self *SRegion) GetElbListener(listenerId string) (*SElbListener, error) { return &ret[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, listenerId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", listenerId) } func (self *SRegion) CreateElbListener(lbId string, opts *cloudprovider.SLoadbalancerListenerCreateOptions) (*SElbListener, error) { @@ -635,7 +635,7 @@ func (self *SRegion) GetElbListenerRule(lisId, ruleId string) (*SElbListenerRule return &rules[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, ruleId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", ruleId) } func (self *SRegion) DeleteElbListener(id string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/natgateway.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/natgateway.go index 6f8e9b992f..6d7e5e84e8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/natgateway.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/natgateway.go @@ -135,11 +135,11 @@ func (self *SNatGateway) GetINatSTable() ([]cloudprovider.ICloudNatSEntry, error } func (self *SNatGateway) GetINatDEntryById(id string) (cloudprovider.ICloudNatDEntry, error) { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SNatGateway) GetINatSEntryById(id string) (cloudprovider.ICloudNatSEntry, error) { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SNatGateway) CreateINatDEntry(rule cloudprovider.SNatDRule) (cloudprovider.ICloudNatDEntry, error) { @@ -235,7 +235,7 @@ func (self *SRegion) GetNatGateway(id string) (*SNatGateway, error) { return &nats[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SVpc) GetINatGateways() ([]cloudprovider.ICloudNatGateway, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/network.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/network.go index b988846e78..e86d066e9c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/network.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/network.go @@ -271,7 +271,7 @@ func (self *SRegion) getNetwork(networkId string) (*SNetwork, error) { return &networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, networkId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", networkId) } func (self *SRegion) DeleteNetwork(id string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/networkinterface.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/networkinterface.go index 4905018ccd..f965c6a948 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/networkinterface.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/networkinterface.go @@ -82,7 +82,7 @@ func (self *SRegion) GetNetworkInterface(id string) (*SNetworkInterface, error) return &nets[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetNetworkInterfaces(id string) ([]SNetworkInterface, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go index 683e4ebf6f..e636713917 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/provider/provider.go @@ -380,7 +380,7 @@ func (self *SAwsProvider) GetICloudroleById(id string) (cloudprovider.ICloudrole return roles[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SAwsProvider) GetICloudroleByName(name string) (cloudprovider.ICloudrole, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/routetable.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/routetable.go index 99d456e338..e3148d66b5 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/routetable.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/routetable.go @@ -281,7 +281,7 @@ func (self *SRegion) GetRouteTable(id string) (*SRouteTable, error) { return &tables[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) DeleteRouteTable(rid string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/securitygroup.go index f52cce0f5c..dbd56074d3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/securitygroup.go @@ -159,7 +159,7 @@ func (self *SRegion) CreateSecurityGroupRule(secGrpId string, opts *cloudprovide err := self.ec2Request(action, params, &ret) if err != nil { - return nil, errors.Wrapf(err, action) + return nil, errors.Wrapf(err, "%s", action) } for i := range ret.SecurityGroupRuleSet { return &ret.SecurityGroupRuleSet[i], nil diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/sku.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/sku.go index 46dc5df20a..124dbf1e4e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/sku.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/sku.go @@ -134,7 +134,7 @@ func (self *SRegion) GetInstanceType(name string) (*InstanceType, error) { return &ret.InstanceTypeSet[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (self *SRegion) GetInstanceTypes() ([]SInstanceType, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/snapshot.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/snapshot.go index 5d2c7d27b7..1c2cc78e66 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/snapshot.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/snapshot.go @@ -113,7 +113,7 @@ func (self *SRegion) GetSnapshot(id string) (*SSnapshot, error) { return &snapshots[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetSnapshots(diskId string, name string, ids []string) ([]SSnapshot, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/storagecache.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/storagecache.go index 77a9879848..b9107ba614 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/storagecache.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/storagecache.go @@ -249,7 +249,7 @@ func (self *SRegion) DescribeExportTasks(id string) (*SExportTask, error) { return &ret.ExportTaskSet[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) CheckBucket(bucketName string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc.go index 4fcf46f3d2..6600ab340e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc.go @@ -213,7 +213,7 @@ func (self *SVpc) GetIWireById(wireId string) (cloudprovider.ICloudWire, error) return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, wireId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", wireId) } func (self *SVpc) GetICloudVpcPeeringConnections() ([]cloudprovider.ICloudVpcPeeringConnection, error) { @@ -268,7 +268,7 @@ func (self *SVpc) AcceptICloudVpcPeeringConnection(id string) error { func (self *SVpc) GetAuthorityOwnerId() string { identity, err := self.region.client.GetCallerIdentity() if err != nil { - log.Errorf(err.Error() + "self.region.client.GetCallerIdentity()") + log.Errorf("GetCallerIdentity error: %v", err) return "" } return identity.Account @@ -393,7 +393,7 @@ func (self *SRegion) getVpc(vpcId string) (*SVpc, error) { return &vpcs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, vpcId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", vpcId) } func (self *SRegion) assignSecurityGroups(secgroupIds []string, instanceId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc_peering_connection.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc_peering_connection.go index a571ad5f5c..02dd0b856b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc_peering_connection.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/vpc_peering_connection.go @@ -73,7 +73,7 @@ func (self *SRegion) GetVpcPeeringConnectionById(id string) (*SVpcPeeringConnect return &peers[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) CreateVpcPeeringConnection(vpcId string, opts *cloudprovider.VpcPeeringConnectionCreateOptions) (*SVpcPeeringConnection, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf.go index 14b6615326..45a7b7781c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/waf.go @@ -147,7 +147,7 @@ func (self *SRegion) GetWebAcl(id, name, scope string) (*SWebAcl, error) { resp, err := client.GetWebACL(&input) if err != nil { if _, ok := err.(*wafv2.WAFNonexistentItemException); ok { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", err.Error()) } return nil, errors.Wrapf(err, "GetWebAcl") } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/zone.go index 56024fa78c..e7d0273c55 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/zone.go @@ -143,7 +143,7 @@ func (self *SZone) getStorageByCategory(category string) (*SStorage, error) { return storage, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, category) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", category) } func (self *SZone) GetDescription() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go index 3af38e1156..df3c54abcd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure.go @@ -706,10 +706,10 @@ func (ae *AzureResponseError) ParseErrorFromJsonResponse(statusCode int, status return errors.Wrap(cloudprovider.ErrNotFound, msg) } if ae.AzureError.Code == "AuthorizationFailed" { - return errors.Wrapf(cloudprovider.ErrForbidden, jsonutils.Marshal(ae).String()) + return errors.Wrapf(cloudprovider.ErrForbidden, "%s", jsonutils.Marshal(ae).String()) } if ae.AzureError.Code == "ResourceCollectionRequestsThrottled" { - return errors.Wrapf(cloudprovider.ErrTooManyRequests, jsonutils.Marshal(ae).String()) + return errors.Wrapf(cloudprovider.ErrTooManyRequests, "%s", jsonutils.Marshal(ae).String()) } if len(ae.OdataError.Code) > 0 || len(ae.AzureError.Code) > 0 || (len(ae.Code) > 0 && len(ae.Message) > 0) { return ae @@ -725,7 +725,7 @@ func _jsonRequest(client *autorest.Client, method, domain, path string, body jso header, body, err := cli.Send(context.TODO(), req, &ae, debug) if err != nil { if strings.Contains(err.Error(), "azure.BearerAuthorizer#WithAuthorization") { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) } return nil, err } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure_v2.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure_v2.go index 1e7d15412a..294af61db9 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure_v2.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/azure_v2.go @@ -108,7 +108,7 @@ func (self *SAzureClient) auth(resource string) (string, error) { return "", errors.Wrapf(err, "parse body %s", string(body)) } if obj.Contains("error") { - return "", errors.Errorf(string(body)) + return "", errors.Errorf("%s", string(body)) } token := &Token{} err = obj.Unmarshal(token) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancer.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancer.go index 8011a48b28..3c0ef03dc3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancer.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancer.go @@ -273,7 +273,7 @@ func (self *SLoadbalancer) GetILoadBalancerListenerById(id string) (cloudprovide return lblis[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SLoadbalancer) GetILoadBalancerCertificates() ([]cloudprovider.ICloudLoadbalancerCertificate, error) { @@ -323,7 +323,7 @@ func (self *SLoadbalancer) GetILoadBalancerBackendGroupById(groupId string) (clo return lbbgs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, groupId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", groupId) } func (self *SRegion) GetLoadbalancers() ([]SLoadbalancer, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancerbackendgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancerbackendgroup.go index 4e6a83c406..7f6f9589f8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancerbackendgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/loadbalancerbackendgroup.go @@ -133,7 +133,7 @@ func (self *SLoadbalancerBackendGroup) GetILoadbalancerBackendById(backendId str } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, backendId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", backendId) } func (self *SLoadbalancerBackendGroup) GetProtocolType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/monitor.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/monitor.go index 7f40371dcf..6c78136972 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/monitor.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/monitor.go @@ -352,7 +352,7 @@ func (self *SAzureClient) GetRdsMetrics(opts *cloudprovider.MetricListOptions) ( metricnamespace = fmt.Sprintf("Microsoft.DBforPostgreSQL/%s", rdsType) metricnames = "cpu_percent,memory_percent,storage_percent,network_bytes_ingress,network_bytes_egress,io_consumption_percent,connections_failed,active_connections" default: - return nil, errors.Wrapf(cloudprovider.ErrNotSupported, opts.Engine) + return nil, errors.Wrapf(cloudprovider.ErrNotSupported, "%s", opts.Engine) } return self.getMetricValues(opts.ResourceId, metricnamespace, metricnames, nil, "", opts.StartTime, opts.EndTime) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/redis.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/redis.go index 25c490c5b4..858f292695 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/redis.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/redis.go @@ -397,6 +397,6 @@ func (self *SRegion) GetIElasticcacheById(id string) (cloudprovider.ICloudElasti } else if strings.Index(id, "Microsoft.Cache/redisEnterprise") > 0 { return self.GetEnterpriseRedisCache(id) } else { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/region.go index 3c4518566e..c46220996a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/region.go @@ -93,7 +93,7 @@ func (self *SRegion) getVMSize(name string) (*SVMSize, error) { return &vmSizes[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (self *SRegion) GetId() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/vpc.go index 3746b1f35d..5f04be297f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/vpc.go @@ -105,7 +105,7 @@ func (self *SVpc) GetIRouteTableById(routeTableId string) (cloudprovider.ICloudR func (self *SVpc) GetIWireById(wireId string) (cloudprovider.ICloudWire, error) { wire := self.getWire() if wire.GetGlobalId() != wireId { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, wireId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", wireId) } return wire, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go index 0f8ba7fac4..25699a0e5c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/waf.go @@ -629,7 +629,7 @@ func (self *SRegion) GetICloudWafInstanceById(id string) (cloudprovider.ICloudWa if strings.Contains(id, "microsoft.network/applicationgatewaywebapplicationfirewallpolicies") { return self.GetAppGatewayWaf(id) } - return nil, errors.Wrapf(cloudprovider.ErrNotSupported, id) + return nil, errors.Wrapf(cloudprovider.ErrNotSupported, "%s", id) } func (self *SRegion) CreateAppWafInstance(name string, action *cloudprovider.DefaultAction) (*SAppGatewayWaf, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/wire.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/wire.go index 85f03272fd..c62b7342bd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/wire.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/wire.go @@ -98,7 +98,7 @@ func (self *SWire) GetINetworkById(netid string) (cloudprovider.ICloudNetwork, e return networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, netid) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", netid) } func (self *SWire) GetINetworks() ([]cloudprovider.ICloudNetwork, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/zone.go index 5dd4751652..1aae66c313 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/zone.go @@ -100,7 +100,7 @@ func (self *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, erro return storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SZone) GetIHostById(id string) (cloudprovider.ICloudHost, error) { @@ -113,7 +113,7 @@ func (self *SZone) GetIHostById(id string) (cloudprovider.ICloudHost, error) { return hosts[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SZone) GetIHosts() ([]cloudprovider.ICloudHost, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/baidu.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/baidu.go index 1c13c24206..82c2302204 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/baidu.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/baidu.go @@ -120,7 +120,7 @@ func (cli *SBaiduClient) GetRegion(id string) (*SRegion, error) { return ®ions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (cli *SBaiduClient) getUrl(service, regionId, resource string) (string, error) { @@ -143,7 +143,7 @@ func (cli *SBaiduClient) getUrl(service, regionId, resource string) (string, err case SERVICE_BCM: return fmt.Sprintf("http://bcm.%s.baidubce.com/%s", regionId, strings.TrimPrefix(resource, "/")), nil default: - return "", errors.Wrapf(cloudprovider.ErrNotSupported, service) + return "", errors.Wrapf(cloudprovider.ErrNotSupported, "%s", service) } } @@ -190,7 +190,7 @@ func (e *sBaiduError) ParseErrorFromJsonResponse(statusCode int, status string, e.StatusCode = statusCode log.Infof("%s %s body: %s error: %v", e.method, e.url, e.body, e.Error()) if e.StatusCode == 404 { - return errors.Wrapf(cloudprovider.ErrNotFound, e.Error()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", e.Error()) } return e } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/disk.go index 03935de46a..6d4c4298a0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/disk.go @@ -309,7 +309,7 @@ func (region *SRegion) CreateDisk(storageType, zoneName string, opts *cloudprovi for _, id := range ret.VolumeIds { return region.GetDisk(id) } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, resp.String()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", resp.String()) } func (region *SRegion) ResizeDisk(diskId string, sizeGb int64) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/region.go index cbe6bb0b08..38b6ea12da 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/region.go @@ -203,7 +203,7 @@ func (region *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) return zones[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (region *SRegion) getStoragecache() *SStoragecache { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/zone.go index 8524403888..6afce94eb1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/baidu/zone.go @@ -103,7 +103,7 @@ func (zone *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, erro return storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (zone *SZone) getHost() *SHost { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go index 32f4d18418..2e54e5cae7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/bingo.go @@ -214,7 +214,7 @@ func (self *SBingoCloudClient) invoke(action string, params map[string]string) ( if self.cpcfg.ReadOnly { for _, prefix := range []string{"Get", "List", "Describe"} { if strings.HasPrefix(action, prefix) { - return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action) + return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s", action) } } } @@ -379,7 +379,7 @@ func (self *SBingoCloudClient) GetIRegionById(id string) (cloudprovider.ICloudRe return iregions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SBingoCloudClient) GetCapabilities() []string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/cluster.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/cluster.go index e3946eb6c4..33d8919d82 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/cluster.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/cluster.go @@ -92,7 +92,7 @@ func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) { return zones[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetClusters() ([]SCluster, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/disk.go index 76be449df1..089b01700f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/disk.go @@ -267,7 +267,7 @@ func (self *SRegion) GetDisk(id string) (*SDisk, error) { return &disks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SStorage) CreateIDisk(conf *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/eip.go index 499feeffdc..afd3004e47 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/eip.go @@ -180,5 +180,5 @@ func (self *SRegion) GetIEipById(id string) (cloudprovider.ICloudEIP, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/image.go index 6a85f08658..a8a847972f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/image.go @@ -215,7 +215,7 @@ func (self *SRegion) GetImageById(id string) (*SImage, error) { return nil, err } if len(imgs) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } return &imgs[0], nil } @@ -255,5 +255,5 @@ func (self *SStoragecache) GetIImageById(id string) (cloudprovider.ICloudImage, return &images[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/network.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/network.go index c004798976..a5812e6531 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/network.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/network.go @@ -171,7 +171,7 @@ func (self *SWire) GetINetworkById(id string) (cloudprovider.ICloudNetwork, erro return networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetNetworks(id, clusterId, vpcId string) ([]SNetwork, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go index 7b5ce2b4b0..e30f0a2199 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go @@ -268,7 +268,7 @@ func (self *SCluster) GetIHostById(id string) (cloudprovider.ICloudHost, error) return &nodes[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SCluster) GetIHosts() ([]cloudprovider.ICloudHost, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/region.go index 3f9ccec0d7..1240b16fe3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/region.go @@ -119,7 +119,7 @@ func (self *SRegion) GetIStorageById(id string) (cloudprovider.ICloudStorage, er return &storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIStoragecaches() ([]cloudprovider.ICloudStoragecache, error) { @@ -158,7 +158,7 @@ func (self *SRegion) GetIStoragecacheById(id string) (cloudprovider.ICloudStorag return caches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) { @@ -193,7 +193,7 @@ func (self *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) { } } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetISnapshots() ([]cloudprovider.ICloudSnapshot, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/securitygroup.go index e58e9a5f9d..3d479c64c7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/securitygroup.go @@ -188,7 +188,7 @@ func (self *SRegion) GetISecurityGroupById(id string) (cloudprovider.ICloudSecur return &groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) deleteSecurityGroup(id string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/storage.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/storage.go index 25d8483eec..08950b5e79 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/storage.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/storage.go @@ -137,7 +137,7 @@ func (self *SCluster) GetIStorageById(id string) (cloudprovider.ICloudStorage, e return storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SCluster) GetIStorages() ([]cloudprovider.ICloudStorage, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/wire.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/wire.go index 47f3adb674..4eb64cefcb 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/wire.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/wire.go @@ -74,7 +74,7 @@ func (self *SVpc) GetIWireById(id string) (cloudprovider.ICloudWire, error) { return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SVpc) GetIWires() ([]cloudprovider.ICloudWire, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/dirs.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/dirs.go index 8c33351e3b..7ad3d49885 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/dirs.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/dirs.go @@ -106,7 +106,7 @@ func (dir *SCephFsDir) Refresh() error { return jsonutils.Update(dir, &dirs[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, dir.Path) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", dir.Path) } func (dir *SCephFsDir) SetQuota(input *cloudprovider.SFileSystemSetQuotaInput) error { @@ -167,7 +167,7 @@ func (cli *SCephFSClient) GetICloudFileSystemById(id string) (cloudprovider.IClo return &dirs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (cli *SCephFSClient) CreateDir(fsId, path string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go index c5118060ac..77752aa568 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go @@ -136,7 +136,7 @@ func (self *sCtyunError) ParseErrorFromJsonResponse(statusCode int, status strin body.Unmarshal(self) } if strings.Contains(self.Message, "signature verification failed") { - return errors.Wrapf(cloudprovider.ErrInvalidAccessKey, jsonutils.Marshal(self).String()) + return errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", jsonutils.Marshal(self).String()) } return self } @@ -314,10 +314,10 @@ func (self *SCtyunClient) request(method httputils.THttpMethod, service, resourc return resp, nil } if strings.HasSuffix(ret.ErrorCode, "NotFound") || ret.ErrorCode == "ebs.ebsInfo.get volume resourceId failed" { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, resp.String()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", resp.String()) } log.Errorf("request %s with params %s error: %s", uri, jsonutils.Marshal(body).String(), resp.String()) - return nil, fmt.Errorf(resp.String()) + return nil, fmt.Errorf("%s", resp.String()) } func (self *SCtyunClient) GetIRegions() ([]cloudprovider.ICloudRegion, error) { @@ -370,7 +370,7 @@ func (self *SCtyunClient) GetRegion(id string) (*SRegion, error) { return &self.regions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SCtyunClient) GetCloudRegionExternalIdPrefix() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go index cf52fba178..0bd59ad655 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go @@ -75,7 +75,7 @@ func (self *SHost) GetIVMById(id string) (cloudprovider.ICloudVM, error) { return &vms[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SHost) GetIStorages() ([]cloudprovider.ICloudStorage, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/image.go index 69cbaf2cbe..7f8829dc86 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/image.go @@ -262,5 +262,5 @@ func (self *SRegion) GetImage(imageId string) (*SImage, error) { return &ret[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, imageId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", imageId) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/instance.go index de2bb1502e..13bdf98784 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/instance.go @@ -212,7 +212,7 @@ func (self *SInstance) GetIEIP() (cloudprovider.ICloudEIP, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.FloatingIP) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.FloatingIP) } func (self *SInstance) GetVcpuCount() int { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/region.go index 396bc29bc2..7688c90817 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/region.go @@ -218,7 +218,7 @@ func (self *SRegion) GetIVpcById(id string) (cloudprovider.ICloudVpc, error) { return ivpcs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) { @@ -375,7 +375,7 @@ func (self *SRegion) GetInstance(id string) (*SInstance, error) { return &vms[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetInstances(zoneId string, ids []string) ([]SInstance, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/vpc.go index 2e2ebfdd8a..0e705a70dd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/vpc.go @@ -112,7 +112,7 @@ func (self *SVpc) GetIWireById(id string) (cloudprovider.ICloudWire, error) { return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetVpc(vpcId string) (*SVpc, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/cucloud.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/cucloud.go index cb0b7ef984..ff3d7faefd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/cucloud.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/cucloud.go @@ -315,7 +315,7 @@ func (self *SChinaUnionClient) request(method httputils.THttpMethod, resource st } code, _ := resp.GetString("code") if code != "200" { - return nil, errors.Errorf(resp.String()) + return nil, errors.Errorf("%s", resp.String()) } return resp, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/region.go index 6fdf59dc46..b51f8cee54 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cucloud/region.go @@ -176,7 +176,7 @@ func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) { return zones[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (region *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) { @@ -195,7 +195,7 @@ func (region *SRegion) GetIHostById(id string) (cloudprovider.ICloudHost, error) } } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (region *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/request.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/request.go index 417a1fd1e0..9c10398085 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/request.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/request.go @@ -254,7 +254,7 @@ func (br *SBaseRequest) ForMateResponseBody(jrbody jsonutils.JSONObject) (jsonut if jrbody.Contains("errorMessage") { msg, _ := jrbody.GetString("errorMessage") if strings.Contains(msg, "Invalid parameter AccessKey") { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, msg) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", msg) } return nil, &httputils.JSONClientError{Code: 400, Details: msg} } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go index eb0a42b0eb..746fc32550 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go @@ -1600,7 +1600,7 @@ func (host *SHost) newLocalStorageCache() (*SDatastoreImageCache, error) { } if cacheDs == nil { - return nil, fmt.Errorf(errmsg) + return nil, fmt.Errorf("%s", errmsg) } return &SDatastoreImageCache{ diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storagecache.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storagecache.go index 9e0536b825..f4f994852b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storagecache.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storagecache.go @@ -290,7 +290,7 @@ func (self *SDatastoreImageCache) GetIImageInTemplateVMsById(id string) (cloudpr return NewVMTemplate(vm, self), nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SDatastoreImageCache) GetICustomizedCloudImages() ([]cloudprovider.ICloudImage, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/virtualmachine.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/virtualmachine.go index 1fc9e7db32..60b26a96b9 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/virtualmachine.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/virtualmachine.go @@ -1201,28 +1201,31 @@ func (svm *SVirtualMachine) getDatastoreAndRootImagePath() (string, *SDatastore, if layoutEx == nil || len(layoutEx.File) == 0 { return "", nil, fmt.Errorf("invalid LayoutEx") } - file := layoutEx.File[0].Name - // find stroage - host := svm.GetIHost() - storages, err := host.GetIStorages() - if err != nil { - return "", nil, errors.Wrap(err, "host.GetIStorages") - } - var datastore *SDatastore - for i := range storages { - ds := storages[i].(*SDatastore) - if ds.HasFile(file) { - datastore = ds - break + for _, f := range layoutEx.File { + if !strings.HasSuffix(f.Name, ".vmdk") { + continue } + file := f.Name + // find stroage + host := svm.GetIHost() + storages, err := host.GetIStorages() + if err != nil { + return "", nil, errors.Wrap(err, "host.GetIStorages") + } + var datastore *SDatastore + for i := range storages { + ds := storages[i].(*SDatastore) + if ds.HasFile(file) { + datastore = ds + break + } + } + if datastore == nil { + return "", nil, fmt.Errorf("can't find storage associated with vm %q", svm.GetName()) + } + return datastore.getPathString(datastore.cleanPath(file)), datastore, nil } - if datastore == nil { - return "", nil, fmt.Errorf("can't find storage associated with vm %q", svm.GetName()) - } - path := datastore.cleanPath(file) - vmDir := strings.Split(path, "/")[0] - // TODO find a non-conflicting path - return datastore.getPathString(fmt.Sprintf("%s/%s.vmdk", vmDir, vmDir)), datastore, nil + return "", nil, fmt.Errorf("can't find root image path") } func (svm *SVirtualMachine) GetRootImagePath() (string, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/bigquery.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/bigquery.go index 6ccadb9811..801a8cadec 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/bigquery.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/bigquery.go @@ -85,7 +85,7 @@ type SBigQueryResult struct { Rows []jsonutils.JSONObject `json:"rows"` Schema SBigQuerySchema `json:"schema"` TotalBytesProcessed int64 `json:"totalBytesProcessed"` - totalRows int64 `json:"totalRows"` + TotalRows int64 `json:"totalRows"` } func (res SBigQueryResult) GetRows() ([]jsonutils.JSONObject, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/google.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/google.go index a192adef14..1c95bdde4c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/google.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/google.go @@ -319,7 +319,7 @@ func (self *SGoogleClient) ecsGet(resourceType, id string, retval interface{}) e } } } - return errors.Wrapf(cloudprovider.ErrNotFound, id) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SGoogleClient) ecsList(resource string, params map[string]string) (jsonutils.JSONObject, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/region.go index ce87671b78..5270e6ed26 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/region.go @@ -848,13 +848,26 @@ func (region *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceC } func (region *SRegion) GetIVMs() ([]cloudprovider.ICloudVM, error) { - instances, err := region.GetInstances("", 0, "") + if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) { + return []cloudprovider.ICloudVM{}, nil + } + zones, err := region.GetIZones() if err != nil { return nil, err } - iVMs := []cloudprovider.ICloudVM{} - for i := range instances { - iVMs = append(iVMs, &instances[i]) + ret := []cloudprovider.ICloudVM{} + for i := range zones { + hosts, err := zones[i].GetIHosts() + if err != nil { + return nil, err + } + for j := range hosts { + instances, err := hosts[j].GetIVMs() + if err != nil { + return nil, err + } + ret = append(ret, instances...) + } } - return iVMs, nil + return ret, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/securitygroup.go index 10114f96aa..047a4f6021 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/securitygroup.go @@ -224,7 +224,7 @@ func (self *SGlobalNetwork) CreateISecurityGroup(opts *cloudprovider.SecurityGro } for i := range groups { if groups[i].GetGlobalId() == secgroup.GetGlobalId() { - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, secgroup.GetGlobalId()) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", secgroup.GetGlobalId()) } } rule, err := secgroup.gvpc.client.CreateSecurityGroupRule(secgroup.gvpc.SelfLink, secgroup.Tag, &cloudprovider.SecurityGroupRuleCreateOptions{ diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/wire.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/wire.go index 0dd57f7abb..9f7f3c1abe 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/wire.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/wire.go @@ -74,7 +74,7 @@ func (self *SWire) GetINetworkById(id string) (cloudprovider.ICloudNetwork, erro return networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (wire *SWire) GetBandwidth() int { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/client/modules/manager_base.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/client/modules/manager_base.go index 8390a684d5..c56034711e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/client/modules/manager_base.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/client/modules/manager_base.go @@ -270,7 +270,7 @@ func (self *SBaseManager) jsonRequest(request requests.IRequest) (http.Header, j switch err := e.(type) { case *HuaweiClientError: if err.ErrorCode == "APIGW.0301" { - return h, b, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, e.Error()) + return h, b, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", e.Error()) } else if err.Code == 499 && retry > 0 && request.GetMethod() == "GET" { retry -= 1 time.Sleep(3 * time.Second * time.Duration(MAX_RETRY-retry)) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/cloudgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/cloudgroup.go index cea3c6a9c9..21792f4f81 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/cloudgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/cloudgroup.go @@ -337,7 +337,7 @@ func (self *SHuaweiClient) GetCustomRole(name string) (*SRole, error) { return &roles[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (self *SHuaweiClient) GetRole(name string) (*SRole, error) { @@ -350,7 +350,7 @@ func (self *SHuaweiClient) GetRole(name string) (*SRole, error) { return &roles[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (self *SHuaweiClient) AttachGroupRole(groupId, roleId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/elasticcache_account.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/elasticcache_account.go index c9bb3aa852..6bf8a01936 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/elasticcache_account.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/elasticcache_account.go @@ -86,7 +86,7 @@ func (self *SElasticcacheAccount) ResetPassword(input cloudprovider.SCloudElasti } if result.Result != "success" { - return errors.Wrap(fmt.Errorf(result.Message), "elasticcacheAccount.ResetPassword") + return errors.Wrap(fmt.Errorf("%s", result.Message), "elasticcacheAccount.ResetPassword") } return nil diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/hcso.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/hcso.go index c4f717619d..f1ad26761d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/hcso.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/hcso.go @@ -413,7 +413,7 @@ func (self *SHuaweiClient) patchRequest(method httputils.THttpMethod, url string _, respValue, err := httputils.ParseJSONResponse(bodystr, resp, err, self.debug) if err != nil { if e, ok := err.(*httputils.JSONClientError); ok && e.Code == 404 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", err.Error()) } return nil, err } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go index ceef8cb81d..6e9a20a5e0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go @@ -61,3 +61,7 @@ func (host *SHostBase) GetStorageInfo() jsonutils.JSONObject { func (host *SHostBase) GetIsolateDevices() ([]cloudprovider.IsolateDevice, error) { return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "GetIsolateDevices") } + +func (host *SHostBase) GetIpmiInfo() jsonutils.JSONObject { + return nil +} diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/cdn.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/cdn.go index 6939db2c79..6a4055ace0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/cdn.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/cdn.go @@ -205,10 +205,10 @@ func (hc *SHuaweiClient) GetCDNDomainByName(name string) (*SCdnDomain, error) { return &domains[0], nil } if total == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, name) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", name) } func (hc *SHuaweiClient) GetCdnDomains() ([]SCdnDomain, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go index 2874efa827..68f05792f9 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/dbinstance.go @@ -137,7 +137,7 @@ func (region *SRegion) GetDBInstance(instanceId string) (*SDBInstance, error) { return &ret[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (rds *SDBInstance) GetName() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/enterpriseprojects.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/enterpriseprojects.go index 46f13983fb..893cbcd600 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/enterpriseprojects.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/enterpriseprojects.go @@ -96,7 +96,7 @@ func (self *SHuaweiClient) CreateExterpriseProject(name, desc string) (*SEnterpr return nil, cloudprovider.ErrNotSupported } if strings.Contains(err.Error(), "EPS.0039") { - return nil, errors.Wrapf(cloudprovider.ErrForbidden, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrForbidden, "%s", err.Error()) } return nil, errors.Wrap(err, "EnterpriseProjects.Create") } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go index 544825d2cb..b77d67a22f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go @@ -264,7 +264,7 @@ func (self *sHuaweiError) ParseErrorFromJsonResponse(statusCode int, status stri self.ConvertMsg = convertMsg[code] } if statusCode == 404 { - return errors.Wrapf(cloudprovider.ErrNotFound, self.Error()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.Error()) } return self } @@ -478,7 +478,7 @@ func (self *SHuaweiClient) GetIRegionById(id string) (cloudprovider.ICloudRegion return regions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SHuaweiClient) GetRegion(regionId string) *SRegion { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/image.go index 4cd0c689dc..e4bfd2e220 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/image.go @@ -225,7 +225,7 @@ func (self *SRegion) GetImage(imageId string) (*SImage, error) { return &images[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, imageId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", imageId) } // https://console.huaweicloud.com/apiexplorer/#/openapi/IMS/doc?api=ListImages @@ -288,7 +288,7 @@ func (self *SRegion) GetImageByName(name string) (*SImage, error) { return &images[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (self *SRegion) ImportImageJob(name string, osDist string, osVersion string, osArch string, bucket string, key string, minDiskGB int64) (string, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/loadbalancer_backendgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/loadbalancer_backendgroup.go index 3293e67c4c..32b2b67069 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/loadbalancer_backendgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/loadbalancer_backendgroup.go @@ -325,7 +325,7 @@ func (self *SElbBackendGroup) Delete(ctx context.Context) error { func (self *SRegion) GetLoadBalancerBackendGroup(backendGroupId string) (*SElbBackendGroup, error) { ret := &SElbBackendGroup{region: self} - res := fmt.Sprintf("elb/pools/" + backendGroupId) + res := fmt.Sprintf("elb/pools/%s", backendGroupId) resp, err := self.list(SERVICE_ELB, res, nil) if err != nil { return nil, err diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/client_base.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/client_base.go index 5238f11a0f..e29cfde658 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/client_base.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/client_base.go @@ -57,7 +57,7 @@ func New(ak, sk, endpoint string, configurers ...configurer) (*ObsClient, error) accessMode = "Path" } info[2] = fmt.Sprintf("Access Mode=%s]", accessMode) - doLog(LEVEL_WARN, strings.Join(info, "];[")) + doLog(LEVEL_WARN, "%s", strings.Join(info, "];[")) } if conf.httpClient != nil { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/http.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/http.go index 2ca58dc809..c7493c02e7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/http.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/http.go @@ -15,7 +15,6 @@ package obs import ( "bytes" "errors" - "fmt" "io" "math/rand" "net" @@ -123,7 +122,7 @@ func (obsClient ObsClient) doAction(action, method, bucketName, objectKey string for _, extension := range extensions { if extensionHeader, ok := extension.(extensionHeaders); ok { if _err := extensionHeader(headers, isObs); err != nil { - doLog(LEVEL_INFO, fmt.Sprintf("set header with error: %v", _err)) + doLog(LEVEL_INFO, "set header with error: %v", _err) } } else { doLog(LEVEL_INFO, "Unsupported extensionOptions") diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/temporary_createSignedUrl.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/temporary_createSignedUrl.go index 5c27e64dc9..a0a7554fed 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/temporary_createSignedUrl.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/temporary_createSignedUrl.go @@ -14,7 +14,6 @@ package obs import ( "errors" - "fmt" ) // CreateSignedUrl creates signed url with the specified CreateSignedUrlInput, and returns the CreateSignedUrlOutput and error @@ -41,7 +40,7 @@ func (obsClient ObsClient) CreateSignedUrl(input *CreateSignedUrlInput, extensio if extensionHeader, ok := extension.(extensionHeaders); ok { _err := extensionHeader(headers, obsClient.conf.signature == SignatureObs) if _err != nil { - doLog(LEVEL_INFO, fmt.Sprintf("set header with error: %v", _err)) + doLog(LEVEL_INFO, "set header with error: %v", _err) } } else { doLog(LEVEL_INFO, "Unsupported extensionOptions") diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/transfer.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/transfer.go index 956629ea12..8bac168bdd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/transfer.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/obs/transfer.go @@ -148,7 +148,7 @@ func getCheckpointFile(ufc *UploadCheckpoint, uploadFileStat os.FileInfo, input checkpointFilePath := input.CheckpointFile checkpointFileStat, err := os.Stat(checkpointFilePath) if err != nil { - doLog(LEVEL_DEBUG, fmt.Sprintf("Stat checkpoint file failed with error: [%v].", err)) + doLog(LEVEL_DEBUG, "Stat checkpoint file failed with error: [%v].", err) return true, nil } if checkpointFileStat.IsDir() { @@ -157,7 +157,7 @@ func getCheckpointFile(ufc *UploadCheckpoint, uploadFileStat os.FileInfo, input } err = loadCheckpointFile(checkpointFilePath, ufc) if err != nil { - doLog(LEVEL_WARN, fmt.Sprintf("Load checkpoint file failed with error: [%v].", err)) + doLog(LEVEL_WARN, "Load checkpoint file failed with error: [%v].", err) return true, nil } else if !ufc.isValid(input.Bucket, input.Key, input.UploadFile, uploadFileStat) { if ufc.Bucket != "" && ufc.Key != "" && ufc.UploadId != "" { @@ -168,7 +168,7 @@ func getCheckpointFile(ufc *UploadCheckpoint, uploadFileStat os.FileInfo, input } _err := os.Remove(checkpointFilePath) if _err != nil { - doLog(LEVEL_WARN, fmt.Sprintf("Failed to remove checkpoint file with error: [%v].", _err)) + doLog(LEVEL_WARN, "Failed to remove checkpoint file with error: [%v].", _err) } } else { return false, nil @@ -315,7 +315,7 @@ func completeParts(ufc *UploadCheckpoint, enableCheckpoint bool, checkpointFileP func (obsClient ObsClient) resumeUpload(input *UploadFileInput, extensions []extensionOptions) (output *CompleteMultipartUploadOutput, err error) { uploadFileStat, err := os.Stat(input.UploadFile) if err != nil { - doLog(LEVEL_ERROR, fmt.Sprintf("Failed to stat uploadFile with error: [%v].", err)) + doLog(LEVEL_ERROR, "Failed to stat uploadFile with error: [%v].", err) return nil, err } if uploadFileStat.IsDir() { @@ -555,7 +555,7 @@ func getDownloadCheckpointFile(dfc *DownloadCheckpoint, input *DownloadFileInput checkpointFilePath := input.CheckpointFile checkpointFileStat, err := os.Stat(checkpointFilePath) if err != nil { - doLog(LEVEL_DEBUG, fmt.Sprintf("Stat checkpoint file failed with error: [%v].", err)) + doLog(LEVEL_DEBUG, "Stat checkpoint file failed with error: [%v].", err) return true, nil } if checkpointFileStat.IsDir() { @@ -564,7 +564,7 @@ func getDownloadCheckpointFile(dfc *DownloadCheckpoint, input *DownloadFileInput } err = loadCheckpointFile(checkpointFilePath, dfc) if err != nil { - doLog(LEVEL_WARN, fmt.Sprintf("Load checkpoint file failed with error: [%v].", err)) + doLog(LEVEL_WARN, "Load checkpoint file failed with error: [%v].", err) return true, nil } else if !dfc.isValid(input, output) { if dfc.TempFileInfo.TempFileUrl != "" { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/routetables.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/routetables.go index eb91d974bb..427f40ecf4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/routetables.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/routetables.go @@ -202,7 +202,7 @@ func (self *SRegion) GetRouteTable(id string) (*SRouteTable, error) { func (self *SRouteTable) CreateRoute(route cloudprovider.RouteSet) error { routeType, ok := hoptypes[route.NextHopType] if !ok { - return errors.Wrapf(cloudprovider.ErrNotSupported, route.NextHopType) + return errors.Wrapf(cloudprovider.ErrNotSupported, "%s", route.NextHopType) } params := map[string]interface{}{ "route": map[string]interface{}{ @@ -219,7 +219,7 @@ func (self *SRouteTable) CreateRoute(route cloudprovider.RouteSet) error { func (self *SRouteTable) RemoveRoute(route cloudprovider.RouteSet) error { _, ok := hoptypes[route.NextHopType] if !ok { - return errors.Wrapf(cloudprovider.ErrNotSupported, route.NextHopType) + return errors.Wrapf(cloudprovider.ErrNotSupported, "%s", route.NextHopType) } _, err := self.vpc.region.delete(SERVICE_VPC, "vpc/routes/"+route.RouteId) return err diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/vpc.go index e4591db766..e6e968bc57 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/vpc.go @@ -122,7 +122,7 @@ func (self *SVpc) GetIWireById(wireId string) (cloudprovider.ICloudWire, error) return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, wireId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", wireId) } func (self *SVpc) GetINatGateways() ([]cloudprovider.ICloudNatGateway, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/zone.go index b282ffae69..1950a83db3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/zone.go @@ -121,7 +121,7 @@ func (self *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, erro return storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SZone) GetIWires() ([]cloudprovider.ICloudWire, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/balance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/balance.go index 92956bec6c..951d6d38f1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/balance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/balance.go @@ -34,7 +34,7 @@ func (self *SJDCloudClient) DescribeAccountAmount() (*SBalance, error) { return nil, errors.Wrapf(err, "DescribeAccountAmoun") } if resp.Error.Code != 0 { - return nil, errors.Errorf(resp.Error.Message) + return nil, errors.Errorf("%s", resp.Error.Message) } return &SBalance{DescribeAccountAmountResult: resp.Result}, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/disk.go index 9651838f7e..6c916be868 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/disk.go @@ -252,7 +252,7 @@ func (r *SRegion) GetDisks(instanceId, zoneId, diskType string, diskIds []string return nil, 0, err } if resp.Error.Code >= 400 { - return nil, 0, fmt.Errorf(resp.Error.Message) + return nil, 0, fmt.Errorf("%s", resp.Error.Message) } total := resp.Result.TotalCount disks := make([]SDisk, 0, len(resp.Result.Disks)) @@ -273,7 +273,7 @@ func (r *SRegion) GetDiskById(id string) (*SDisk, error) { return nil, err } if resp.Error.Code >= 400 { - return nil, fmt.Errorf(resp.Error.Message) + return nil, fmt.Errorf("%s", resp.Error.Message) } return &SDisk{ Disk: resp.Result.Disk, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/eip.go index 8461f0ebbc..e42f612b46 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/eip.go @@ -142,7 +142,7 @@ func (r *SRegion) GetEIPById(id string) (*SEip, error) { return nil, err } if resp.Error.Code >= 400 { - return nil, fmt.Errorf(resp.Error.Message) + return nil, fmt.Errorf("%s", resp.Error.Message) } return &SEip{ region: r, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/image.go index 720912c890..952a3efb21 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/image.go @@ -180,7 +180,7 @@ func (r *SRegion) GetImage(imageId string) (*SImage, error) { return nil, err } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, err } return &SImage{ @@ -199,9 +199,9 @@ func (r *SRegion) GetImages(imageIds []string, imageSource string, pageNumber, p } if resp.Error.Code >= 400 { if strings.Contains(resp.Error.Message, "secret key is nul") || strings.Contains(resp.Error.Message, "sign result is not same") { - return nil, 0, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, resp.Error.Message) + return nil, 0, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", resp.Error.Message) } - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } images := make([]SImage, len(resp.Result.Images)) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/instance.go index e29b5b07b5..c1c5cad7ed 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/instance.go @@ -402,7 +402,7 @@ func (r *SRegion) GetInstances(zoneId string, ids []string, pangeNumber, pageSiz return nil, 0, err } if resp.Error.Code >= 400 { - return nil, 0, fmt.Errorf(resp.Error.Message) + return nil, 0, fmt.Errorf("%s", resp.Error.Message) } ins := make([]SInstance, len(resp.Result.Instances)) for i := range ins { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/network.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/network.go index d13b0448fa..97b11d391d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/network.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/network.go @@ -128,7 +128,7 @@ func (r *SRegion) GetNetworks(vpcId string, pageNumber int, pageSize int) ([]SNe return nil, 0, err } if resp.Error.Code >= 400 { - return nil, 0, fmt.Errorf(resp.Error.Message) + return nil, 0, fmt.Errorf("%s", resp.Error.Message) } nets := make([]SNetwork, len(resp.Result.Subnets)) for i := range nets { @@ -148,7 +148,7 @@ func (r *SRegion) GetNetworkById(id string) (*SNetwork, error) { return nil, err } if resp.Error.Code >= 400 { - return nil, fmt.Errorf(resp.Error.Message) + return nil, fmt.Errorf("%s", resp.Error.Message) } return &SNetwork{ Subnet: resp.Result.Subnet, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds.go index e7214dc1a7..4299683cc4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds.go @@ -217,7 +217,7 @@ func (self *SRegion) GetDBInstance(id string) (*SDBInstance, error) { return nil, errors.Wrapf(err, "DescribeInstanceAttributes") } if resp.Error.Code == 404 || strings.Contains(resp.Error.Status, "NotFound") { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, jsonutils.Marshal(resp.Error).String()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", jsonutils.Marshal(resp.Error).String()) } else if resp.Error.Code != 0 { return nil, errors.Error(jsonutils.Marshal(resp.Error).String()) } @@ -251,7 +251,7 @@ func (self *SRegion) GetDBInstances(pageNumber int, pageSize int) ([]SDBInstance return nil, 0, errors.Wrapf(err, "DescribeInstances") } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } total := resp.Result.TotalCount diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_account.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_account.go index 61fba3cccb..f1193f46f9 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_account.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_account.go @@ -81,7 +81,7 @@ func (self *SRegion) GetDBInstanceAccounts(id string, pageNumber, pageSize int) return nil, 0, errors.Wrapf(err, "DescribeAccounts") } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } total := resp.Result.TotalCount diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_backup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_backup.go index d8b676bd04..3811687530 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_backup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_backup.go @@ -114,7 +114,7 @@ func (self *SRegion) GetDBInstanceBackups(id string, pageNumber, pageSize int) ( return nil, 0, errors.Wrapf(err, "DescribeBackups") } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } total := resp.Result.TotalCount diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_database.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_database.go index 64509511bc..00c7505206 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_database.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/rds_database.go @@ -66,7 +66,7 @@ func (self *SRegion) GetDBInstanceDatabases(id string, pageNumber, pageSize int) return nil, 0, errors.Wrapf(err, "DescribeDatabases") } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } total := resp.Result.TotalCount diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/securitygroup.go index 78d37c677a..618ffb0190 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/securitygroup.go @@ -89,7 +89,7 @@ func (r *SRegion) GetSecurityGroups(vpcId string, securityGroupIds []string, pag return nil, 0, err } if resp.Error.Code >= 400 { - err = fmt.Errorf(resp.Error.Message) + err = fmt.Errorf("%s", resp.Error.Message) return nil, 0, err } total := resp.Result.TotalCount diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/snapshot.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/snapshot.go index 42694c6a94..f91fea974e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/snapshot.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/snapshot.go @@ -128,7 +128,7 @@ func (r *SRegion) GetSnapshots(diskId string, pageNumber, pageSize int) ([]SSnap return nil, 0, err } if resp.Error.Code >= 400 { - return nil, 0, fmt.Errorf(resp.Error.Message) + return nil, 0, fmt.Errorf("%s", resp.Error.Message) } snapshots := make([]SSnapshot, len(resp.Result.Snapshots)) for i := range resp.Result.Snapshots { @@ -149,7 +149,7 @@ func (r *SRegion) GetSnapshotById(id string) (*SSnapshot, error) { return nil, err } if resp.Error.Code >= 400 { - return nil, fmt.Errorf(resp.Error.Message) + return nil, fmt.Errorf("%s", resp.Error.Message) } snapshot := SSnapshot{ region: r, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/vpc.go index 8e513a41a2..a4e99e3ec4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/vpc.go @@ -181,7 +181,7 @@ func (r *SRegion) GetVpcById(id string) (*SVpc, error) { return nil, err } if resp.Error.Code >= 400 { - return nil, fmt.Errorf(resp.Error.Message) + return nil, fmt.Errorf("%s", resp.Error.Message) } return &SVpc{ region: r, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/dbinstance.go index 3ed15db3de..3cf5da8473 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/dbinstance.go @@ -106,7 +106,7 @@ func (region *SRegion) GetDBInstance(id string) (*SDBInstance, error) { return &vms[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (region *SRegion) GetDBInstances(id string) ([]SDBInstance, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/instances.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/instances.go index 6470321950..aef7df1570 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/instances.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/instances.go @@ -192,7 +192,7 @@ func (region *SRegion) GetInstance(instanceId string) (*SInstance, error) { return &instances[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (ins *SInstance) Refresh() error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/ksyun.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/ksyun.go index 6d226a68f4..841cb73051 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/ksyun.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/ksyun.go @@ -185,7 +185,7 @@ func (cli *sKsyunError) ParseErrorFromJsonResponse(statusCode int, status string body.Unmarshal(cli) } if cli.ErrorMsg.Message == "Not Found" { - return errors.Wrapf(cloudprovider.ErrNotFound, jsonutils.Marshal(cli.ErrorMsg).String()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", jsonutils.Marshal(cli.ErrorMsg).String()) } cli.StatusCode = statusCode return cli diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go index 62ead49779..2b10fc71a7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/nutanix.go @@ -239,7 +239,7 @@ func (self *SNutanixClient) wait(taskId string) (string, error) { return true, nil } if task.ProgressStatus == "Failed" { - return false, errors.Errorf(jsonutils.Marshal(task.MetaResponse).String()) + return false, errors.Errorf("%s", jsonutils.Marshal(task.MetaResponse).String()) } return false, nil }) @@ -365,7 +365,7 @@ func (self *sNutanixError) ParseErrorFromJsonResponse(statusCode int, status str body.Unmarshal(self) } if self.ErrorCode.Code == 1202 { - return errors.Wrapf(cloudprovider.ErrNotFound, self.Error()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.Error()) } return self } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/region.go index 74f4a6cf21..d3270846ff 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/region.go @@ -144,7 +144,7 @@ func (self *SRegion) GetIZoneById(id string) (cloudprovider.ICloudZone, error) { return zones[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIHosts() ([]cloudprovider.ICloudHost, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/storage.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/storage.go index 7b5527265d..ba43c39dd8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/storage.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/storage.go @@ -250,7 +250,7 @@ func (self *SStorage) GetIDiskById(id string) (cloudprovider.ICloudDisk, error) return nil, err } if disk.StorageContainerUUID != self.GetGlobalId() { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } disk.storage = self return disk, nil @@ -328,5 +328,5 @@ func (self *SRegion) GetIStorageById(id string) (cloudprovider.ICloudStorage, er return storage, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/zone.go index c371675b6a..0cb264f66a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/zone.go @@ -75,7 +75,7 @@ func (self *SZone) GetIHostById(id string) (cloudprovider.ICloudHost, error) { return nil, errors.Wrapf(err, "GetIHostById(%s)", id) } if host.ClusterUUID != self.UUID { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } host.zone = self return host, nil @@ -111,7 +111,7 @@ func (self *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, erro return nil, errors.Wrapf(err, "GetStorage %s", id) } if storage.ClusterUUID != self.UUID { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } storage.zone = self return storage, nil diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go index 1698845ad0..2f7598cf80 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go @@ -463,7 +463,7 @@ func (cli *SOpenStackClient) getDefaultToken() (oscli.TokenCredential, error) { if err != nil { if e, ok := err.(*httputils.JSONClientError); ok { if e.Class == "Unauthorized" { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) } } return nil, errors.Wrap(err, "Authenticate") diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/wire.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/wire.go index f8de67b61f..97789364e2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/wire.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/wire.go @@ -84,7 +84,7 @@ func (wire *SWire) GetINetworkById(netid string) (cloudprovider.ICloudNetwork, e return networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, netid) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", netid) } func (wire *SWire) GetINetworks() ([]cloudprovider.ICloudNetwork, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go index 182fd1dd9c..11954d72c0 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go @@ -197,7 +197,7 @@ func (self *SOracleClient) getUrl(service, regionId, resource string) (string, e case SERVICE_TELEMETRY: return fmt.Sprintf("https://%s.%s.oraclecloud.com/%s/%s", service, regionId, MONITORY_API_VERSION, strings.TrimPrefix(resource, "/")), nil default: - return "", errors.Wrapf(cloudprovider.ErrNotSupported, service) + return "", errors.Wrapf(cloudprovider.ErrNotSupported, "%s", service) } } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/region.go index b12ebb86c6..783ab87348 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/region.go @@ -190,7 +190,7 @@ func (self *SRegion) GetIStoragecacheById(id string) (cloudprovider.ICloudStorag return caches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIStoragecaches() ([]cloudprovider.ICloudStoragecache, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/vpc.go index e3c2806d30..a714388b21 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/vpc.go @@ -104,7 +104,7 @@ func (self *SVpc) GetIWireById(id string) (cloudprovider.ICloudWire, error) { return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SVpc) getRegionWire() *SWire { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/disk.go index 878d669d17..f9b93139bb 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/disk.go @@ -79,7 +79,7 @@ func (self *SDisk) Refresh() error { return jsonutils.Update(self, disks[i]) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.VolId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.VolId) } func (self *SDisk) Delete(ctx context.Context) error { @@ -150,7 +150,7 @@ func (self *SDisk) Resize(ctx context.Context, sizeMb int64) error { return self.storage.zone.region.ResizeDisk(vm.Node, self.Vmid, disk.Driver, int(sizeMb-int64(self.GetDiskSizeMB()))/1024) } } - return errors.Wrapf(cloudprovider.ErrNotFound, self.VolId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.VolId) } func (self *SDisk) GetTemplateId() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go index 7980c22625..f2664bafcd 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go @@ -831,7 +831,7 @@ func (self *SRegion) GetInstance(id string) (*SInstance, error) { nodeName := "" vmId, _ := strconv.Atoi(id) if resource, ok := resources[vmId]; !ok { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } else { nodeName = resource.Node } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go index 64fb785c83..1b432a80ea 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/proxmox.go @@ -349,7 +349,7 @@ func (cli *SProxmoxClient) upload(node, storageName, filename string, reader io. return nil, err } if obj.Contains("errors") { - return nil, fmt.Errorf(string(data)) + return nil, fmt.Errorf("%s", string(data)) } now := time.Now() diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/storage.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/storage.go index 296efd005a..6bb88b553c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/storage.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/storage.go @@ -104,7 +104,7 @@ func (self *SStorage) GetIDiskById(id string) (cloudprovider.ICloudDisk, error) return disks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SStorage) GetIStoragecache() cloudprovider.ICloudStoragecache { @@ -219,5 +219,5 @@ func (self *SRegion) GetStorage(id string) (*SStorage, error) { return &storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } 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 2fa14d3d3d..4e5de99c5d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/cdn.go @@ -251,7 +251,7 @@ func (self *SQcloudClient) GetCdnDomain(domain string) (*SCdnDomain, error) { return &domains[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, domain) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", domain) } func (self *SCdnDomain) Refresh() error { @@ -332,7 +332,7 @@ func (self *SQcloudClient) GetICloudCDNDomainByName(name string) (cloudprovider. return &domains[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (client *SQcloudClient) AddCdnDomain(domain string, originType string, origins []string, cosPrivateAccess string) error { @@ -469,7 +469,7 @@ func (self *SQcloudClient) GetCdnConfig(resourceId string) (*SCdnConfig, error) for i := range result.Domains { return &result.Domains[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, resourceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", resourceId) } func (self *SCdnDomain) GetCacheKeys() (*cloudprovider.SCDNCacheKeys, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/certificate.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/certificate.go index a0d966544b..1dad44d055 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/certificate.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/certificate.go @@ -80,7 +80,7 @@ type SCertificate struct { IsVulnerability bool `json:"is_vulnerability"` // certificate details - detailsInitd bool `json:"details_initd"` + DetailsInitd bool `json:"details_initd"` SubjectAltName []string `json:"subjectAltName"` CertificatePrivateKey string `json:"CertificatePrivateKey"` CertificatePublicKey string `json:"CertificatePublicKey"` @@ -88,7 +88,7 @@ type SCertificate struct { } func (self *SCertificate) GetDetails() (*SCertificate, error) { - if !self.detailsInitd { + if !self.DetailsInitd { var ( cert *SCertificate err error @@ -97,7 +97,7 @@ func (self *SCertificate) GetDetails() (*SCertificate, error) { if err != nil { return nil, err } - self.detailsInitd = true + self.DetailsInitd = true self.SubjectAltName = cert.SubjectAltName self.CertificatePrivateKey = cert.CertificatePrivateKey self.CertificatePublicKey = cert.CertificatePublicKey diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/dnspod_domain.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/dnspod_domain.go index 37e4f3810d..9f9550b85f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/dnspod_domain.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/dnspod_domain.go @@ -89,7 +89,7 @@ func (self *SQcloudClient) GetDomain(domain string) (*SDomian, error) { return &domains[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, domain) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", domain) } func (self *SQcloudClient) GetICloudDnsZones() ([]cloudprovider.ICloudDnsZone, error) { @@ -139,7 +139,7 @@ func (self *SQcloudClient) CreateDomian(domianName string) (*SDomian, error) { } time.Sleep(time.Second * 10) } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, domianName) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", domianName) } func (self *SQcloudClient) CreateICloudDnsZone(opts *cloudprovider.SDnsZoneCreateOptions) (cloudprovider.ICloudDnsZone, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/eip.go index d3e386c640..edbec43842 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/eip.go @@ -290,7 +290,7 @@ func (region *SRegion) GetEip(eipId string) (*SEipAddress, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, eipId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", eipId) } func (region *SRegion) AllocateEIP(opts *cloudprovider.SEip) (*SEipAddress, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/elastic_search.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/elastic_search.go index 7e0e7dc7dd..3faf6ddd2b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/elastic_search.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/elastic_search.go @@ -319,7 +319,7 @@ func (self *SRegion) GetElasticSearch(id string) (*SElasticSearch, error) { ret[i].region = self return &ret[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetElasticSearchs(ids []string, limit, offset int) ([]SElasticSearch, int, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/kube_clusters.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/kube_clusters.go index 95d0d8861d..cc667455ed 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/kube_clusters.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/kube_clusters.go @@ -183,9 +183,9 @@ func (self *SRegion) GetKubeCluster(id string) (*SKubeCluster, error) { return &clusters[0], nil } if total == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, id) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", id) } func (self *SRegion) DeleteKubeCluster(id string, isRetain bool) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer.go index 2a4ceca80d..753f76e237 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer.go @@ -368,7 +368,7 @@ func (self *SRegion) GetLoadbalancer(id string) (*SLoadbalancer, error) { return &lbs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } /* @@ -528,7 +528,7 @@ func (self *SRegion) CreateILoadBalancer(opts *cloudprovider.SLoadbalancerCreate return nil, errors.Wrapf(err, "resp.Unmarshal") } if len(ret.RequestId) == 0 || len(ret.LoadBalancerIds) != 1 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, resp.String()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", resp.String()) } err = self.WaitLBTaskSuccess(ret.RequestId, 5*time.Second, time.Minute*1) if err != nil { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go index 43be2de247..f49fcbe040 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_listener.go @@ -123,7 +123,7 @@ func (self *SLBListener) CreateILoadBalancerListenerRule(rule *cloudprovider.SLo return &r, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, jsonutils.Marshal(resp).String()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", jsonutils.Marshal(resp).String()) } func (self *SLBListener) GetILoadBalancerListenerRuleById(ruleId string) (cloudprovider.ICloudLoadbalancerListenerRule, error) { @@ -433,7 +433,7 @@ func (self *SRegion) GetLoadbalancerListener(lbId, lisId string) (*SLBListener, return &ret[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, lisId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", lisId) } func (self *SRegion) GetLoadbalancerListeners(lbId string, lblisIds []string, protocol string) ([]SLBListener, error) { @@ -694,5 +694,5 @@ func (self *SRegion) CreateLoadbalancerListener(lbId string, opts *cloudprovider for i := range ret { return ret[i], nil } - return "", errors.Wrapf(cloudprovider.ErrNotFound, resp.String()) + return "", errors.Wrapf(cloudprovider.ErrNotFound, "%s", resp.String()) } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go index 7e108f50fd..890ac2cde8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go @@ -396,7 +396,7 @@ func (self *SRegion) GetMongoDB(id string) (*SMongoDB, error) { dbs[i].region = self return &dbs[i], nil } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetICloudMongoDBById(id string) (cloudprovider.ICloudMongoDB, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/monitor.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/monitor.go index 53e4094727..ae5fdd20a8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/monitor.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/monitor.go @@ -151,6 +151,9 @@ func (self *SQcloudClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions) cloudprovider.VM_METRIC_TYPE_MEM_USAGE: { "MemUsage": "", }, + cloudprovider.VM_METRIC_TYPE_DISK_USAGE: { + "CvmDiskUsage": "", + }, cloudprovider.VM_METRIC_TYPE_NET_BPS_TX: { "lanOuttraffic": cloudprovider.METRIC_TAG_NET_TYPE + ":" + cloudprovider.METRIC_TAG_NET_TYPE_INTRANET, "WanOuttraffic": cloudprovider.METRIC_TAG_NET_TYPE + ":" + cloudprovider.METRIC_TAG_NET_TYPE_INTERNET, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/qcloud.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/qcloud.go index 603d21e1f2..9997425df8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/qcloud.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/qcloud.go @@ -365,13 +365,13 @@ func _baseJsonRequest(client *common.Client, req tchttp.Request, resp qcloudResp "InvalidParameter.PermissionDenied", "AuthFailure", }) { - return nil, errors.Wrapf(cloudprovider.ErrNoPermission, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrNoPermission, "%s", err.Error()) } if utils.IsInStringArray(e.Code, []string{ "AuthFailure.SecretIdNotFound", "AuthFailure.SignatureFailure", }) { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) } if utils.IsInStringArray(e.Code, []string{ "InvalidParameter.RoleNotExist", @@ -379,7 +379,7 @@ func _baseJsonRequest(client *common.Client, req tchttp.Request, resp qcloudResp "FailedOperation.CertificateNotFound", "ResourceNotFound.OrganizationNotExist", }) { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", err.Error()) } if utils.IsInStringArray(e.Code, []string{ @@ -512,7 +512,7 @@ func (client *SQcloudClient) getSdkClient(regionId string) (*common.Client, erro return respCheck, nil } } - return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action) + return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s", action) } return respCheck, nil })) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go index 53b1e798a2..65a88a8282 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go @@ -479,12 +479,12 @@ func (self *SRegion) waitAsyncAction(action string, resId, asyncRequestId string return cloudprovider.Wait(time.Second*10, time.Minute*20, func() (bool, error) { result, err := self.DescribeMySQLAsyncRequestInfo(asyncRequestId) if err != nil { - return false, errors.Wrapf(err, action) + return false, errors.Wrapf(err, "%s", action) } log.Debugf("task %s(%s) for mysql instance %s status: %s", action, asyncRequestId, resId, result.Status) switch result.Status { case "FAILED", "KILLED", "REMOVED", "PAUSED": - return true, errors.Errorf(result.Info) + return true, errors.Errorf("%s", result.Info) case "SUCCESS": return true, nil default: @@ -881,7 +881,7 @@ func (self *SRegion) GetMySQLInstanceById(id string) (*SMySQLInstance, error) { return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "id: [%s]", id) } if total < 1 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } part[0].region = self return &part[0], nil diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/region.go index b719dc9fcd..5be377ac5f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/region.go @@ -292,7 +292,7 @@ func (self *SRegion) getZoneById(id string) (*SZone, error) { return &zones[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetIVpcs() ([]cloudprovider.ICloudVpc, error) { @@ -590,7 +590,7 @@ func (self *SRegion) GetNetwork(id string) (*SNetwork, error) { return &networks[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) getStoragecache() *SStoragecache { @@ -867,7 +867,7 @@ func (region *SRegion) GetIElasticcacheById(id string) (cloudprovider.ICloudElas return &memcacheds[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } caches, err := region.GetCloudElasticcaches(id) if err != nil { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/securitygroup.go index 6684e36103..dda9275e07 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/securitygroup.go @@ -176,7 +176,7 @@ func (self *SRegion) GetSecurityGroup(id string) (*SSecurityGroup, error) { return &groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) DeleteSecurityGroup(secGroupId string) error { 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 883aaef179..ee96575a57 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/waf.go @@ -290,7 +290,7 @@ func (self *SRegion) GetICloudWafInstanceById(id string) (cloudprovider.ICloudWa return &wafs[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetWafInstance(domain, domainId, instanceId string) (*SWafInstance, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qingcloud/qingcloud.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qingcloud/qingcloud.go index feda55c27b..bbaebe4985 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qingcloud/qingcloud.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qingcloud/qingcloud.go @@ -117,7 +117,7 @@ func (self *SQingCloudClient) getUrl(service string) (string, error) { case "ec2": return fmt.Sprintf("https://api.qingcloud.com/iaas/"), nil default: - return "", errors.Wrapf(cloudprovider.ErrNotSupported, service) + return "", errors.Wrapf(cloudprovider.ErrNotSupported, "%s", service) } } @@ -233,9 +233,9 @@ func (self *SQingCloudClient) request(service, action, regionId string, params m if retCode > 0 { // https://docs.qingcloud.com/product/api/common/error_code.html if retCode == 1200 { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, resp.String()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", resp.String()) } - return nil, errors.Errorf(resp.String()) + return nil, errors.Errorf("%s", resp.String()) } return resp, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/zone.go index 432dd9e8b4..8d4d3f08ce 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/zone.go @@ -57,7 +57,7 @@ func (self *SZone) GetIHostById(id string) (cloudprovider.ICloudHost, error) { return hosts[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SZone) GetIStorages() ([]cloudprovider.ICloudStorage, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/client.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/client.go index 0c2aaf1a58..efb95e73f4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/client.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/client.go @@ -157,7 +157,7 @@ func parseUcloudResponse(params SParams, resp jsonutils.JSONObject) (jsonutils.J if err.RetCode > 0 { if err.RetCode == 171 { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) } return nil, err } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/securitygroup.go index 64c6093c4d..0b9664aaa1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/securitygroup.go @@ -104,7 +104,7 @@ func (self *SRegion) GetSecurityGroup(secGroupId string) (*SSecurityGroup, error return &secgroups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, secGroupId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", secGroupId) } // https://docs.ucloud.cn/api/unet-api/create_firewall diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/disk.go index 947d95f641..ff0e11c765 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/disk.go @@ -267,14 +267,14 @@ func (region *SRegion) CreateDisk(zoneId string, category string, opts *cloudpro func (region *SRegion) GetDisk(diskId string) (*SDisk, error) { disks, err := region.GetDisks("", "", "", []string{diskId}) if err != nil { - return nil, errors.Wrapf(err, fmt.Sprintf("%s not found", diskId)) + return nil, errors.Wrapf(err, "%s not found", diskId) } for _, disk := range disks { if disk.VolumeId == diskId { return &disk, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, fmt.Sprintf("%s not found", diskId)) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s not found", diskId) } func (region *SRegion) DeleteDisk(diskId string) error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/eip.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/eip.go index dd70265386..de4af2b45f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/eip.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/eip.go @@ -274,7 +274,7 @@ func (region *SRegion) GetEip(eipId string) (*SEipAddress, error) { return &eips[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, eipId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", eipId) } func (region *SRegion) AllocateEIP(opts *cloudprovider.SEip) (*SEipAddress, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go index 628fcdfb9e..f648567e6a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go @@ -249,7 +249,7 @@ func (region *SRegion) GetImage(imageId string) (*SImage, error) { return &images[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, imageId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", imageId) } func (region *SRegion) GetImageByName(name string) (*SImage, error) { @@ -262,7 +262,7 @@ func (region *SRegion) GetImageByName(name string) (*SImage, error) { return &images[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, name) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", name) } func (region *SRegion) GetImageStatus(imageId string) (ImageStatusType, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/instance.go index 6436b54adf..1f16ae231f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/instance.go @@ -137,7 +137,7 @@ func (region *SRegion) GetInstance(instanceId string) (*SInstance, error) { return &instances[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", instanceId) } func (region *SRegion) GetInstances(zoneId string, ids []string) ([]SInstance, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/policy.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/policy.go index a94c84da9a..72dc8dba14 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/policy.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/policy.go @@ -78,7 +78,7 @@ func (policy *SPolicy) GetDocument() (*jsonutils.JSONDict, error) { } ret, ok := doc.(*jsonutils.JSONDict) if !ok { - return nil, errors.Wrapf(cloudprovider.ErrNotSupported, policy.PolicyDocument) + return nil, errors.Wrapf(cloudprovider.ErrNotSupported, "%s", policy.PolicyDocument) } return ret, nil } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go index c6e703aeff..09e6c11fc8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/securitygroup.go @@ -84,7 +84,7 @@ func (region *SRegion) GetSecurityGroup(secGroupId string) (*SSecurityGroup, err return &secgroups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, secGroupId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", secGroupId) } func (region *SRegion) GetSecurityGroupRules(secGroupId string) ([]SSecurityGroupRule, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/snapshot.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/snapshot.go index cbd017b126..28701a8daa 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/snapshot.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/snapshot.go @@ -172,7 +172,7 @@ func (self *SRegion) GetSnapshot(id string) (*SSnapshot, error) { return &snapshots[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetISnapshotById(id string) (cloudprovider.ICloudSnapshot, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/vpc.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/vpc.go index 24049b893a..41b4d157ee 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/vpc.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/vpc.go @@ -110,7 +110,7 @@ func (vpc *SVpc) GetIWireById(wireId string) (cloudprovider.ICloudWire, error) { return wires[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, wireId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", wireId) } func (vpc *SVpc) GetISecurityGroups() ([]cloudprovider.ICloudSecurityGroup, error) { @@ -177,7 +177,7 @@ func (vpc *SVpc) GetIRouteTableById(routeTableId string) (cloudprovider.ICloudRo return tables[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, routeTableId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", routeTableId) } func (vpc *SVpc) Delete() error { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/zone.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/zone.go index 7326c713af..be04f88173 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/zone.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/zone.go @@ -71,7 +71,7 @@ func (zone *SZone) GetGlobalId() string { } func (zone *SZone) GetName() string { - return fmt.Sprintf(zone.ZoneId) + return fmt.Sprintf("%s", zone.ZoneId) } func (zone *SZone) GetI18n() cloudprovider.SModelI18nTable { @@ -164,7 +164,7 @@ func (zone *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, erro return storages[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SRegion) GetStorageTypes(zoneId string) ([]sStorageType, error) { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/network_service.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/network_service.go index 68697d8d23..c91425c780 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/network_service.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/network_service.go @@ -98,7 +98,7 @@ func (region *SRegion) AttachServiceForl3Network(l3Id string, services []string) if err != nil || len(networkServiceProviders) == 0 { msg := fmt.Sprintf("failed to find network services %s error: %v", service, err) log.Errorln(msg) - return fmt.Errorf(msg) + return fmt.Errorf("%s", msg) } attachServices := []string{} for i := 0; i < len(networkServiceProviders[0].NetworkServiceTypes); i++ { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go index 25a832ad4f..83644c2631 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/zstack.go @@ -252,7 +252,7 @@ func (cli *SZStackClient) _list(resource string, start int, limit int, params ur if err != nil { if e, ok := err.(*httputils.JSONClientError); ok { if strings.Contains(e.Details, "wrong accessKey signature") || strings.Contains(e.Details, "access key id") { - return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return nil, errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%s", err.Error()) } } return nil, err @@ -285,7 +285,7 @@ func (cli *SZStackClient) _delete(resource, resourceId, deleteMode string) (json } _, resp, err := httputils.JSONRequest(cli.httpClient, context.Background(), "DELETE", requestURL, header, nil, cli.debug) if err != nil { - return nil, errors.Wrapf(err, fmt.Sprintf("DELETE %s %s %s", resource, resourceId, deleteMode)) + return nil, errors.Wrapf(err, "DELETE %s %s %s", resource, resourceId, deleteMode) } if resp.Contains("location") { location, _ := resp.GetString("location") @@ -380,7 +380,7 @@ func (cli *SZStackClient) _getMonitor(resource string, params jsonutils.JSONObje time.Sleep(time.Second * 5) continue } - return nil, errors.Wrapf(err, fmt.Sprintf("GET %s %s", resource, params)) + return nil, errors.Wrapf(err, "GET %s %s", resource, params) } break } @@ -412,7 +412,7 @@ func (cli *SZStackClient) _get(resource, resourceId string, spec string) (jsonut time.Sleep(time.Second * 5) continue } - return nil, errors.Wrapf(err, fmt.Sprintf("GET %s %s %s", resource, resourceId, spec)) + return nil, errors.Wrapf(err, "GET %s %s %s", resource, resourceId, spec) } break } @@ -485,7 +485,7 @@ func (cli *SZStackClient) _post(resource string, params jsonutils.JSONObject) (j } _, resp, err := cli.jsonRequest(context.TODO(), "POST", requestURL, header, params) if err != nil { - return nil, errors.Wrapf(err, fmt.Sprintf("POST %s %s", resource, params.String())) + return nil, errors.Wrapf(err, "POST %s %s", resource, params.String()) } if resp.Contains("location") { location, _ := resp.GetString("location")