Skip to content

Commit 9520da3

Browse files
mafredrimafredri
authored
fix: conform to stricter printf usage in Go 1.24 (coder#16330)
1 parent 967a381 commit 9520da3

File tree

13 files changed

+22
-22
lines changed

13 files changed

+22
-22
lines changed

Diff for: ‎agent/agent_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ func TestAgent_FileTransferBlocked(t *testing.T) {
977977
isErr := strings.Contains(errorMessage, agentssh.BlockedFileTransferErrorMessage) ||
978978
strings.Contains(errorMessage, "EOF") ||
979979
strings.Contains(errorMessage, "Process exited with status 65")
980-
require.True(t, isErr, fmt.Sprintf("Message: "+errorMessage))
980+
require.True(t, isErr, "Message: "+errorMessage)
981981
}
982982

983983
t.Run("SFTP", func(t *testing.T) {

Diff for: ‎cli/gitssh.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (r *RootCmd) gitssh() *serpent.Command {
9191
if xerrors.As(err, &exitErr) && exitErr.ExitCode() == 255 {
9292
_, _ = fmt.Fprintln(inv.Stderr,
9393
"\n"+pretty.Sprintf(
94-
cliui.DefaultStyles.Wrap,
94+
cliui.DefaultStyles.Wrap, "%s",
9595
"Coder authenticates with "+pretty.Sprint(cliui.DefaultStyles.Field, "git")+
9696
" using the public key below. All clones with SSH are authenticated automatically 🪄.")+"\n",
9797
)

Diff for: ‎cli/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func (r *RootCmd) login() *serpent.Command {
209209

210210
// nolint: nestif
211211
if !hasFirstUser {
212-
_, _ = fmt.Fprintf(inv.Stdout, Caret+"Your Coder deployment hasn't been set up!\n")
212+
_, _ = fmt.Fprint(inv.Stdout, Caret+"Your Coder deployment hasn't been set up!\n")
213213

214214
if username == "" {
215215
if !isTTYIn(inv) {

Diff for: ‎cli/logout.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (r *RootCmd) logout() *serpent.Command {
6868
errorString := strings.TrimRight(errorStringBuilder.String(), "\n")
6969
return xerrors.New("Failed to log out.\n" + errorString)
7070
}
71-
_, _ = fmt.Fprintf(inv.Stdout, Caret+"You are no longer logged in. You can log in using 'coder login <url>'.\n")
71+
_, _ = fmt.Fprint(inv.Stdout, Caret+"You are no longer logged in. You can log in using 'coder login <url>'.\n")
7272
return nil
7373
},
7474
}

Diff for: ‎cli/publickey.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ func (r *RootCmd) publickey() *serpent.Command {
4545
return xerrors.Errorf("create codersdk client: %w", err)
4646
}
4747

48-
cliui.Infof(inv.Stdout,
48+
cliui.Info(inv.Stdout,
4949
"This is your public key for using "+pretty.Sprint(cliui.DefaultStyles.Field, "git")+" in "+
5050
"Coder. All clones with SSH will be authenticated automatically 🪄.",
5151
)
52-
cliui.Infof(inv.Stdout, pretty.Sprint(cliui.DefaultStyles.Code, strings.TrimSpace(key.PublicKey))+"\n")
53-
cliui.Infof(inv.Stdout, "Add to GitHub and GitLab:")
54-
cliui.Infof(inv.Stdout, "> https://github.com/settings/ssh/new")
55-
cliui.Infof(inv.Stdout, "> https://gitlab.com/-/profile/keys")
52+
cliui.Info(inv.Stdout, pretty.Sprint(cliui.DefaultStyles.Code, strings.TrimSpace(key.PublicKey))+"\n")
53+
cliui.Info(inv.Stdout, "Add to GitHub and GitLab:")
54+
cliui.Info(inv.Stdout, "> https://github.com/settings/ssh/new")
55+
cliui.Info(inv.Stdout, "> https://gitlab.com/-/profile/keys")
5656

5757
return nil
5858
},

Diff for: ‎cli/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
513513
}
514514

515515
accessURL := vals.AccessURL.String()
516-
cliui.Infof(inv.Stdout, lipgloss.NewStyle().
516+
cliui.Info(inv.Stdout, lipgloss.NewStyle().
517517
Border(lipgloss.DoubleBorder()).
518518
Align(lipgloss.Center).
519519
Padding(0, 3).

Diff for: ‎cli/templateversionarchive.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (r *RootCmd) setArchiveTemplateVersion(archive bool) *serpent.Command {
7676
for _, version := range versions {
7777
if version.Archived == archive {
7878
_, _ = fmt.Fprintln(
79-
inv.Stdout, fmt.Sprintf("Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" already "+pastVerb),
79+
inv.Stdout, "Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" already "+pastVerb,
8080
)
8181
continue
8282
}
@@ -87,7 +87,7 @@ func (r *RootCmd) setArchiveTemplateVersion(archive bool) *serpent.Command {
8787
}
8888

8989
_, _ = fmt.Fprintln(
90-
inv.Stdout, fmt.Sprintf("Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" "+pastVerb+" at "+cliui.Timestamp(time.Now())),
90+
inv.Stdout, "Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" "+pastVerb+" at "+cliui.Timestamp(time.Now()),
9191
)
9292
}
9393
return nil

Diff for: ‎coderd/healthcheck/workspaceproxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ func (r *WorkspaceProxyReport) Run(ctx context.Context, opts *WorkspaceProxyRepo
100100
for _, err := range errs {
101101
switch r.Severity {
102102
case health.SeverityWarning, health.SeverityOK:
103-
r.Warnings = append(r.Warnings, health.Messagef(health.CodeProxyUnhealthy, err))
103+
r.Warnings = append(r.Warnings, health.Messagef(health.CodeProxyUnhealthy, "%s", err))
104104
case health.SeverityError:
105-
r.appendError(*health.Errorf(health.CodeProxyUnhealthy, err))
105+
r.appendError(*health.Errorf(health.CodeProxyUnhealthy, "%s", err))
106106
}
107107
}
108108
}

Diff for: ‎coderd/httpapi/httpapi_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ func TestWebsocketCloseMsg(t *testing.T) {
143143
t.Parallel()
144144

145145
msg := strings.Repeat("d", 255)
146-
trunc := httpapi.WebsocketCloseSprintf(msg)
146+
trunc := httpapi.WebsocketCloseSprintf("%s", msg)
147147
assert.Equal(t, len(trunc), 123)
148148
})
149149

150150
t.Run("TruncateMultiByteCharacters", func(t *testing.T) {
151151
t.Parallel()
152152

153153
msg := strings.Repeat("こんにちは", 10)
154-
trunc := httpapi.WebsocketCloseSprintf(msg)
154+
trunc := httpapi.WebsocketCloseSprintf("%s", msg)
155155
assert.Equal(t, len(trunc), 123)
156156
})
157157
}

Diff for: ‎enterprise/cli/proxyserver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (r *RootCmd) proxyServer() *serpent.Command {
205205
httpClient.Transport = headerTransport
206206

207207
accessURL := cfg.AccessURL.String()
208-
cliui.Infof(inv.Stdout, lipgloss.NewStyle().
208+
cliui.Info(inv.Stdout, lipgloss.NewStyle().
209209
Border(lipgloss.DoubleBorder()).
210210
Align(lipgloss.Center).
211211
Padding(0, 3).

Diff for: ‎provisioner/terraform/provision.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (s *server) Plan(
7878

7979
e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStagePlan)
8080
if err := e.checkMinVersion(ctx); err != nil {
81-
return provisionersdk.PlanErrorf(err.Error())
81+
return provisionersdk.PlanErrorf("%s", err.Error())
8282
}
8383
logTerraformEnvVars(sess)
8484

@@ -113,7 +113,6 @@ func (s *server) Plan(
113113
initTimings.ingest(createInitTimingsEvent(timingInitStart))
114114

115115
err = e.init(ctx, killCtx, sess)
116-
117116
if err != nil {
118117
initTimings.ingest(createInitTimingsEvent(timingInitErrored))
119118

@@ -168,7 +167,7 @@ func (s *server) Plan(
168167
request.Metadata.GetWorkspaceTransition() == proto.WorkspaceTransition_DESTROY,
169168
)
170169
if err != nil {
171-
return provisionersdk.PlanErrorf(err.Error())
170+
return provisionersdk.PlanErrorf("%s", err.Error())
172171
}
173172

174173
// Prepend init timings since they occur prior to plan timings.
@@ -189,7 +188,7 @@ func (s *server) Apply(
189188

190189
e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStageApply)
191190
if err := e.checkMinVersion(ctx); err != nil {
192-
return provisionersdk.ApplyErrorf(err.Error())
191+
return provisionersdk.ApplyErrorf("%s", err.Error())
193192
}
194193
logTerraformEnvVars(sess)
195194

Diff for: ‎pty/ptytest/ptytest.go

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ func (e *outExpecter) Peek(ctx context.Context, n int) []byte {
252252
return slices.Clone(out)
253253
}
254254

255+
//nolint:govet // We don't care about conforming to ReadRune() (rune, int, error).
255256
func (e *outExpecter) ReadRune(ctx context.Context) rune {
256257
e.t.Helper()
257258

Diff for: ‎vpn/tunnel.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func NewTunnel(
7171
return nil, err
7272
}
7373
t := &Tunnel{
74-
// nolint: govet // safe to copy the locks here because we haven't started the speaker
74+
//nolint:govet // safe to copy the locks here because we haven't started the speaker
7575
speaker: *(s),
7676
ctx: ctx,
7777
logger: logger,

0 commit comments

Comments
 (0)