From 2215f3d76001ebfeffb23c3858a0d22fd7e5a6c5 Mon Sep 17 00:00:00 2001
From: Jian Qiu <swordqiu@gmail.com>
Date: Tue, 5 Apr 2022 11:13:40 +0800
Subject: [PATCH] fix: make test format errors (#13898)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
---
 cmd/climc/shell/compute/disks.go        | 2 +-
 pkg/hostman/guestman/qemu-kvm.go        | 2 +-
 pkg/hostman/storageman/storage_base.go  | 4 ++--
 pkg/hostman/storageman/storage_local.go | 4 ++--
 pkg/image/models/images.go              | 2 +-
 pkg/multicloud/nutanix/zone.go          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/climc/shell/compute/disks.go b/cmd/climc/shell/compute/disks.go
index f70ec1cab6..5c336ceb5e 100644
--- a/cmd/climc/shell/compute/disks.go
+++ b/cmd/climc/shell/compute/disks.go
@@ -376,7 +376,7 @@ func init() {
 			url := fmt.Sprintf("%s/download/disks/%s/%s", managerUri, storageId, args.ID)
 			resp, err := httputils.Request(client, context.Background(), httputils.GET, url, header, nil, args.Debug)
 			if err != nil {
-				log.Errorf("request %s error: %v", err)
+				log.Errorf("request %s error: %v", url, err)
 				continue
 			}
 			defer resp.Body.Close()
diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go
index d18edb513e..2d11d548af 100644
--- a/pkg/hostman/guestman/qemu-kvm.go
+++ b/pkg/hostman/guestman/qemu-kvm.go
@@ -1652,7 +1652,7 @@ func (s *SKVMGuestInstance) SyncMetadata(meta *jsonutils.JSONDict) error {
 	_, err := modules.Servers.SetMetadata(hostutils.GetComputeSession(context.Background()),
 		s.Id, meta)
 	if err != nil {
-		log.Errorln("sync metadata error: %v", err)
+		log.Errorf("sync metadata error: %v", err)
 		return errors.Wrap(err, "set metadata")
 	}
 	return nil
diff --git a/pkg/hostman/storageman/storage_base.go b/pkg/hostman/storageman/storage_base.go
index 740d727d82..d172f625f7 100644
--- a/pkg/hostman/storageman/storage_base.go
+++ b/pkg/hostman/storageman/storage_base.go
@@ -429,8 +429,8 @@ func (s *SBaseStorage) CreateDiskFromBackup(ctx context.Context, disk IDisk, inp
 	backupPath := path.Join(s.GetBackupDir(), info.Backup.BackupId)
 	img, err := qemuimg.NewQemuImage(backupPath)
 	if err != nil {
-		log.Errorln("unable to new qemu image for %s: %s", backupPath, err.Error())
-		return err
+		log.Errorf("unable to new qemu image for %s: %s", backupPath, err.Error())
+		return errors.Wrapf(err, "unable to new qemu image for %s", backupPath)
 	}
 	_, err = img.Clone(disk.GetPath(), qemuimg.QCOW2, false)
 	return err
diff --git a/pkg/hostman/storageman/storage_local.go b/pkg/hostman/storageman/storage_local.go
index 512f0cab1f..23036ebb2e 100644
--- a/pkg/hostman/storageman/storage_local.go
+++ b/pkg/hostman/storageman/storage_local.go
@@ -125,8 +125,8 @@ func (s *SLocalStorage) CreateDiskFromBackup(ctx context.Context, disk IDisk, in
 	}
 	img, err := qemuimg.NewQemuImage(backupPath)
 	if err != nil {
-		log.Errorln("unable to new qemu image for %s: %s", backupPath, err.Error())
-		return err
+		log.Errorf("unable to new qemu image for %s: %s", backupPath, err.Error())
+		return errors.Wrapf(err, "unable to new qemu image for %s", backupPath)
 	}
 	_, err = img.Clone(disk.GetPath(), qemuimg.QCOW2, false)
 	return err
diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go
index b520f2ce8f..0249cd6e36 100644
--- a/pkg/image/models/images.go
+++ b/pkg/image/models/images.go
@@ -565,7 +565,7 @@ func (self *SImage) SaveImageFromStream(reader io.Reader, totalSize int64, calCh
 	if err != nil {
 		if fileutils2.IsFile(localPath) {
 			if e := os.Remove(localPath); e != nil {
-				log.Errorf("remove failed file %s error: %v", err)
+				log.Errorf("remove failed file %s error: %v", localPath, err)
 			}
 		}
 	}
diff --git a/pkg/multicloud/nutanix/zone.go b/pkg/multicloud/nutanix/zone.go
index 419490a5de..ddcdb0591a 100644
--- a/pkg/multicloud/nutanix/zone.go
+++ b/pkg/multicloud/nutanix/zone.go
@@ -108,7 +108,7 @@ func (self *SZone) GetIStorages() ([]cloudprovider.ICloudStorage, error) {
 func (self *SZone) GetIStorageById(id string) (cloudprovider.ICloudStorage, error) {
 	storage, err := self.region.GetStorage(id)
 	if err != nil {
-		return nil, errors.Wrapf(err, "GetStorage", id)
+		return nil, errors.Wrapf(err, "GetStorage %s", id)
 	}
 	if storage.ClusterUUID != self.UUID {
 		return nil, errors.Wrapf(cloudprovider.ErrNotFound, id)