Skip to content

Commit 275bfca

Browse files
committed
lint/fmt
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 4a29b96 commit 275bfca

File tree

7 files changed

+27
-8
lines changed

7 files changed

+27
-8
lines changed

coderd/database/dbmem/dbmem.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,13 +3172,28 @@ func (q *FakeQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (
31723172
return q.getProvisionerJobByIDNoLock(ctx, id)
31733173
}
31743174

3175-
func (q *FakeQuerier) GetProvisionerJobStatsByWorkspace(ctx context.Context, arg database.GetProvisionerJobStatsByWorkspaceParams) (database.ProvisionerJobStat, error) {
3175+
func (*FakeQuerier) GetProvisionerJobStatsByWorkspace(_ context.Context, arg database.GetProvisionerJobStatsByWorkspaceParams) (database.ProvisionerJobStat, error) {
31763176
err := validateDatabaseType(arg)
31773177
if err != nil {
31783178
return database.ProvisionerJobStat{}, err
31793179
}
31803180

3181-
panic("not implemented")
3181+
return database.ProvisionerJobStat{
3182+
JobID: arg.JobID,
3183+
JobStatus: database.ProvisionerJobStatusSucceeded,
3184+
WorkspaceID: arg.WorkspaceID,
3185+
WorkerID: uuid.NullUUID{UUID: uuid.New(), Valid: true},
3186+
Error: sql.NullString{},
3187+
ErrorCode: sql.NullString{},
3188+
UpdatedAt: dbtime.Now(),
3189+
QueuedSecs: 0.1,
3190+
CompletionSecs: 10,
3191+
CanceledSecs: 0,
3192+
InitSecs: 1,
3193+
PlanSecs: 2,
3194+
GraphSecs: 3,
3195+
ApplySecs: 4,
3196+
}, nil
31823197
}
31833198

31843199
func (q *FakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID) ([]database.ProvisionerJob, error) {
@@ -6642,13 +6657,13 @@ func (q *FakeQuerier) InsertProvisionerJobLogs(_ context.Context, arg database.I
66426657
return logs, nil
66436658
}
66446659

6645-
func (q *FakeQuerier) InsertProvisionerJobTimings(ctx context.Context, arg database.InsertProvisionerJobTimingsParams) ([]database.ProvisionerJobTiming, error) {
6660+
func (*FakeQuerier) InsertProvisionerJobTimings(_ context.Context, arg database.InsertProvisionerJobTimingsParams) ([]database.ProvisionerJobTiming, error) {
66466661
err := validateDatabaseType(arg)
66476662
if err != nil {
66486663
return nil, err
66496664
}
66506665

6651-
panic("not implemented")
6666+
return nil, nil
66526667
}
66536668

66546669
func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.InsertProvisionerKeyParams) (database.ProvisionerKey, error) {

coderd/database/dbtime/dbtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ func Now() time.Time {
1111
// microsecond precision.
1212
func Time(t time.Time) time.Time {
1313
return t.UTC().Round(time.Microsecond)
14-
}
14+
}

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14421442
}
14431443

14441444
// Insert timings outside transaction since it is metadata.
1445+
// nolint:exhaustruct // The other fields are set further down.
14451446
params := database.InsertProvisionerJobTimingsParams{
14461447
JobID: jobID,
14471448
}

coderd/workspacebuilds.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@ func (api *API) workspaceBuildStats(rw http.ResponseWriter, r *http.Request) {
676676
Message: "Failed to get workspace build stats",
677677
Detail: err.Error(),
678678
})
679+
return
679680
}
680681

681682
httpapi.Write(ctx, rw, http.StatusOK, convertWorkspaceBuildStats(pj))

provisioner/terraform/executor.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ import (
1515
"sync"
1616
"time"
1717

18-
"cdr.dev/slog"
1918
"github.com/hashicorp/go-version"
2019
tfjson "github.com/hashicorp/terraform-json"
2120
"go.opentelemetry.io/otel/attribute"
2221
"golang.org/x/xerrors"
2322

23+
"cdr.dev/slog"
24+
2425
"github.com/coder/coder/v2/coderd/database"
2526
"github.com/coder/coder/v2/coderd/tracing"
2627
"github.com/coder/coder/v2/provisionersdk/proto"

provisioner/terraform/timings_internal_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func TestAggregation(t *testing.T) {
5454
},
5555
}
5656

57+
// nolint:paralleltest // Not since go v1.22.
5758
for _, tc := range tests {
5859
t.Run(tc.name, func(t *testing.T) {
5960
t.Parallel()

provisionerd/runner/runner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10121012
Error: applyComplete.Error,
10131013
Type: &proto.FailedJob_WorkspaceBuild_{
10141014
WorkspaceBuild: &proto.FailedJob_WorkspaceBuild{
1015-
State: applyComplete.State,
1015+
State: applyComplete.State,
10161016
Timings: applyComplete.Timings,
10171017
},
10181018
},
@@ -1032,7 +1032,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10321032
WorkspaceBuild: &proto.CompletedJob_WorkspaceBuild{
10331033
State: applyComplete.State,
10341034
Resources: applyComplete.Resources,
1035-
Timings: applyComplete.Timings,
1035+
Timings: applyComplete.Timings,
10361036
},
10371037
},
10381038
}, nil

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy