Skip to content

Commit 0150a7d

Browse files
shanshanyingclaude
andcommitted
fix: resolve govet printf non-constant format string in spinnerMsg calls
Replace runtime string concatenation with format placeholders in spinnerMsg calls to satisfy govet's printf analyzer. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent de3b5ff commit 0150a7d

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

pkg/cmd/kubeblocks/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func configKBRelease(o *InstallOptions) error {
107107
if kbRelease != nil && kbRelease.Chart != nil && kbRelease.Chart.Metadata != nil {
108108
kbVersion = kbRelease.Chart.Metadata.Version
109109
}
110-
s := spinner.New(o.Out, spinnerMsg("Config KubeBlocks "+kbVersion))
110+
s := spinner.New(o.Out, spinnerMsg("Config KubeBlocks %s", kbVersion))
111111
defer s.Fail()
112112
o.disableHelmPreHookJob()
113113
// upgrade KubeBlocks chart

pkg/cmd/kubeblocks/install.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ func (o *InstallOptions) Install() error {
299299
s.Success()
300300

301301
// add helm repo
302-
s = spinner.New(o.Out, spinnerMsg("Add and update repo "+types.KubeBlocksRepoName))
302+
s = spinner.New(o.Out, spinnerMsg("Add and update repo %s", types.KubeBlocksRepoName))
303303
defer s.Fail()
304304
// Add repo, if exists, will update it
305305
if err = helm.AddRepo(newHelmRepoEntry()); err != nil {
@@ -308,7 +308,7 @@ func (o *InstallOptions) Install() error {
308308
s.Success()
309309

310310
// install KubeBlocks
311-
s = spinner.New(o.Out, spinnerMsg("Install KubeBlocks "+o.Version))
311+
s = spinner.New(o.Out, spinnerMsg("Install KubeBlocks %s", o.Version))
312312
defer s.Fail()
313313

314314
getImageRegistry := func() string {
@@ -460,7 +460,7 @@ func (o *InstallOptions) waitAddonsEnabled() error {
460460
msg := ""
461461
header := "Wait for addons to be enabled"
462462
failedErr := errors.New("some addons are failed to be enabled")
463-
s := spinner.New(o.Out, spinnerMsg(header))
463+
s := spinner.New(o.Out, spinnerMsg("Wait for addons to be enabled"))
464464

465465
var (
466466
spinnerDone = func() {

pkg/cmd/kubeblocks/install_1.0.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (o *InstallOptions) preInstallWhenUpgradeFrom09() error {
8585
deploy := &kbDeploys[i]
8686
kbVersion := deploy.Labels[constant.AppVersionLabelKey]
8787
o.kb09Namespace = deploy.Namespace
88-
s := spinner.New(o.Out, spinnerMsg(fmt.Sprintf("Stop %s %s", msgKey, kbVersion)))
88+
s := spinner.New(o.Out, spinnerMsg("Stop %s %s", msgKey, kbVersion))
8989
if err = o.stopDeploymentObject(s, deploy); err != nil {
9090
return err
9191
}

pkg/cmd/kubeblocks/upgrade.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (o *InstallOptions) Upgrade() error {
178178
}
179179

180180
// add helm repo
181-
s := spinner.New(o.Out, spinnerMsg("Add and update repo "+types.KubeBlocksChartName))
181+
s := spinner.New(o.Out, spinnerMsg("Add and update repo %s", types.KubeBlocksChartName))
182182
defer s.Fail()
183183
// Add repo, if exists, will update it
184184
if err = helm.AddRepo(newHelmRepoEntry()); err != nil {
@@ -200,7 +200,7 @@ func (o *InstallOptions) Upgrade() error {
200200
// stop the old version KubeBlocks, otherwise the old version KubeBlocks will reconcile the
201201
// new version resources, which may be not compatible. helm will start the new version
202202
// KubeBlocks after upgrade.
203-
s = spinner.New(o.Out, spinnerMsg("Stop KubeBlocks "+kbVersion))
203+
s = spinner.New(o.Out, spinnerMsg("Stop KubeBlocks %s", kbVersion))
204204
if err = o.stopDeployment(s, util.GetKubeBlocksDeploy); err != nil {
205205
return err
206206
}
@@ -244,7 +244,7 @@ func (o *InstallOptions) Upgrade() error {
244244
s.Success()
245245
}
246246

247-
s = spinner.New(o.Out, spinnerMsg("Upgrading KubeBlocks "+msg))
247+
s = spinner.New(o.Out, spinnerMsg("Upgrading KubeBlocks %s", msg))
248248
defer s.Fail()
249249
o.disableHelmPreHookJob()
250250
// upgrade KubeBlocks chart

pkg/cmd/playground/destroy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (o *destroyOptions) destroy() error {
104104
// destroyLocal destroy local k3d cluster that will destroy all resources
105105
func (o *destroyOptions) destroyLocal() error {
106106
provider, _ := cp.New(cp.Local, "", o.Out, o.ErrOut)
107-
s := spinner.New(o.Out, spinnerMsg("Delete playground k3d cluster "+o.prevCluster.ClusterName))
107+
s := spinner.New(o.Out, spinnerMsg("Delete playground k3d cluster %s", o.prevCluster.ClusterName))
108108
defer s.Fail()
109109
if err := provider.DeleteK8sCluster(o.prevCluster); err != nil {
110110
if !strings.Contains(err.Error(), "no cluster found") &&
@@ -358,7 +358,7 @@ func (o *destroyOptions) uninstallKubeBlocks(client kubernetes.Interface, dynami
358358
}
359359

360360
func (o *destroyOptions) removeKubeConfig() error {
361-
s := spinner.New(o.Out, spinnerMsg("Remove kubeconfig from "+defaultKubeConfigPath))
361+
s := spinner.New(o.Out, spinnerMsg("Remove kubeconfig from %s", defaultKubeConfigPath))
362362
defer s.Fail()
363363
if err := kubeConfigRemove(o.prevCluster.KubeConfig, defaultKubeConfigPath); err != nil {
364364
if os.IsNotExist(err) {

pkg/cmd/playground/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func (o *initOptions) local() error {
227227
}
228228

229229
// create a local kubernetes cluster (k3d cluster) to deploy KubeBlocks
230-
s := spinner.New(o.Out, spinnerMsg("Create k3d cluster: "+clusterInfo.ClusterName))
230+
s := spinner.New(o.Out, spinnerMsg("Create k3d cluster: %s", clusterInfo.ClusterName))
231231
defer s.Fail()
232232
if err = provider.CreateK8sCluster(clusterInfo); err != nil {
233233
return errors.Wrap(err, "failed to set up k3d cluster")
@@ -379,7 +379,7 @@ func (o *initOptions) writeStateFile(provider cp.Interface) (*cp.K8sClusterInfo,
379379

380380
// merge created kubernetes cluster kubeconfig to ~/.kube/config and set it as default
381381
func (o *initOptions) setKubeConfig(info *cp.K8sClusterInfo) error {
382-
s := spinner.New(o.Out, spinnerMsg("Merge kubeconfig to "+defaultKubeConfigPath))
382+
s := spinner.New(o.Out, spinnerMsg("Merge kubeconfig to %s", defaultKubeConfigPath))
383383
defer s.Fail()
384384

385385
// check if the default kubeconfig file exists, if not, create it
@@ -399,7 +399,7 @@ func (o *initOptions) setKubeConfig(info *cp.K8sClusterInfo) error {
399399
s.Success()
400400

401401
currentContext, err := kubeConfigCurrentContext(info.KubeConfig)
402-
s = spinner.New(o.Out, spinnerMsg("Switch current context to "+currentContext))
402+
s = spinner.New(o.Out, spinnerMsg("Switch current context to %s", currentContext))
403403
defer s.Fail()
404404
if err != nil {
405405
return err

pkg/cmd/playground/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func readClusterInfoFromFile(path string) (*cp.K8sClusterInfo, error) {
123123
}
124124

125125
func writeAndUseKubeConfig(kubeConfig string, kubeConfigPath string, out io.Writer) error {
126-
s := spinner.New(out, spinnerMsg("Write kubeconfig to "+kubeConfigPath))
126+
s := spinner.New(out, spinnerMsg("Write kubeconfig to %s", kubeConfigPath))
127127
defer s.Fail()
128128
if err := kubeConfigWrite(kubeConfig, kubeConfigPath, writeKubeConfigOptions{
129129
UpdateExisting: true,

0 commit comments

Comments
 (0)