Skip to content

Commit b2f9180

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Fix mismatch usage
1 parent 64cf76b commit b2f9180

File tree

7 files changed

+27
-21
lines changed

7 files changed

+27
-21
lines changed

‎coderd/autobuild/lifecycle_executor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type Stats struct {
4848
}
4949

5050
// New returns a new wsactions executor.
51-
func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *atomic.Pointer[schedule.TemplateScheduleStore], auditor *atomic.Pointer[audit.Auditor], acs *atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, ntf notifications.Enqueuer) *Executor {
51+
func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *atomic.Pointer[schedule.TemplateScheduleStore], auditor *atomic.Pointer[audit.Auditor], acs *atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, enqueuer notifications.Enqueuer) *Executor {
5252
le := &Executor{
5353
//nolint:gocritic // Autostart has a limited set of permissions.
5454
ctx: dbauthz.AsAutostart(ctx),
@@ -59,7 +59,7 @@ func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *
5959
log: log.Named("autobuild"),
6060
auditor: auditor,
6161
accessControlStore: acs,
62-
notificationsEnqueuer: ntf,
62+
notificationsEnqueuer: enqueuer,
6363
}
6464
return le
6565
}

‎coderd/schedule/mock.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ import (
55

66
"github.com/google/uuid"
77

8+
"cdr.dev/slog"
9+
810
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/coderd/notifications"
912
)
1013

1114
type MockTemplateScheduleStore struct {
1215
GetFn func(ctx context.Context, db database.Store, templateID uuid.UUID) (TemplateScheduleOptions, error)
13-
SetFn func(ctx context.Context, db database.Store, template database.Template, options TemplateScheduleOptions) (database.Template, error)
16+
SetFn func(ctx context.Context, db database.Store, template database.Template, options TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error)
1417
}
1518

1619
var _ TemplateScheduleStore = MockTemplateScheduleStore{}
@@ -23,12 +26,12 @@ func (m MockTemplateScheduleStore) Get(ctx context.Context, db database.Store, t
2326
return NewAGPLTemplateScheduleStore().Get(ctx, db, templateID)
2427
}
2528

26-
func (m MockTemplateScheduleStore) Set(ctx context.Context, db database.Store, template database.Template, options TemplateScheduleOptions) (database.Template, error) {
29+
func (m MockTemplateScheduleStore) Set(ctx context.Context, db database.Store, template database.Template, options TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
2730
if m.SetFn != nil {
28-
return m.SetFn(ctx, db, template, options)
31+
return m.SetFn(ctx, db, template, options, enqueuer, logger)
2932
}
3033

31-
return NewAGPLTemplateScheduleStore().Set(ctx, db, template, options)
34+
return NewAGPLTemplateScheduleStore().Set(ctx, db, template, options, enqueuer, logger)
3235
}
3336

3437
type MockUserQuietHoursScheduleStore struct {

‎coderd/schedule/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ type TemplateScheduleOptions struct {
155155
// scheduling options set by the template/site admin.
156156
type TemplateScheduleStore interface {
157157
Get(ctx context.Context, db database.Store, templateID uuid.UUID) (TemplateScheduleOptions, error)
158-
Set(ctx context.Context, db database.Store, template database.Template, opts TemplateScheduleOptions, ntf notifications.Enqueuer, log slog.Logger) (database.Template, error)
158+
Set(ctx context.Context, db database.Store, template database.Template, opts TemplateScheduleOptions, enqueuer notifications.Enqueuer, log slog.Logger) (database.Template, error)
159159
}
160160

161161
type agplTemplateScheduleStore struct{}
@@ -200,7 +200,7 @@ func (*agplTemplateScheduleStore) Get(ctx context.Context, db database.Store, te
200200
}, nil
201201
}
202202

203-
func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tpl database.Template, opts TemplateScheduleOptions, ntf notifications.Enqueuer, log slog.Logger) (database.Template, error) {
203+
func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tpl database.Template, opts TemplateScheduleOptions, enqueuer notifications.Enqueuer, log slog.Logger) (database.Template, error) {
204204
ctx, span := tracing.StartSpan(ctx)
205205
defer span.End()
206206

‎coderd/templates.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
383383
FailureTTL: failureTTL,
384384
TimeTilDormant: dormantTTL,
385385
TimeTilDormantAutoDelete: dormantAutoDeletionTTL,
386-
})
386+
}, api.NotificationsEnqueuer, api.Logger)
387387
if err != nil {
388388
return xerrors.Errorf("set template schedule options: %s", err)
389389
}
@@ -776,7 +776,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
776776
TimeTilDormantAutoDelete: timeTilDormantAutoDelete,
777777
UpdateWorkspaceLastUsedAt: updateWorkspaceLastUsedAt,
778778
UpdateWorkspaceDormantAt: req.UpdateWorkspaceDormantAt,
779-
})
779+
}, api.NotificationsEnqueuer, api.Logger)
780780
if err != nil {
781781
return xerrors.Errorf("set template schedule options: %w", err)
782782
}

