Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite089195

Browse files
fix: appease the linter
1 parent3a49a19 commite089195

File tree

7 files changed

+19
-15
lines changed

7 files changed

+19
-15
lines changed

‎agent/agent.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,10 @@ func (a *agent) reportMetadata(ctx context.Context, conn drpc.Conn) error {
583583
case<-ctx.Done():
584584
returnctx.Err()
585585
casetiming:=<-*a.scriptRunner.ScriptTimings():
586-
aAPI.ScriptCompleted(ctx,&proto.WorkspaceAgentScriptCompletedRequest{
586+
_,err:=aAPI.ScriptCompleted(ctx,&proto.WorkspaceAgentScriptCompletedRequest{
587587
Timing:timing.ToProto(),
588588
})
589+
returnerr
589590
casemr:=<-metadataResults:
590591
// This can overwrite unsent values, but that's fine because
591592
// we're only interested about up-to-date values.

‎agent/agentscripts/agentscripts.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func New(opts Options) *Runner {
6666
cronCtxCancel:cronCtxCancel,
6767
cron:cron.New(cron.WithParser(parser)),
6868
closed:make(chanstruct{}),
69-
scriptTimings:make(chantimingSpan),
69+
scriptTimings:make(chanTimingSpan),
7070
dataDir:filepath.Join(opts.DataDirBase,"coder-script-data"),
7171
scriptsExecuted:prometheus.NewCounterVec(prometheus.CounterOpts{
7272
Namespace:"agent",
@@ -87,7 +87,7 @@ type Runner struct {
8787
cron*cron.Cron
8888
initialized atomic.Bool
8989
scripts []codersdk.WorkspaceAgentScript
90-
scriptTimingschantimingSpan
90+
scriptTimingschanTimingSpan
9191
dataDirstring
9292

9393
// scriptsExecuted includes all scripts executed by the workspace agent. Agents
@@ -96,7 +96,7 @@ type Runner struct {
9696
scriptsExecuted*prometheus.CounterVec
9797
}
9898

99-
func (r*Runner)ScriptTimings()*chantimingSpan {
99+
func (r*Runner)ScriptTimings()*chanTimingSpan {
100100
return&r.scriptTimings
101101
}
102102

@@ -321,7 +321,7 @@ func (r *Runner) run(ctx context.Context, script codersdk.WorkspaceAgentScript)
321321
logger.Info(ctx,fmt.Sprintf("%s script completed",logPath),slog.F("execution_time",execTime),slog.F("exit_code",exitCode))
322322
}
323323

324-
r.scriptTimings<-timingSpan{
324+
r.scriptTimings<-TimingSpan{
325325
displayName:script.DisplayName,
326326
start:start,
327327
end:end,

‎agent/agentscripts/timings.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ package agentscripts
33
import (
44
"time"
55

6-
"github.com/coder/coder/v2/agent/proto"
76
"google.golang.org/protobuf/types/known/timestamppb"
7+
8+
"github.com/coder/coder/v2/agent/proto"
89
)
910

10-
typetimingSpanstruct {
11+
typeTimingSpanstruct {
1112
displayNamestring
1213
start,end time.Time
1314
exitCodeint32
1415
}
1516

16-
func (ts*timingSpan)ToProto()*proto.Timing {
17+
func (ts*TimingSpan)ToProto()*proto.Timing {
1718
return&proto.Timing{
1819
DisplayName:ts.displayName,
1920
Start:timestamppb.New(ts.start),

‎agent/agenttest/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ func (f *FakeAgentAPI) BatchCreateLogs(ctx context.Context, req *agentproto.Batc
301301
return&agentproto.BatchCreateLogsResponse{},nil
302302
}
303303

304-
func (f*FakeAgentAPI)ScriptCompleted(ctx context.Context,req*agentproto.WorkspaceAgentScriptCompletedRequest) (*agentproto.WorkspaceAgentScriptCompletedResponse,error) {
304+
func (*FakeAgentAPI)ScriptCompleted(_ context.Context,_*agentproto.WorkspaceAgentScriptCompletedRequest) (*agentproto.WorkspaceAgentScriptCompletedResponse,error) {
305305
return&agentproto.WorkspaceAgentScriptCompletedResponse{},nil
306306
}
307307

‎cli/organizationsettings.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ func (r *RootCmd) setOrganizationSettings(orgContext *OrganizationContext, setti
125125

126126
settingJSON,err:=json.Marshal(output)
127127
iferr!=nil {
128-
returnfmt.Errorf("failed to marshal organization setting %s: %w",inv.Args[0],err)
128+
returnxerrors.Errorf("failed to marshal organization setting %s: %w",inv.Args[0],err)
129129
}
130130

131131
vardst bytes.Buffer
132132
err=json.Indent(&dst,settingJSON,"","\t")
133133
iferr!=nil {
134-
returnfmt.Errorf("failed to indent organization setting as json %s: %w",inv.Args[0],err)
134+
returnxerrors.Errorf("failed to indent organization setting as json %s: %w",inv.Args[0],err)
135135
}
136136

137137
_,err=fmt.Fprintln(inv.Stdout,dst.String())
@@ -190,13 +190,13 @@ func (r *RootCmd) printOrganizationSetting(orgContext *OrganizationContext, sett
190190

191191
settingJSON,err:=json.Marshal(output)
192192
iferr!=nil {
193-
returnfmt.Errorf("failed to marshal organization setting %s: %w",inv.Args[0],err)
193+
returnxerrors.Errorf("failed to marshal organization setting %s: %w",inv.Args[0],err)
194194
}
195195

196196
vardst bytes.Buffer
197197
err=json.Indent(&dst,settingJSON,"","\t")
198198
iferr!=nil {
199-
returnfmt.Errorf("failed to indent organization setting as json %s: %w",inv.Args[0],err)
199+
returnxerrors.Errorf("failed to indent organization setting as json %s: %w",inv.Args[0],err)
200200
}
201201

202202
_,err=fmt.Fprintln(inv.Stdout,dst.String())

‎coderd/agentapi/scripts.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package agentapi
33
import (
44
"context"
55

6+
"github.com/google/uuid"
7+
68
agentproto"github.com/coder/coder/v2/agent/proto"
79
"github.com/coder/coder/v2/coderd/database"
8-
"github.com/google/uuid"
910
)
1011

1112
typeScriptsAPIstruct {

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7577,7 +7577,7 @@ func (q *FakeQuerier) InsertWorkspaceAgentMetadata(_ context.Context, arg databa
75777577
returnnil
75787578
}
75797579

7580-
func (q*FakeQuerier)InsertWorkspaceAgentScriptTimings(ctx context.Context,arg database.InsertWorkspaceAgentScriptTimingsParams) (database.WorkspaceAgentScriptTiming,error) {
7580+
func (q*FakeQuerier)InsertWorkspaceAgentScriptTimings(_ context.Context,arg database.InsertWorkspaceAgentScriptTimingsParams) (database.WorkspaceAgentScriptTiming,error) {
75817581
err:=validateDatabaseType(arg)
75827582
iferr!=nil {
75837583
return database.WorkspaceAgentScriptTiming{},err
@@ -7586,6 +7586,7 @@ func (q *FakeQuerier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg
75867586
q.mutex.Lock()
75877587
deferq.mutex.Unlock()
75887588

7589+
//nolint:gosimple
75897590
scriptTiming:= database.WorkspaceAgentScriptTiming{
75907591
StartedAt:arg.StartedAt,
75917592
EndedAt:arg.EndedAt,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp