Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5cc1e73

Browse files
committed
chore: remove notifications experiment
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent2a3a00c commit5cc1e73

File tree

8 files changed

+41
-58
lines changed

8 files changed

+41
-58
lines changed

‎cli/notifications_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func createOpts(t *testing.T) *coderdtest.Options {
2020
t.Helper()
2121

2222
dt:=coderdtest.DeploymentValues(t)
23-
dt.Experiments= []string{string(codersdk.ExperimentNotifications)}
2423
return&coderdtest.Options{
2524
DeploymentValues:dt,
2625
}

‎cli/server.go

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@ import (
5656

5757
"cdr.dev/slog"
5858
"cdr.dev/slog/sloggers/sloghuman"
59-
"github.com/coder/coder/v2/coderd/entitlements"
60-
"github.com/coder/coder/v2/coderd/notifications/reports"
61-
"github.com/coder/coder/v2/coderd/runtimeconfig"
6259
"github.com/coder/pretty"
6360
"github.com/coder/quartz"
6461
"github.com/coder/retry"
6562
"github.com/coder/serpent"
6663
"github.com/coder/wgtunnel/tunnelsdk"
6764

65+
"github.com/coder/coder/v2/coderd/entitlements"
66+
"github.com/coder/coder/v2/coderd/notifications/reports"
67+
"github.com/coder/coder/v2/coderd/runtimeconfig"
68+
6869
"github.com/coder/coder/v2/buildinfo"
6970
"github.com/coder/coder/v2/cli/clilog"
7071
"github.com/coder/coder/v2/cli/cliui"
@@ -679,10 +680,6 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
679680
options.OIDCConfig=oc
680681
}
681682

682-
experiments:=coderd.ReadExperiments(
683-
options.Logger,options.DeploymentValues.Experiments.Value(),
684-
)
685-
686683
// We'll read from this channel in the select below that tracks shutdown. If it remains
687684
// nil, that case of the select will just never fire, but it's important not to have a
688685
// "bare" read on this channel.
@@ -1003,36 +1000,31 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
10031000
defertracker.Close()
10041001

10051002
// Manage notifications.
1006-
var (
1007-
notificationsManager*notifications.Manager
1008-
)
1009-
ifexperiments.Enabled(codersdk.ExperimentNotifications) {
1010-
cfg:=options.DeploymentValues.Notifications
1011-
metrics:=notifications.NewMetrics(options.PrometheusRegistry)
1012-
helpers:=templateHelpers(options)
1003+
cfg:=options.DeploymentValues.Notifications
1004+
metrics:=notifications.NewMetrics(options.PrometheusRegistry)
1005+
helpers:=templateHelpers(options)
10131006

1014-
// The enqueuer is responsible for enqueueing notifications to the given store.
1015-
enqueuer,err:=notifications.NewStoreEnqueuer(cfg,options.Database,helpers,logger.Named("notifications.enqueuer"),quartz.NewReal())
1016-
iferr!=nil {
1017-
returnxerrors.Errorf("failed to instantiate notification store enqueuer: %w",err)
1018-
}
1019-
options.NotificationsEnqueuer=enqueuer
1007+
// The enqueuer is responsible for enqueueing notifications to the given store.
1008+
enqueuer,err:=notifications.NewStoreEnqueuer(cfg,options.Database,helpers,logger.Named("notifications.enqueuer"),quartz.NewReal())
1009+
iferr!=nil {
1010+
returnxerrors.Errorf("failed to instantiate notification store enqueuer: %w",err)
1011+
}
1012+
options.NotificationsEnqueuer=enqueuer
10201013

1021-
// The notification manager is responsible for:
1022-
// - creating notifiers and managing their lifecycles (notifiers are responsible for dequeueing/sending notifications)
1023-
// - keeping the store updated with status updates
1024-
notificationsManager,err=notifications.NewManager(cfg,options.Database,helpers,metrics,logger.Named("notifications.manager"))
1025-
iferr!=nil {
1026-
returnxerrors.Errorf("failed to instantiate notification manager: %w",err)
1027-
}
1014+
// The notification manager is responsible for:
1015+
// - creating notifiers and managing their lifecycles (notifiers are responsible for dequeueing/sending notifications)
1016+
// - keeping the store updated with status updates
1017+
notificationsManager,err:=notifications.NewManager(cfg,options.Database,helpers,metrics,logger.Named("notifications.manager"))
1018+
iferr!=nil {
1019+
returnxerrors.Errorf("failed to instantiate notification manager: %w",err)
1020+
}
10281021

1029-
// nolint:gocritic // TODO: create own role.
1030-
notificationsManager.Run(dbauthz.AsSystemRestricted(ctx))
1022+
// nolint:gocritic // TODO: create own role.
1023+
notificationsManager.Run(dbauthz.AsSystemRestricted(ctx))
10311024

1032-
// Run report generator to distribute periodic reports.
1033-
notificationReportGenerator:=reports.NewReportGenerator(ctx,logger.Named("notifications.report_generator"),options.Database,options.NotificationsEnqueuer,quartz.NewReal())
1034-
defernotificationReportGenerator.Close()
1035-
}
1025+
// Run report generator to distribute periodic reports.
1026+
notificationReportGenerator:=reports.NewReportGenerator(ctx,logger.Named("notifications.report_generator"),options.Database,options.NotificationsEnqueuer,quartz.NewReal())
1027+
defernotificationReportGenerator.Close()
10361028

10371029
// Wrap the server in middleware that redirects to the access URL if
10381030
// the request is not to a local IP.
@@ -1153,19 +1145,17 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
11531145
// Cancel any remaining in-flight requests.
11541146
shutdownConns()
11551147

1156-
ifnotificationsManager!=nil {
1157-
// Stop the notification manager, which will cause any buffered updates to the store to be flushed.
1158-
// If the Stop() call times out, messages that were sent but not reflected as such in the store will have
1159-
// their leases expire after a period of time and will be re-queued for sending.
1160-
// See CODER_NOTIFICATIONS_LEASE_PERIOD.
1161-
cliui.Info(inv.Stdout,"Shutting down notifications manager..."+"\n")
1162-
err=shutdownWithTimeout(notificationsManager.Stop,5*time.Second)
1163-
iferr!=nil {
1164-
cliui.Warnf(inv.Stderr,"Notifications manager shutdown took longer than 5s, "+
1165-
"this may result in duplicate notifications being sent: %s\n",err)
1166-
}else {
1167-
cliui.Info(inv.Stdout,"Gracefully shut down notifications manager\n")
1168-
}
1148+
// Stop the notification manager, which will cause any buffered updates to the store to be flushed.
1149+
// If the Stop() call times out, messages that were sent but not reflected as such in the store will have
1150+
// their leases expire after a period of time and will be re-queued for sending.
1151+
// See CODER_NOTIFICATIONS_LEASE_PERIOD.
1152+
cliui.Info(inv.Stdout,"Shutting down notifications manager..."+"\n")
1153+
err=shutdownWithTimeout(notificationsManager.Stop,5*time.Second)
1154+
iferr!=nil {
1155+
cliui.Warnf(inv.Stderr,"Notifications manager shutdown took longer than 5s, "+
1156+
"this may result in duplicate notifications being sent: %s\n",err)
1157+
}else {
1158+
cliui.Info(inv.Stdout,"Gracefully shut down notifications manager\n")
11691159
}
11701160

11711161
// Shut down provisioners before waiting for WebSockets

‎coderd/coderd.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ import (
3737
"tailscale.com/util/singleflight"
3838

3939
"cdr.dev/slog"
40+
"github.com/coder/quartz"
41+
"github.com/coder/serpent"
42+
4043
"github.com/coder/coder/v2/coderd/entitlements"
4144
"github.com/coder/coder/v2/coderd/idpsync"
4245
"github.com/coder/coder/v2/coderd/runtimeconfig"
43-
"github.com/coder/quartz"
44-
"github.com/coder/serpent"
4546

4647
agentproto"github.com/coder/coder/v2/agent/proto"
4748
"github.com/coder/coder/v2/buildinfo"
@@ -1257,10 +1258,7 @@ func New(options *Options) *API {
12571258
})
12581259
})
12591260
r.Route("/notifications",func(r chi.Router) {
1260-
r.Use(
1261-
apiKeyMiddleware,
1262-
httpmw.RequireExperiment(api.Experiments,codersdk.ExperimentNotifications),
1263-
)
1261+
r.Use(apiKeyMiddleware)
12641262
r.Get("/settings",api.notificationsSettings)
12651263
r.Put("/settings",api.putNotificationsSettings)
12661264
r.Route("/templates",func(r chi.Router) {

‎coderd/notifications/notifications_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,6 @@ func createOpts(t *testing.T) *coderdtest.Options {
11871187
t.Helper()
11881188

11891189
dt:=coderdtest.DeploymentValues(t)
1190-
dt.Experiments= []string{string(codersdk.ExperimentNotifications)}
11911190
return&coderdtest.Options{
11921191
DeploymentValues:dt,
11931192
}

‎coderd/notifications_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func createOpts(t *testing.T) *coderdtest.Options {
2020
t.Helper()
2121

2222
dt:=coderdtest.DeploymentValues(t)
23-
dt.Experiments= []string{string(codersdk.ExperimentNotifications)}
2423
return&coderdtest.Options{
2524
DeploymentValues:dt,
2625
}

‎codersdk/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2901,7 +2901,7 @@ const (
29012901
// users to opt-in to via --experimental='*'.
29022902
// Experiments that are not ready for consumption by all users should
29032903
// not be included here and will be essentially hidden.
2904-
varExperimentsAll=Experiments{ExperimentNotifications}
2904+
varExperimentsAll=Experiments{}
29052905

29062906
// Experiments is a list of experiments.
29072907
// Multiple experiments may be enabled at the same time.

‎enterprise/coderd/coderd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
448448
// with the below route, we need to register this route without any mounts or groups to make both work.
449449
r.With(
450450
apiKeyMiddleware,
451-
httpmw.RequireExperiment(api.AGPL.Experiments,codersdk.ExperimentNotifications),
452451
httpmw.ExtractNotificationTemplateParam(options.Database),
453452
).Put("/notifications/templates/{notification_template}/method",api.updateNotificationTemplateMethod)
454453
})

‎enterprise/coderd/notifications_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func createOpts(t *testing.T) *coderdenttest.Options {
2323
t.Helper()
2424

2525
dt:=coderdtest.DeploymentValues(t)
26-
dt.Experiments= []string{string(codersdk.ExperimentNotifications)}
2726
return&coderdenttest.Options{
2827
Options:&coderdtest.Options{
2928
DeploymentValues:dt,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp