Skip to content

Commit 8d64e38

Browse files
johnstcnjohnstcn
committed
rename ProvisionerDaemonsReportOptions -> ProvisionerDaemonsReportDeps
1 parent 19a58ad commit 8d64e38

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

‎coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ func New(options *Options) *API {
440440
CurrentVersion: buildinfo.Version(),
441441
WorkspaceProxiesFetchUpdater: *(options.WorkspaceProxiesFetchUpdater).Load(),
442442
},
443-
ProvisionerDaemons: healthcheck.ProvisionerDaemonsReportOptions{
443+
ProvisionerDaemons: healthcheck.ProvisionerDaemonsReportDeps{
444444
CurrentVersion: buildinfo.Version(),
445445
CurrentAPIMajorVersion: provisionersdk.CurrentMajor,
446446
Store: options.Database,

‎coderd/healthcheck/healthcheck.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Checker interface {
1818
Websocket(ctx context.Context, opts *WebsocketReportOptions) WebsocketReport
1919
Database(ctx context.Context, opts *DatabaseReportOptions) DatabaseReport
2020
WorkspaceProxy(ctx context.Context, opts *WorkspaceProxyReportOptions) WorkspaceProxyReport
21-
ProvisionerDaemons(ctx context.Context, opts *ProvisionerDaemonsReportOptions) ProvisionerDaemonsReport
21+
ProvisionerDaemons(ctx context.Context, opts *ProvisionerDaemonsReportDeps) ProvisionerDaemonsReport
2222
}
2323

2424
// @typescript-generate Report
@@ -50,7 +50,7 @@ type ReportOptions struct {
5050
DerpHealth derphealth.ReportOptions
5151
Websocket WebsocketReportOptions
5252
WorkspaceProxy WorkspaceProxyReportOptions
53-
ProvisionerDaemons ProvisionerDaemonsReportOptions
53+
ProvisionerDaemons ProvisionerDaemonsReportDeps
5454

5555
Checker Checker
5656
}
@@ -82,7 +82,7 @@ func (defaultChecker) WorkspaceProxy(ctx context.Context, opts *WorkspaceProxyRe
8282
return report
8383
}
8484

85-
func (defaultChecker) ProvisionerDaemons(ctx context.Context, opts *ProvisionerDaemonsReportOptions) (report ProvisionerDaemonsReport) {
85+
func (defaultChecker) ProvisionerDaemons(ctx context.Context, opts *ProvisionerDaemonsReportDeps) (report ProvisionerDaemonsReport) {
8686
report.Run(ctx, opts)
8787
return report
8888
}

‎coderd/healthcheck/healthcheck_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (c *testChecker) WorkspaceProxy(context.Context, *healthcheck.WorkspaceProx
4141
return c.WorkspaceProxyReport
4242
}
4343

44-
func (c *testChecker) ProvisionerDaemons(context.Context, *healthcheck.ProvisionerDaemonsReportOptions) healthcheck.ProvisionerDaemonsReport {
44+
func (c *testChecker) ProvisionerDaemons(context.Context, *healthcheck.ProvisionerDaemonsReportDeps) healthcheck.ProvisionerDaemonsReport {
4545
return c.ProvisionerDaemonsReport
4646
}
4747

‎coderd/healthcheck/provisioner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type ProvisionerDaemonsReport struct {
2828
ProvisionerDaemons []codersdk.ProvisionerDaemon `json:"provisioner_daemons"`
2929
}
3030

31-
type ProvisionerDaemonsReportOptions struct {
31+
type ProvisionerDaemonsReportDeps struct {
3232
CurrentVersion string
3333
CurrentAPIMajorVersion int
3434

@@ -44,7 +44,7 @@ type ProvisionerDaemonsStore interface {
4444
GetProvisionerDaemons(ctx context.Context) ([]database.ProvisionerDaemon, error)
4545
}
4646

47-
func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDaemonsReportOptions) {
47+
func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDaemonsReportDeps) {
4848
r.ProvisionerDaemons = make([]codersdk.ProvisionerDaemon, 0)
4949
r.Severity = health.SeverityOK
5050
r.Warnings = make([]health.Message, 0)

‎coderd/healthcheck/provisioner_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,23 @@ func TestProvisionerDaemonReport(t *testing.T) {
121121
t.Parallel()
122122

123123
var rpt healthcheck.ProvisionerDaemonsReport
124-
var opts healthcheck.ProvisionerDaemonsReportOptions
125-
opts.CurrentVersion = tt.currentVersion
126-
opts.CurrentAPIMajorVersion = tt.currentAPIMajorVersion
124+
var deps healthcheck.ProvisionerDaemonsReportDeps
125+
deps.CurrentVersion = tt.currentVersion
126+
deps.CurrentAPIMajorVersion = tt.currentAPIMajorVersion
127127
if tt.currentAPIMajorVersion == 0 {
128-
opts.CurrentAPIMajorVersion = provisionersdk.CurrentMajor
128+
deps.CurrentAPIMajorVersion = provisionersdk.CurrentMajor
129129
}
130130
now := dbtime.Now()
131-
opts.TimeNowFn = func() time.Time {
131+
deps.TimeNowFn = func() time.Time {
132132
return now
133133
}
134134

135135
ctrl := gomock.NewController(t)
136136
mDB := dbmock.NewMockStore(ctrl)
137137
mDB.EXPECT().GetProvisionerDaemons(gomock.Any()).AnyTimes().Return(tt.provisionerDaemons, tt.provisionerDaemonsErr)
138-
opts.Store = mDB
138+
deps.Store = mDB
139139

140-
rpt.Run(context.Background(), &opts)
140+
rpt.Run(context.Background(), &deps)
141141

142142
assert.Equal(t, tt.expectedSeverity, rpt.Severity)
143143
if tt.expectedWarningCode != "" && assert.NotEmpty(t, rpt.Warnings) {

0 commit comments

Comments
 (0)