coder
diff --git a/‎coderd/database/dbmock/dbmock.go
Lines changed: 3 additions & 2 deletions b/‎coderd/database/dbmock/dbmock.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎coderd/database/models.go
Lines changed: 21 additions & 21 deletions b/‎coderd/database/models.go
Lines changed: 21 additions & 21 deletions
diff --git a/‎coderd/database/pubsub/pubsub_test.go
Lines changed: 4 additions & 4 deletions b/‎coderd/database/pubsub/pubsub_test.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎coderd/provisionerdserver/provisionerdserver_test.go
Lines changed: 4 additions & 4 deletions b/‎coderd/provisionerdserver/provisionerdserver_test.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎coderd/provisionerjobs.go
Lines changed: 2 additions & 2 deletions b/‎coderd/provisionerjobs.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎coderd/provisionerjobs_internal_test.go
Lines changed: 4 additions & 4 deletions b/‎coderd/provisionerjobs_internal_test.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎enterprise/tailnet/coordinator.go
Lines changed: 2 additions & 2 deletions b/‎enterprise/tailnet/coordinator.go
Lines changed: 2 additions & 2 deletions
@@ -171,12 +171,12 @@ func TestPubsub_ordering(t *testing.T) {
 	db, err := sql.Open("postgres", connectionURL)
 	require.NoError(t, err)
 	defer db.Close()
-	pubsub, err := pubsub.New(ctx, db, connectionURL)
+	ps, err := pubsub.New(ctx, db, connectionURL)
 	require.NoError(t, err)
-	defer pubsub.Close()
+	defer ps.Close()
 	event := "test"
 	messageChannel := make(chan []byte, 100)
-	cancelSub, err := pubsub.Subscribe(event, func(ctx context.Context, message []byte) {
+	cancelSub, err := ps.Subscribe(event, func(ctx context.Context, message []byte) {
 		// sleep a random amount of time to simulate handlers taking different amount of time
 		// to process, depending on the message
 		// nolint: gosec
@@ -187,7 +187,7 @@ func TestPubsub_ordering(t *testing.T) {
 	require.NoError(t, err)
 	defer cancelSub()
 	for i := 0; i < 100; i++ {
-		err = pubsub.Publish(event, []byte(fmt.Sprintf("%d", i)))
+		err = ps.Publish(event, []byte(fmt.Sprintf("%d", i)))
 		assert.NoError(t, err)
 	}
 	for i := 0; i < 100; i++ {
 
@@ -52,14 +52,14 @@ func TestAcquireJob(t *testing.T) {
 	t.Run("Debounce", func(t *testing.T) {
 		t.Parallel()
 		db := dbfake.New()
-		pubsub := pubsub.NewInMemory()
+		ps := pubsub.NewInMemory()
 		srv := &provisionerdserver.Server{
 			ID:                    uuid.New(),
 			Logger:                slogtest.Make(t, nil),
 			AccessURL:             &url.URL{},
 			Provisioners:          []database.ProvisionerType{database.ProvisionerTypeEcho},
 			Database:              db,
-			Pubsub:                pubsub,
+			Pubsub:                ps,
 			Telemetry:             telemetry.NewNoop(),
 			AcquireJobDebounce:    time.Hour,
 			Auditor:               mockAuditor(),
@@ -1257,7 +1257,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
 func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
 	t.Helper()
 	db := dbfake.New()
-	pubsub := pubsub.NewInMemory()
+	ps := pubsub.NewInMemory()
 
 	return &provisionerdserver.Server{
 		ID:                    uuid.New(),
@@ -1266,7 +1266,7 @@ func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
 		AccessURL:             &url.URL{},
 		Provisioners:          []database.ProvisionerType{database.ProvisionerTypeEcho},
 		Database:              db,
-		Pubsub:                pubsub,
+		Pubsub:                ps,
 		Telemetry:             telemetry.NewNoop(),
 		Auditor:               mockAuditor(),
 		TemplateScheduleStore: testTemplateScheduleStore(),
 
@@ -282,14 +282,14 @@ type logFollower struct {
 }
 
 func newLogFollower(
-	ctx context.Context, logger slog.Logger, db database.Store, pubsub pubsub.Pubsub,
+	ctx context.Context, logger slog.Logger, db database.Store, ps pubsub.Pubsub,
 	rw http.ResponseWriter, r *http.Request, job database.ProvisionerJob, after int64,
 ) *logFollower {
 	return &logFollower{
 		ctx:           ctx,
 		logger:        logger,
 		db:            db,
-		pubsub:        pubsub,
+		pubsub:        ps,
 		r:             r,
 		rw:            rw,
 		jobID:         job.ID,
 
@@ -277,7 +277,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
 	logger := slogtest.Make(t, nil)
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)
-	pubsub := pubsub.NewInMemory()
+	ps := pubsub.NewInMemory()
 	now := database.Now()
 	job := database.ProvisionerJob{
 		ID:        uuid.New(),
@@ -294,7 +294,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
 
 	// we need an HTTP server to get a websocket
 	srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		uut := newLogFollower(ctx, logger, mDB, pubsub, rw, r, job, 0)
+		uut := newLogFollower(ctx, logger, mDB, ps, rw, r, job, 0)
 		uut.follow()
 	}))
 	defer srv.Close()
@@ -343,7 +343,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
 	}
 	msg, err = json.Marshal(&n)
 	require.NoError(t, err)
-	err = pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
+	err = ps.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
 	require.NoError(t, err)
 
 	mt, msg, err = client.Read(ctx)
@@ -361,7 +361,7 @@ func Test_logFollower_EndOfLogs(t *testing.T) {
 	n.CreatedAfter = 0
 	msg, err = json.Marshal(&n)
 	require.NoError(t, err)
-	err = pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), msg)
+	err = ps.Publish(provisionersdk.ProvisionerJobLog
C894
sNotifyChannel(job.ID), msg)
 	require.NoError(t, err)
 
 	// server should now close
 
@@ -22,7 +22,7 @@ import (
 
 // NewCoordinator creates a new high availability coordinator
 // that uses PostgreSQL pubsub to exchange handshakes.
-func NewCoordinator(logger slog.Logger, pubsub pubsub.Pubsub) (agpl.Coordinator, error) {
+func NewCoordinator(logger slog.Logger, ps pubsub.Pubsub) (agpl.Coordinator, error) {
 	ctx, cancelFunc := context.WithCancel(context.Background())
 
 	nameCache, err := lru.New[uuid.UUID, string](512)
@@ -33,7 +33,7 @@ func NewCoordinator(logger slog.Logger, pubsub pubsub.Pubsub) (agpl.Coordinator,
 	coord := &haCoordinator{
 		id:                       uuid.New(),
 		log:                      logger,
-		pubsub:                   pubsub,
+		pubsub:                   ps,
 		closeFunc:                cancelFunc,
 		close:                    make(chan struct{}),
 		nodes:                    map[uuid.UUID]*agpl.Node{},