From 65d66edbc79a2ba46f67b159bf8c3ec928388b27 Mon Sep 17 00:00:00 2001 From: guoguangwu Date: Sun, 12 Nov 2023 21:08:23 +0800 Subject: [PATCH] chore: unnecessary use of fmt.Sprintf d Signed-off-by: guoguangwu --- pkg/cloudcommon/db/lockman/lockman_test.go | 2 +- pkg/cloudcommon/validators/validators_cert.go | 2 +- pkg/compute/hostdrivers/kvm.go | 2 +- pkg/compute/tasks/scaling_group_delete_task.go | 2 +- pkg/hostman/diskutils/vddk.go | 2 +- pkg/hostman/guestman/guesttasks.go | 2 +- pkg/hostman/guestman/qemu-kvmhelper.go | 12 ++++++------ pkg/hostman/guestman/qemu/generate.go | 4 ++-- pkg/hostman/hostinfo/hostinfo.go | 2 +- pkg/hostman/monitor/hmp.go | 2 +- pkg/hostman/storageman/lvmutils/lvmutils.go | 4 ++-- pkg/lbagent/models/haproxy.go | 2 +- pkg/mcclient/session.go | 2 +- .../predicates/baremetal/cdrom_boot_predicate.go | 3 +-- pkg/scheduler/handler/ping.go | 4 ++-- pkg/util/qemuimg/qemuimg.go | 2 +- 16 files changed, 24 insertions(+), 25 deletions(-) diff --git a/pkg/cloudcommon/db/lockman/lockman_test.go b/pkg/cloudcommon/db/lockman/lockman_test.go index 43f2c7d7a1..205f523075 100644 --- a/pkg/cloudcommon/db/lockman/lockman_test.go +++ b/pkg/cloudcommon/db/lockman/lockman_test.go @@ -59,7 +59,7 @@ func (o *FakeObject) pop(playerId int) { } o.playerIdCount -= 1 if o.playerIdCount < 0 { - panic(fmt.Sprintf("obj overly unlocked")) + panic("obj overly unlocked") } else if o.playerIdCount == 0 { o.playerId = -1 } diff --git a/pkg/cloudcommon/validators/validators_cert.go b/pkg/cloudcommon/validators/validators_cert.go index 993a7bf050..e9cdf9f82a 100644 --- a/pkg/cloudcommon/validators/validators_cert.go +++ b/pkg/cloudcommon/validators/validators_cert.go @@ -304,7 +304,7 @@ parseEc: return nil, newInvalidValueError(v.Key, fmt.Sprintf("invalid ec private key: %s", err)) } } - return nil, newInvalidValueError(v.Key, fmt.Sprintf("invalid private key")) + return nil, newInvalidValueError(v.Key, "invalid private key") } func (v *ValidatorPrivateKey) parseFromString(s string) (crypto.PrivateKey, error) { diff --git a/pkg/compute/hostdrivers/kvm.go b/pkg/compute/hostdrivers/kvm.go index 48d01637d0..317b74fee3 100644 --- a/pkg/compute/hostdrivers/kvm.go +++ b/pkg/compute/hostdrivers/kvm.go @@ -534,7 +534,7 @@ func (self *SKVMHostDriver) getDeployConfig(host *models.SHost) ([]*api.DeployCo authInfo += fmt.Sprintf("YUNION_HOST_ADMIN=%s\n", options.Options.AdminUser) authInfo += fmt.Sprintf("YUNION_HOST_PASSWORD=%s\n", options.Options.AdminPassword) authInfo += fmt.Sprintf("YUNION_HOST_PROJECT=%s\n", options.Options.AdminProject) - authInfo += fmt.Sprintf("YUNION_START=yes\n") + authInfo += "YUNION_START=yes\n" apiServer, err := tokens.GetControlPlaneEndpoint() if err != nil { log.Errorf("Failed to get kubernetes controlplane endpoint: %v", err) diff --git a/pkg/compute/tasks/scaling_group_delete_task.go b/pkg/compute/tasks/scaling_group_delete_task.go index 825af0ad8e..9f1b04317b 100644 --- a/pkg/compute/tasks/scaling_group_delete_task.go +++ b/pkg/compute/tasks/scaling_group_delete_task.go @@ -110,7 +110,7 @@ func (self *ScalingGroupDeleteTask) OnInit(ctx context.Context, obj db.IStandalo return } if count != 0 { - self.taskFailed(ctx, sg, jsonutils.NewString(fmt.Sprintf("There are some guests in ScalingGroup, please delete them firstly"))) + self.taskFailed(ctx, sg, jsonutils.NewString("There are some guests in ScalingGroup, please delete them firstly")) return } diff --git a/pkg/hostman/diskutils/vddk.go b/pkg/hostman/diskutils/vddk.go index ad73fad02e..97184d2514 100644 --- a/pkg/hostman/diskutils/vddk.go +++ b/pkg/hostman/diskutils/vddk.go @@ -373,7 +373,7 @@ Loop: if err != nil { log.Errorf("unable to kill process '%d'", vd.Proc.Process.Pid) } - return errors.Error(fmt.Sprintf("VDDKDisk read timeout, program blocked")) + return errors.Error("VDDKDisk read timeout, program blocked") } return nil } diff --git a/pkg/hostman/guestman/guesttasks.go b/pkg/hostman/guestman/guesttasks.go index 5ad5676c78..dbd8fe84af 100644 --- a/pkg/hostman/guestman/guesttasks.go +++ b/pkg/hostman/guestman/guesttasks.go @@ -200,7 +200,7 @@ func (s *SGuestSuspendTask) onSaveMemStateWait(results string) { func (s *SGuestSuspendTask) onSaveMemStateCheck(status string) { if status == "failed" { - hostutils.TaskFailed(s.ctx, fmt.Sprintf("Save memory state failed")) + hostutils.TaskFailed(s.ctx, "Save memory state failed") // TODO: send cont command return } else if status != "completed" { diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index c4c468f1a6..1aae43b6c2 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -683,12 +683,12 @@ func (s *SKVMGuestInstance) generateStopScript(data *jsonutils.JSONDict) string cmd += "fi\n" cmd += fmt.Sprintf("for d in $(ls -d /dev/hugepages/%s*)\n", uuid) - cmd += fmt.Sprintf("do\n") - cmd += fmt.Sprintf(" if [ -d $d ]; then\n") - cmd += fmt.Sprintf(" umount $d\n") - cmd += fmt.Sprintf(" rm -rf $d\n") - cmd += fmt.Sprintf(" fi\n") - cmd += fmt.Sprintf("done\n") + cmd += "do\n" + cmd += " if [ -d $d ]; then\n" + cmd += " umount $d\n" + cmd += " rm -rf $d\n" + cmd += " fi\n" + cmd += "done\n" for _, nic := range nics { if nic.Driver == api.NETWORK_DRIVER_VFIO { diff --git a/pkg/hostman/guestman/qemu/generate.go b/pkg/hostman/guestman/qemu/generate.go index 440bb3ce0a..33427908cd 100644 --- a/pkg/hostman/guestman/qemu/generate.go +++ b/pkg/hostman/guestman/qemu/generate.go @@ -511,7 +511,7 @@ func getNicDeviceOption( if nic.Driver == "virtio" { if nic.NumQueues > 1 { - cmd += fmt.Sprintf(",mq=on") + cmd += ",mq=on" } if nic.Vectors != nil { cmd += fmt.Sprintf(",vectors=%d", *nic.Vectors) @@ -614,7 +614,7 @@ func getMigrateOptions(drvOpt QemuOptions, input *GenerateStartOptionsInput) []s opts := make([]string, 0) if input.NeedMigrate { if input.LiveMigrateUseTLS { - opts = append(opts, fmt.Sprintf("-incoming defer")) + opts = append(opts, "-incoming defer") } else { opts = append(opts, fmt.Sprintf("-incoming tcp:0:%d", input.LiveMigratePort)) } diff --git a/pkg/hostman/hostinfo/hostinfo.go b/pkg/hostman/hostinfo/hostinfo.go index 68772f4101..a8162158fc 100644 --- a/pkg/hostman/hostinfo/hostinfo.go +++ b/pkg/hostman/hostinfo/hostinfo.go @@ -1309,7 +1309,7 @@ func (h *SHostInfo) ensureHostRecord(zoneId string) (*api.HostDetails, error) { // 上次未能正常offline, 补充一次健康日志 if hosts[0].HostStatus == api.HOST_ONLINE { - reason := fmt.Sprintf("The host status is online when it staring. Maybe the control center was down earlier") + reason := "The host status is online when it staring. Maybe the control center was down earlier" logclient.AddSimpleActionLog(h, logclient.ACT_HEALTH_CHECK, map[string]string{"reason": reason}, hostutils.GetComputeSession(context.Background()).GetToken(), false) data := jsonutils.NewDict() data.Add(jsonutils.NewString(h.GetName()), "name") diff --git a/pkg/hostman/monitor/hmp.go b/pkg/hostman/monitor/hmp.go index c9e8743060..7b0347ba92 100644 --- a/pkg/hostman/monitor/hmp.go +++ b/pkg/hostman/monitor/hmp.go @@ -440,7 +440,7 @@ func (m *HmpMonitor) BlockStream(drive string, callback StringCallback) { } func (m *HmpMonitor) BlockJobComplete(drive string, callback StringCallback) { - m.Query(fmt.Sprintf("block_job_complete"), callback) + m.Query("block_job_complete", callback) } func (m *HmpMonitor) BlockReopenImage(drive, newImagePath, format string, cb StringCallback) { diff --git a/pkg/hostman/storageman/lvmutils/lvmutils.go b/pkg/hostman/storageman/lvmutils/lvmutils.go index 9a0d9af9ff..d5a44a0769 100644 --- a/pkg/hostman/storageman/lvmutils/lvmutils.go +++ b/pkg/hostman/storageman/lvmutils/lvmutils.go @@ -200,12 +200,12 @@ func DmRemove(dmPath string) error { } func DmCreate(lv1, lv2, dmName string) error { - var dmCreateScript = fmt.Sprintf(` + var dmCreateScript = ` size1=$(blockdev --getsz $1) size2=$(blockdev --getsz $2) echo "0 $size1 linear $1 0 $size1 $size2 linear $2 0" | dmsetup create $3 -`) +` out, err := procutils.NewRemoteCommandAsFarAsPossible("bash", "-c", dmCreateScript, "--", lv1, lv2, dmName).Output() if err != nil { return errors.Wrapf(err, "create device mapper failed %s", out) diff --git a/pkg/lbagent/models/haproxy.go b/pkg/lbagent/models/haproxy.go index 17aa87af62..93bf63075b 100644 --- a/pkg/lbagent/models/haproxy.go +++ b/pkg/lbagent/models/haproxy.go @@ -188,7 +188,7 @@ func (b *LoadbalancerCorpus) genHaproxyConfigCommon(lb *Loadbalancer, listener * } } if listener.EnableHttp2 { - bind += fmt.Sprintf(" alpn h2,http/1.1") + bind += " alpn h2,http/1.1" } } data["bind"] = bind diff --git a/pkg/mcclient/session.go b/pkg/mcclient/session.go index 286b4dab7e..25dfb57ff6 100644 --- a/pkg/mcclient/session.go +++ b/pkg/mcclient/session.go @@ -218,7 +218,7 @@ func (this *ClientSession) getServiceVersionURLs(service, region, zone, endpoint if err != nil { msg = fmt.Sprintf("fail to retrieve keystone urls: %s", err) } else if len(urls) == 0 { - msg = fmt.Sprintf("empty keystone url") + msg = "empty keystone url" } else { msg = fmt.Sprintf("Schema of keystone authUrl and endpoint mismatch: %s!=%s", this.client.authUrl, urls) } diff --git a/pkg/scheduler/algorithm/predicates/baremetal/cdrom_boot_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/cdrom_boot_predicate.go index c431d15223..fc47e83362 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/cdrom_boot_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/cdrom_boot_predicate.go @@ -16,7 +16,6 @@ package baremetal import ( "context" - "fmt" "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" "yunion.io/x/onecloud/pkg/scheduler/core" @@ -46,7 +45,7 @@ func (p *CdromBootPredicate) Execute(ctx context.Context, u *core.Unit, c core.C h := predicates.NewPredicateHelper(p, u, c) info := c.Getter().GetIpmiInfo() if !info.CdromBoot { - h.Exclude(fmt.Sprintf("ipmi not support cdrom boot")) + h.Exclude("ipmi not support cdrom boot") } return h.GetResult() } diff --git a/pkg/scheduler/handler/ping.go b/pkg/scheduler/handler/ping.go index 7e274caad7..73c39c12a0 100644 --- a/pkg/scheduler/handler/ping.go +++ b/pkg/scheduler/handler/ping.go @@ -57,10 +57,10 @@ func switchHandler(c *gin.Context) { var result string if counter%2 == 1 { o.Options.DisableBaremetalPredicates = true - result = fmt.Sprintf("ignore_baremetal_filter_switch is true") + result = "ignore_baremetal_filter_switch is true" } else { o.Options.DisableBaremetalPredicates = false - result = fmt.Sprintf("ignore_baremetal_filter_switch is false") + result = "ignore_baremetal_filter_switch is false" } c.JSON(http.StatusOK, result) diff --git a/pkg/util/qemuimg/qemuimg.go b/pkg/util/qemuimg/qemuimg.go index 540a0e85a4..1cfd3f85fd 100644 --- a/pkg/util/qemuimg/qemuimg.go +++ b/pkg/util/qemuimg/qemuimg.go @@ -705,7 +705,7 @@ func (img *SQemuImage) CreateQcow2(sizeMB int, compact bool, backPath string, pa encFormat = EncryptFormatLuks } options = append(options, fmt.Sprintf("encrypt.format=%s", encFormat)) - options = append(options, fmt.Sprintf("encrypt.key-secret=sec0")) + options = append(options, "encrypt.key-secret=sec0") if encFormat == EncryptFormatLuks { options = append(options, fmt.Sprintf("encrypt.cipher-alg=%s", encAlg)) }