Remove deployment config for push notifications in favour of Experime…

…ntWebPush
coder · johnstcn · Mar 27, 2025 · Mar 17, 2025 · Mar 25, 2025 · Mar 25, 2025
commit 0535ed6c9ee7e950208e4c1508c9effa0e747994
diff --git a/cli/server.go b/cli/server.go
@@ -777,7 +777,8 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			}
 
 			// Manage push notifications.
-			if options.DeploymentValues.Notifications.Push.Enabled {
+			experiments := coderd.ReadExperiments(options.Logger, options.DeploymentValues.Experiments.Value())
+			if experiments.Enabled(codersdk.ExperimentWebPush) {
 				pushNotifier, err := push.New(ctx, &options.Logger, options.Database)
 				if err != nil {
 					options.Logger.Error(ctx, "failed to create push notifier", slog.Error(err))
@@ -789,7 +790,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				options.PushNotifier = pushNotifier
 			} else {
 				options.PushNotifier = &push.NoopNotifier{
-					Msg: "Push notifications are not configured.",
+					Msg: "Push notifications are disabled. Enable the 'web-push' experiment to use this feature.",
 				}
 			}
 

diff --git a/cli/server_regenerate_vapid_keypair.go b/cli/server_regenerate_vapid_keypair.go
@@ -24,8 +24,9 @@ func (r *RootCmd) newRegenerateVapidKeypairCommand() *serpent.Command {
 		regenVapidKeypairPgAuth string
 	)
 	regenerateVapidKeypairCommand := &serpent.Command{
-		Use:   "regenerate-vapid-keypair",
-		Short: "Regenerate the VAPID keypair used for push notifications.",
+		Use:    "regenerate-vapid-keypair",
+		Short:  "Regenerate the VAPID keypair used for push notifications.",
+		Hidden: true, // Hide this command as it's an experimental feature
 		Handler: func(inv *serpent.Invocation) error {
 			var (
 				ctx, cancel = inv.SignalNotifyContext(inv.Context(), StopSignals...)

diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -12,8 +12,6 @@ SUBCOMMANDS:
     postgres-builtin-serve      Run the built-in PostgreSQL deployment.
     postgres-builtin-url        Output the connection URL for the built-in
                                 PostgreSQL deployment.
-    regenerate-vapid-keypair    Regenerate the VAPID keypair used for push
-                                notifications.
 
 OPTIONS:
       --allow-workspace-renames bool, $CODER_ALLOW_WORKSPACE_RENAMES (default: false)
@@ -479,10 +477,6 @@ NOTIFICATIONS / INBOX OPTIONS:
       --notifications-inbox-enabled bool, $CODER_NOTIFICATIONS_INBOX_ENABLED (default: true)
           Enable Coder Inbox.
 
-NOTIFICATIONS / PUSH OPTIONS: 
-      --notifications-push-enabled bool, $CODER_NOTIFICATIONS_PUSH_ENABLED (default: false)
-          Enable push notifications using VAPID.
-
 NOTIFICATIONS / WEBHOOK OPTIONS: 
       --notifications-webhook-endpoint url, $CODER_NOTIFICATIONS_WEBHOOK_ENDPOINT
           The endpoint to which to send webhooks.

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -681,7 +681,3 @@ notifications:
   # How often to query the database for queued notifications.
   # (default: 15s, type: duration)
   fetchInterval: 15s
-  push:
-    # Enable push notifications using VAPID.
-    # (default: false, type: bool)
-    enabled: false
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -700,12 +700,6 @@ type NotificationsConfig struct {
 	Webhook NotificationsWebhookConfig `json:"webhook" typescript:",notnull"`
 	// Inbox settings.
 	Inbox NotificationsInboxConfig `json:"inbox" typescript:",notnull"`
-	// Push notification settings.
-	Push NotificationsPushConfig `json:"push" typescript:",notnull"`
-}
-
-type NotificationsPushConfig struct {
-	Enabled serpent.Bool `json:"enabled" typescript:",notnull"`
 }
 
 // Are either of the notification methods enabled?
@@ -1007,11 +1001,6 @@ func (c *DeploymentValues) Options() serpent.OptionSet {
 			Parent: &deploymentGroupNotifications,
 			YAML:   "inbox",
 		}
-		deploymentGroupNotificationsPush = serpent.Group{
-			Name:   "Push",
-			Parent: &deploymentGroupNotifications,
-			YAML:   "push",
-		}
 	)
 
 	httpAddress := serpent.Option{
@@ -2980,16 +2969,6 @@ Write out the current server config as YAML to stdout.`,
 			Hidden:      true, // Hidden because most operators should not need to modify this.
 		},
 		// Push notifications.
-		{
-			Name:        "Notifications: Push: Enabled",
-			Description: "Enable push notifications using VAPID.",
-			Flag:        "notifications-push-enabled",
-			Env:         "CODER_NOTIFICATIONS_PUSH_ENABLED",
-			Value:       &c.Notifications.Push.Enabled,
-			Default:     "false",
-			Group:       &deploymentGroupNotificationsPush,
-			YAML:        "enabled",
-		},
 	}
 
 	return opts
@@ -3214,6 +3193,7 @@ const (
 	ExperimentAutoFillParameters Experiment = "auto-fill-parameters" // This should not be taken out of experiments until we have redesigned the feature.
 	ExperimentNotifications      Experiment = "notifications"        // Sends notifications via SMTP and webhooks following certain events.
 	ExperimentWorkspaceUsage     Experiment = "workspace-usage"      // Enables the new workspace usage tracking.
+	ExperimentWebPush            Experiment = "web-push"             // Enables web push notifications through the browser.
 )
 
 // ExperimentsAll should include all experiments that are safe for

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1320,11 +1320,6 @@
 							"description": "Output the connection URL for the built-in PostgreSQL deployment.",
 							"path": "reference/cli/server_postgres-builtin-url.md"
 						},
-						{
-							"title": "server regenerate-vapid-keypair",
-							"description": "Regenerate the VAPID keypair used for push notifications.",
-							"path": "reference/cli/server_regenerate-vapid-keypair.md"
-						},
 						{
 							"title": "show",
 							"description": "Display details of a workspace's resources and agents",

diff --git a/docs/reference/api/general.md b/docs/reference/api/general.md
diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
diff --git a/docs/reference/cli/server.md b/docs/reference/cli/server.md
diff --git a/docs/reference/cli/server_regenerate-vapid-keypair.md b/docs/reference/cli/server_regenerate-vapid-keypair.md