Skip to content

Commit 936cbe7

Browse files
kylecarbskylecarbs
committed
Fix linting errors
1 parent 9c6ffe4 commit 936cbe7

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎coderd/database/pubsub/pubsub_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ func TestPubsub_ordering(t *testing.T) {
171171
db, err := sql.Open("postgres", connectionURL)
172172
require.NoError(t, err)
173173
defer db.Close()
174-
pubsub, err := pubsub.New(ctx, db, connectionURL)
174+
ps, err := pubsub.New(ctx, db, connectionURL)
175175
require.NoError(t, err)
176-
defer pubsub.Close()
176+
defer ps.Close()
177177
event := "test"
178178
messageChannel := make(chan []byte, 100)
179-
cancelSub, err := pubsub.Subscribe(event, func(ctx context.Context, message []byte) {
179+
cancelSub, err := ps.Subscribe(event, func(ctx context.Context, message []byte) {
180180
// sleep a random amount of time to simulate handlers taking different amount of time
181181
// to process, depending on the message
182182
// nolint: gosec
@@ -187,7 +187,7 @@ func TestPubsub_ordering(t *testing.T) {
187187
require.NoError(t, err)
188188
defer cancelSub()
189189
for i := 0; i < 100; i++ {
190-
err = pubsub.Publish(event, []byte(fmt.Sprintf("%d", i)))
190+
err = ps.Publish(event, []byte(fmt.Sprintf("%d", i)))
191191
assert.NoError(t, err)
192192
}
193193
for i := 0; i < 100; i++ {

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ func TestAcquireJob(t *testing.T) {
5252
t.Run("Debounce", func(t *testing.T) {
5353
t.Parallel()
5454
db := dbfake.New()
55-
pubsub := pubsub.NewInMemory()
55+
ps := pubsub.NewInMemory()
5656
srv := &provisionerdserver.Server{
5757
ID: uuid.New(),
5858
Logger: slogtest.Make(t, nil),
5959
AccessURL: &url.URL{},
6060
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho},
6161
Database: db,
62-
Pubsub: pubsub,
62+
Pubsub: ps,
6363
Telemetry: telemetry.NewNoop(),
6464
AcquireJobDebounce: time.Hour,
6565
Auditor: mockAuditor(),
@@ -1257,7 +1257,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
12571257
func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
12581258
t.Helper()
12591259
db := dbfake.New()
1260-
pubsub := pubsub.NewInMemory()
1260+
ps := pubsub.NewInMemory()
12611261

12621262
return &provisionerdserver.Server{
12631263
ID: uuid.New(),
@@ -1266,7 +1266,7 @@ func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
12661266
AccessURL: &url.URL{},
12671267
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho},
12681268
Database: db,
1269-
Pubsub: pubsub,
1269+
Pubsub: ps,
12701270
Telemetry: telemetry.NewNoop(),
12711271
Auditor: mockAuditor(),
12721272
TemplateScheduleStore: testTemplateScheduleStore(),

‎coderd/provisionerjobs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,14 @@ type logFollower struct {
282282
}
283283

284284
func newLogFollower(
285-
ctx context.Context, logger slog.Logger, db database.Store, pubsub pubsub.Pubsub,
285+
ctx context.Context, logger slog.Logger, db database.Store, ps pubsub.Pubsub,
286286
rw http.ResponseWriter, r *http.Request, job database.ProvisionerJob, after int64,
287287
) *logFollower {
288288
return &logFollower{
289289
ctx: ctx,
290290
logger: logger,
291291
db: db,
292-
pubsub: pubsub,
292+
pubsub: ps,
293293
r: r,
294294
rw: rw,
295295
jobID: job.ID,

‎coderd/provisionerjobs_internal_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func Test_logFollower_completeBeforeFollow(t *testing.T) {
139139
logger := slogtest.Make(t, nil)
140140
ctrl := gomock.NewController(t)
141141
mDB := dbmock.NewMockStore(ctrl)
142-
pubsub := pubsub.NewInMemory()
142+
ps := pubsub.NewInMemory()
143143
now := database.Now()
144144
job := database.ProvisionerJob{
145145
ID: uuid.New(),
@@ -158,7 +158,7 @@ func Test_logFollower_completeBeforeFollow(t *testing.T) {
158158

159159
// we need an HTTP server to get a websocket
160160
srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
161-
uut := newLogFollower(ctx, logger, mDB, pubsub, rw, r, job, 10)
161+
uut := newLogFollower(ctx, logger, mDB, ps, rw, r, job, 10)
162162
uut.follow()
163163
}))
164164
defer srv.Close()
@@ -201,7 +201,7 @@ func Test_logFollower_completeBeforeSubscribe(t *testing.T) {
201201
logger := slogtest.Make(t, nil)
202202
ctrl := gomock.NewController(t)
203203
mDB := dbmock.NewMockStore(ctrl)
204-
pubsub := pubsub.NewInMemory()
204+
ps := pubsub.NewInMemory()
205205
now := database.Now()
206206
job := database.ProvisionerJob{
207207
ID: uuid.New(),
@@ -218,7 +218,7 @@ func Test_logFollower_completeBeforeSubscribe(t *testing.T) {
218218

219219
// we need an HTTP server to get a websocket
220220
srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
221-
uut := newLogFollower(ctx, logger, mDB, pubsub, rw, r, job, 0)
221+
uut := newLogFollower(ctx, logger, mDB, ps, rw, r, job, 0)
222222
uut.follow()
223223
}))
224224
defer srv.Close()
@@ -277,7 +277,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
277277
logger := slogtest.Make(t, nil)
278278
ctrl := gomock.NewController(t)
279279
mDB := dbmock.NewMockStore(ctrl)
280-
pubsub := pubsub.NewInMemory()
280+
ps := pubsub.NewInMemory()
281281
now := database.Now()
282282
job := database.ProvisionerJob{
283283
ID: uuid.New(),
@@ -294,7 +294,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
294294

295295
// we need an HTTP server to get a websocket
296296
srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
297-
uut := newLogFollower(ctx, logger, mDB, pubsub, rw, r, job, 0)
297+
uut := newLogFollower(ctx, logger, mDB, ps, rw, r, job, 0)
298298
uut.follow()
299299
}))
300300
defer srv.Close()
@@ -343,7 +343,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
343343
}
344344
msg, err = json.Marshal(&n)
345345
require.NoError(t, err)
346-
err = pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
346+
err = ps.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
347347
require.NoError(t, err)
348348

349349
mt, msg, err = client.Read(ctx)
@@ -361,7 +361,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
361361
n.CreatedAfter = 0
362362
msg, err = json.Marshal(&n)
363363
require.NoError(t, err)
364-
err = pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
364+
err = ps.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
365365
require.NoError(t, err)
366366

367367
// server should now close

‎enterprise/tailnet/coordinator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// NewCoordinator creates a new high availability coordinator
2424
// that uses PostgreSQL pubsub to exchange handshakes.
25-
func NewCoordinator(logger slog.Logger, pubsub pubsub.Pubsub) (agpl.Coordinator, error) {
25+
func NewCoordinator(logger slog.Logger, ps pubsub.Pubsub) (agpl.Coordinator, error) {
2626
ctx, cancelFunc := context.WithCancel(context.Background())
2727

2828
nameCache, err := lru.New[uuid.UUID, string](512)
@@ -33,7 +33,7 @@ func NewCoordinator(logger slog.Logger, pubsub pubsub.Pubsub) (agpl.Coordinator,
3333
coord := &haCoordinator{
3434
id: uuid.New(),
3535
log: logger,
36-
pubsub: pubsub,
36+
pubsub: ps,
3737
closeFunc: cancelFunc,
3838
close: make(chan struct{}),
3939
nodes: map[uuid.UUID]*agpl.Node{},

0 commit comments

Comments
 (0)