Skip to content

Commit 8a8a3eb

Browse files
committed
fix nil auditors
1 parent b8ab479 commit 8a8a3eb

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

coderd/coderd.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
681681
Telemetry: api.Telemetry,
682682
Tags: tags,
683683
QuotaCommitter: &api.QuotaCommitter,
684+
Auditor: &api.Auditor,
684685
AcquireJobDebounce: debounce,
685686
Logger: api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
686687
})

coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ import (
55
"database/sql"
66
"encoding/json"
77
"net/url"
8+
"sync/atomic"
89
"testing"
910
"time"
1011

1112
"github.com/google/uuid"
1213
"github.com/stretchr/testify/require"
1314

1415
"cdr.dev/slog/sloggers/slogtest"
16+
"github.com/coder/coder/coderd/audit"
1517
"github.com/coder/coder/coderd/database"
1618
"github.com/coder/coder/coderd/database/databasefake"
1719
"github.com/coder/coder/coderd/provisionerdserver"
@@ -21,6 +23,13 @@ import (
2123
sdkproto "github.com/coder/coder/provisionersdk/proto"
2224
)
2325

26+
func mockAuditor() *atomic.Pointer[audit.Auditor] {
27+
ptr := &atomic.Pointer[audit.Auditor]{}
28+
mock := audit.Auditor(audit.NewMock())
29+
ptr.Store(&mock)
30+
return ptr
31+
}
32+
2433
func TestAcquireJob(t *testing.T) {
2534
t.Parallel()
2635
t.Run("Debounce", func(t *testing.T) {
@@ -36,6 +45,7 @@ func TestAcquireJob(t *testing.T) {
3645
Pubsub: pubsub,
3746
Telemetry: telemetry.NewNoop(),
3847
AcquireJobDebounce: time.Hour,
48+
Auditor: mockAuditor(),
3949
}
4050
job, err := srv.AcquireJob(context.Background(), nil)
4151
require.NoError(t, err)
@@ -799,5 +809,6 @@ func setup(t *testing.T) *provisionerdserver.Server {
799809
Database: db,
800810
Pubsub: pubsub,
801811
Telemetry: telemetry.NewNoop(),
812+
Auditor: mockAuditor(),
802813
}
803814
}

enterprise/coderd/provisionerdaemons.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
206206
Pubsub: api.Pubsub,
207207
Provisioners: daemon.Provisioners,
208208
Telemetry: api.Telemetry,
209+
Auditor: &api.AGPL.Auditor,
209210
Logger: api.Logger.Named(fmt.Sprintf("provisionerd-%s", daemon.Name)),
210211
Tags: rawTags,
211212
})

0 commit comments

Comments
 (0)