‎coderd/templates_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ import (
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313

14+
"cdr.dev/slog"
1415
"cdr.dev/slog/sloggers/slogtest"
1516
"github.com/coder/coder/v2/agent/agenttest"
1617
"github.com/coder/coder/v2/coderd/audit"
1718
"github.com/coder/coder/v2/coderd/coderdtest"
1819
"github.com/coder/coder/v2/coderd/database"
1920
"github.com/coder/coder/v2/coderd/database/dbauthz"
2021
"github.com/coder/coder/v2/coderd/database/dbtime"
22+
"github.com/coder/coder/v2/coderd/notifications"
2123
"github.com/coder/coder/v2/coderd/rbac"
2224
"github.com/coder/coder/v2/coderd/schedule"
2325
"github.com/coder/coder/v2/coderd/util/ptr"
@@ -190,7 +192,7 @@ func TestPostTemplateByOrganization(t *testing.T) {
190192
var setCalled int64
191193
client := coderdtest.New(t, &coderdtest.Options{
192194
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
193-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
195+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
194196
atomic.AddInt64(&setCalled, 1)
195197
require.False(t, options.UserAutostartEnabled)
196198
require.False(t, options.UserAutostopEnabled)
@@ -267,7 +269,7 @@ func TestPostTemplateByOrganization(t *testing.T) {
267269
var setCalled int64
268270
client := coderdtest.New(t, &coderdtest.Options{
269271
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
270-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
272+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
271273
atomic.AddInt64(&setCalled, 1)
272274
assert.Zero(t, options.AutostopRequirement.DaysOfWeek)
273275
assert.Zero(t, options.AutostopRequirement.Weeks)
@@ -317,7 +319,7 @@ func TestPostTemplateByOrganization(t *testing.T) {
317319
var setCalled int64
318320
client := coderdtest.New(t, &coderdtest.Options{
319321
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
320-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
322+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
321323
atomic.AddInt64(&setCalled, 1)
322324
assert.EqualValues(t, 0b00110000, options.AutostopRequirement.DaysOfWeek)
323325
assert.EqualValues(t, 2, options.AutostopRequirement.Weeks)
@@ -755,7 +757,7 @@ func TestPatchTemplateMeta(t *testing.T) {
755757
var setCalled int64
756758
client := coderdtest.New(t, &coderdtest.Options{
757759
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
758-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
760+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
759761
if atomic.AddInt64(&setCalled, 1) == 2 {
760762
require.Equal(t, failureTTL, options.FailureTTL)
761763
require.Equal(t, inactivityTTL, options.TimeTilDormant)
@@ -850,7 +852,7 @@ func TestPatchTemplateMeta(t *testing.T) {
850852
allowAutostop.Store(true)
851853
client := coderdtest.New(t, &coderdtest.Options{
852854
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
853-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
855+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
854856
atomic.AddInt64(&setCalled, 1)
855857
assert.Equal(t, allowAutostart.Load(), options.UserAutostartEnabled)
856858
assert.Equal(t, allowAutostop.Load(), options.UserAutostopEnabled)
@@ -1020,7 +1022,7 @@ func TestPatchTemplateMeta(t *testing.T) {
10201022
var setCalled int64
10211023
client := coderdtest.New(t, &coderdtest.Options{
10221024
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
1023-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
1025+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
10241026
if atomic.AddInt64(&setCalled, 1) == 2 {
10251027
assert.EqualValues(t, 0b0110000, options.AutostopRequirement.DaysOfWeek)
10261028
assert.EqualValues(t, 2, options.AutostopRequirement.Weeks)
@@ -1091,7 +1093,7 @@ func TestPatchTemplateMeta(t *testing.T) {
10911093
var setCalled int64
10921094
client := coderdtest.New(t, &coderdtest.Options{
10931095
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
1094-
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
1096+
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
10951097
if atomic.AddInt64(&setCalled, 1) == 2 {
10961098
assert.EqualValues(t, 0, options.AutostopRequirement.DaysOfWeek)
10971099
assert.EqualValues(t, 1, options.AutostopRequirement.Weeks)

‎enterprise/coderd/schedule/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (*EnterpriseTemplateScheduleStore) Get(ctx context.Context, db database.Sto
9797
}
9898

9999
// Set implements agpl.TemplateScheduleStore.
100-
func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.Store, tpl database.Template, opts agpl.TemplateScheduleOptions, ntf notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
100+
func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.Store, tpl database.Template, opts agpl.TemplateScheduleOptions, enqueuer notifications.Enqueuer, logger slog.Logger) (database.Template, error) {
101101
ctx, span := tracing.StartSpan(ctx)
102102
defer span.End()
103103

@@ -207,7 +207,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
207207
dormancy.NotifyWorkspaceDormant(
208208
ctx,
209209
logger,
210-
ntf,
210+
enqueuer,
211211
dormancy.WorkspaceDormantNotification{
212212
Workspace: workspace,
213213
Initiator: "system",

‎enterprise/coderd/schedule/template_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import (
88
"testing"
99
"time"
1010

11-
"cdr.dev/slog"
12-
"cdr.dev/slog/sloggers/slogtest"
1311
"github.com/google/uuid"
1412
"github.com/stretchr/testify/assert"
1513
"github.com/stretchr/testify/require"
1614

15+
"cdr.dev/slog"
16+
"cdr.dev/slog/sloggers/slogtest"
17+
1718
"github.com/coder/coder/v2/coderd/database"
1819
"github.com/coder/coder/v2/coderd/database/dbgen"
1920
"github.com/coder/coder/v2/coderd/database/dbtestutil"

0 commit comments

Comments
 (0)