Aug 28, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024
diff --git a/cli/server.go b/cli/server.go
 "cdr.dev/slog"
 "cdr.dev/slog/sloggers/sloghuman"
 "github.com/coder/coder/v2/coderd/entitlements"
 "github.com/coder/coder/v2/coderd/runtimeconfig"
 "github.com/coder/pretty"
 "github.com/coder/quartz"
 "github.com/coder/retry"
 return err
 }

 // TODO: Throw a caching layer infront of the RuntimeConfig to prevent
 // excessive database queries.
 // Note: This happens before dbauthz, which is really unfortunate.
 // dbauthz is configured in `Coderd.New()`, but we need the manager
 // at this level for notifications. We might have to move some init
 // code around.
 options.RuntimeConfig = runtimeconfig.NewStoreManager(options.Database)

 // This should be output before the logs start streaming.
 cliui.Infof(inv.Stdout, "\n==> Logs will stream in below (press ctrl+c to gracefully exit):")

diff --git a/coderd/coderd.go b/coderd/coderd.go
 "cdr.dev/slog"
 "github.com/coder/coder/v2/coderd/entitlements"
 "github.com/coder/coder/v2/coderd/idpsync"
 "github.com/coder/coder/v2/coderd/runtimeconfig"
 "github.com/coder/quartz"
 "github.com/coder/serpent"

 Logger           slog.Logger
 Database         database.Store
 Pubsub           pubsub.Pubsub
 RuntimeConfig    runtimeconfig.Manager

 // CacheDir is used for caching files served by the API.
 CacheDir string
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 "github.com/coder/coder/v2/coderd/notifications"
 "github.com/coder/coder/v2/coderd/rbac"
 "github.com/coder/coder/v2/coderd/rbac/policy"
 "github.com/coder/coder/v2/coderd/runtimeconfig"
 "github.com/coder/coder/v2/coderd/schedule"
 "github.com/coder/coder/v2/coderd/telemetry"
 "github.com/coder/coder/v2/coderd/unhanger"
 var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
 accessControlStore.Store(&acs)

 // runtimeManager does not use dbauthz.
 // TODO: It probably should, but the init code for prod happens before dbauthz
 // is ready.
 runtimeManager := runtimeconfig.NewStoreManager(options.Database)
 options.Database = dbauthz.New(options.Database, options.Authorizer, *options.Logger, accessControlStore)

 // Some routes expect a deployment ID, so just make sure one exists.
 AppHostnameRegex:               appHostnameRegex,
 Logger:                         *options.Logger,
 CacheDir:                       t.TempDir(),
 RuntimeConfig:                  runtimeManager,
 Database:                       options.Database,
 Pubsub:                         options.Pubsub,
 ExternalAuthConfigs:            options.ExternalAuthConfigs,
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.DeleteReplicasUpdatedBefore(ctx, updatedAt)
 }

 func (q *querier) DeleteRuntimeConfig(ctx context.Context, key string) error {
 // TODO: auth
 return q.db.DeleteRuntimeConfig(ctx, key)
 }

 func (q *querier) DeleteTailnetAgent(ctx context.Context, arg database.DeleteTailnetAgentParams) (database.DeleteTailnetAgentRow, error) {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTailnetCoordinator); err != nil {
 return database.DeleteTailnetAgentRow{}, err
 return q.db.GetReplicasUpdatedAfter(ctx, updatedAt)
 }

 func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
 // TODO: auth
 return q.db.GetRuntimeConfig(ctx, key)
 }

 func (q *querier) GetTailnetAgents(ctx context.Context, id uuid.UUID) ([]database.TailnetAgent, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTailnetCoordinator); err != nil {
 return nil, err
 return q.db.UpsertProvisionerDaemon(ctx, arg)
 }

 func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
 // TODO: auth
 return q.db.UpsertRuntimeConfig(ctx, arg)
 }

 func (q *querier) UpsertTailnetAgent(ctx context.Context, arg database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTailnetCoordinator); err != nil {
 return database.TailnetAgent{}, err
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 "golang.org/x/xerrors"

 "github.com/coder/coder/v2/coderd/notifications/types"
 "github.com/coder/coder/v2/coderd/runtimeconfig"

 "github.com/coder/coder/v2/coderd/database"
 "github.com/coder/coder/v2/coderd/database/dbtime"
 workspaceProxies:          make([]database.WorkspaceProxy, 0),
 customRoles:               make([]database.CustomRole, 0),
 locks:                     map[int64]struct{}{},
 runtimeConfig:             map[string]string{},
 },
 }
 // Always start with a default org. Matching migration 198.
 workspaces                    []database.Workspace
 workspaceProxies              []database.WorkspaceProxy
 customRoles                   []database.CustomRole
 runtimeConfig                 map[string]string
 // Locks is a map of lock names. Any keys within the map are currently
 // locked.
 locks                            map[int64]struct{}
 return nil
 }

 func (q *FakeQuerier) DeleteRuntimeConfig(_ context.Context, key string) error {
 q.mutex.Lock()
 defer q.mutex.Unlock()

 delete(q.runtimeConfig, key)
 return nil
 }

 func (*FakeQuerier) DeleteTailnetAgent(context.Context, database.DeleteTailnetAgentParams) (database.DeleteTailnetAgentRow, error) {
 return database.DeleteTailnetAgentRow{}, ErrUnimplemented
 }
 return replicas, nil
 }

 func (q *FakeQuerier) GetRuntimeConfig(_ context.Context, key string) (string, error) {
 q.mutex.Lock()
 defer q.mutex.Unlock()

 val, ok := q.runtimeConfig[key]
 if !ok {
 return "", runtimeconfig.EntryNotFound
 }

 return val, nil
 }

 func (*FakeQuerier) GetTailnetAgents(context.Context, uuid.UUID) ([]database.TailnetAgent, error) {
 return nil, ErrUnimplemented
 }
 return d, nil
 }

 func (q *FakeQuerier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
 err := validateDatabaseType(arg)
 if err != nil {
 return err
 }

 q.mutex.Lock()
 defer q.mutex.Unlock()

 q.runtimeConfig[arg.Key] = arg.Value
 return nil
 }

 func (*FakeQuerier) UpsertTailnetAgent(context.Context, database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {
 return database.TailnetAgent{}, ErrUnimplemented
 }
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/siteconfig.sql b/coderd/database/queries/siteconfig.sql
 INSERT INTO site_configs (key, value) VALUES ('notifications_settings', $1)
 ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'notifications_settings';

 -- name: GetRuntimeConfig :one
 SELECT value FROM site_configs WHERE site_configs.key = $1;

 -- name: UpsertRuntimeConfig :exec
 INSERT INTO site_configs (key, value) VALUES ($1, $2)
 ON CONFLICT (key) DO UPDATE SET value = $2 WHERE site_configs.key = $1;

 -- name: DeleteRuntimeConfig :exec
 DELETE FROM site_configs
 WHERE site_configs.key = $1;

diff --git a/coderd/notifications/dispatch/smtp.go b/coderd/notifications/dispatch/smtp.go
 "github.com/coder/coder/v2/coderd/notifications/render"
 "github.com/coder/coder/v2/coderd/notifications/types"
 markdown "github.com/coder/coder/v2/coderd/render"
 "github.com/coder/coder/v2/coderd/runtimeconfig"
 "github.com/coder/coder/v2/codersdk"
 )

 return &SMTPHandler{cfg: cfg, helpers: helpers, log: log}
 }

 func (s *SMTPHandler) Dispatcher(payload types.MessagePayload, titleTmpl, bodyTmpl string) (DeliveryFunc, error) {
 func (s *SMTPHandler) Dispatcher(cfg runtimeconfig.Manager,payload types.MessagePayload, titleTmpl, bodyTmpl string) (DeliveryFunc, error) {
 // First render the subject & body into their own discrete strings.
 subject, err := markdown.PlaintextFromMarkdown(titleTmpl)
 if err != nil {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,6 +56,7 @@ import (
		"cdr.dev/slog"
		"cdr.dev/slog/sloggers/sloghuman"
		"github.com/coder/coder/v2/coderd/entitlements"
		"github.com/coder/coder/v2/coderd/runtimeconfig"
		"github.com/coder/pretty"
		"github.com/coder/quartz"
		"github.com/coder/retry"
Expand DownExpand Up		@@ -820,6 +821,14 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.
		return err
		}

		// TODO: Throw a caching layer infront of the RuntimeConfig to prevent
		// excessive database queries.
		// Note: This happens before dbauthz, which is really unfortunate.
		// dbauthz is configured in `Coderd.New()`, but we need the manager
		// at this level for notifications. We might have to move some init
		// code around.
		options.RuntimeConfig = runtimeconfig.NewStoreManager(options.Database)

		// This should be output before the logs start streaming.
		cliui.Infof(inv.Stdout, "\n==> Logs will stream in below (press ctrl+c to gracefully exit):")

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,6 +39,7 @@ import (
		"cdr.dev/slog"
		"github.com/coder/coder/v2/coderd/entitlements"
		"github.com/coder/coder/v2/coderd/idpsync"
		"github.com/coder/coder/v2/coderd/runtimeconfig"
		"github.com/coder/quartz"
		"github.com/coder/serpent"

Expand DownExpand Up		@@ -135,6 +136,7 @@ type Options struct {
		Logger slog.Logger
		Database database.Store
		Pubsub pubsub.Pubsub
		RuntimeConfig runtimeconfig.Manager

		// CacheDir is used for caching files served by the API.
		CacheDir string
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,6 +67,7 @@ import (
		"github.com/coder/coder/v2/coderd/notifications"
		"github.com/coder/coder/v2/coderd/rbac"
		"github.com/coder/coder/v2/coderd/rbac/policy"
		"github.com/coder/coder/v2/coderd/runtimeconfig"
		"github.com/coder/coder/v2/coderd/schedule"
		"github.com/coder/coder/v2/coderd/telemetry"
		"github.com/coder/coder/v2/coderd/unhanger"
Expand DownExpand Up		@@ -254,6 +255,10 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
		accessControlStore.Store(&acs)

		// runtimeManager does not use dbauthz.
		// TODO: It probably should, but the init code for prod happens before dbauthz
		// is ready.
		runtimeManager := runtimeconfig.NewStoreManager(options.Database)
		options.Database = dbauthz.New(options.Database, options.Authorizer, *options.Logger, accessControlStore)

		// Some routes expect a deployment ID, so just make sure one exists.
Expand DownExpand Up		@@ -482,6 +487,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		AppHostnameRegex: appHostnameRegex,
		Logger: *options.Logger,
		CacheDir: t.TempDir(),
		RuntimeConfig: runtimeManager,
		Database: options.Database,
		Pubsub: options.Pubsub,
		ExternalAuthConfigs: options.ExternalAuthConfigs,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1183,6 +1183,11 @@ func (q *querier) DeleteReplicasUpdatedBefore(ctx context.Context, updatedAt tim
		return q.db.DeleteReplicasUpdatedBefore(ctx, updatedAt)
		}

		func (q *querier) DeleteRuntimeConfig(ctx context.Context, key string) error {
		// TODO: auth
		return q.db.DeleteRuntimeConfig(ctx, key)
		}

		func (q *querier) DeleteTailnetAgent(ctx context.Context, arg database.DeleteTailnetAgentParams) (database.DeleteTailnetAgentRow, error) {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTailnetCoordinator); err != nil {
		return database.DeleteTailnetAgentRow{}, err
Expand DownExpand Up		@@ -1856,6 +1861,11 @@ func (q *querier) GetReplicasUpdatedAfter(ctx context.Context, updatedAt time.Ti
		return q.db.GetReplicasUpdatedAfter(ctx, updatedAt)
		}

		func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
		// TODO: auth
		return q.db.GetRuntimeConfig(ctx, key)
		}

		func (q *querier) GetTailnetAgents(ctx context.Context, id uuid.UUID) ([]database.TailnetAgent, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTailnetCoordinator); err != nil {
		return nil, err
Expand DownExpand Up		@@ -3906,6 +3916,11 @@ func (q *querier) UpsertProvisionerDaemon(ctx context.Context, arg database.Upse
		return q.db.UpsertProvisionerDaemon(ctx, arg)
		}

		func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
		// TODO: auth
		return q.db.UpsertRuntimeConfig(ctx, arg)
		}

		func (q *querier) UpsertTailnetAgent(ctx context.Context, arg database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTailnetCoordinator); err != nil {
		return database.TailnetAgent{}, err
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,6 +22,7 @@
		"golang.org/x/xerrors"

		"github.com/coder/coder/v2/coderd/notifications/types"
		"github.com/coder/coder/v2/coderd/runtimeconfig"

		"github.com/coder/coder/v2/coderd/database"
		"github.com/coder/coder/v2/coderd/database/dbtime"
Expand DownExpand Up		@@ -84,6 +85,7 @@
		workspaceProxies: make([]database.WorkspaceProxy, 0),
		customRoles: make([]database.CustomRole, 0),
		locks: map[int64]struct{}{},
		runtimeConfig: map[string]string{},
		},
		}
		// Always start with a default org. Matching migration 198.
Expand DownExpand Up		@@ -194,6 +196,7 @@
		workspaces []database.Workspace
		workspaceProxies []database.WorkspaceProxy
		customRoles []database.CustomRole
		runtimeConfig map[string]string
		// Locks is a map of lock names. Any keys within the map are currently
		// locked.
		locks map[int64]struct{}
Expand DownExpand Up		@@ -1928,6 +1931,14 @@
		return nil
		}

		func (q *FakeQuerier) DeleteRuntimeConfig(_ context.Context, key string) error {
		q.mutex.Lock()
		defer q.mutex.Unlock()

		delete(q.runtimeConfig, key)
		return nil
		}

		func (*FakeQuerier) DeleteTailnetAgent(context.Context, database.DeleteTailnetAgentParams) (database.DeleteTailnetAgentRow, error) {
		return database.DeleteTailnetAgentRow{}, ErrUnimplemented
		}
Expand DownExpand Up		@@ -3505,6 +3516,18 @@
		return replicas, nil
		}

		func (q *FakeQuerier) GetRuntimeConfig(_ context.Context, key string) (string, error) {
		q.mutex.Lock()
		defer q.mutex.Unlock()

		val, ok := q.runtimeConfig[key]
		if !ok {
		return "", runtimeconfig.EntryNotFound
		}

		return val, nil
		}

		func (*FakeQuerier) GetTailnetAgents(context.Context, uuid.UUID) ([]database.TailnetAgent, error) {
		return nil, ErrUnimplemented
		}
Expand DownExpand Up		@@ -9186,6 +9209,19 @@
		return d, nil
		}

		func (q *FakeQuerier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
Check failure on line 9212 in coderd/database/dbmem/dbmem.go View workflow job for this annotation GitHub Actions/ lint `unused-parameter: parameter 'ctx' seems to be unused, consider removing or renaming it as _ (revive)`
		err := validateDatabaseType(arg)
		if err != nil {
		return err
		}

		q.mutex.Lock()
		defer q.mutex.Unlock()

		q.runtimeConfig[arg.Key] = arg.Value
		return nil
		}

		func (*FakeQuerier) UpsertTailnetAgent(context.Context, database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {
		return database.TailnetAgent{}, ErrUnimplemented
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -96,3 +96,14 @@ SELECT
		INSERT INTO site_configs (key, value) VALUES ('notifications_settings', $1)
		ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'notifications_settings';

		-- name: GetRuntimeConfig :one
		SELECT value FROM site_configs WHERE site_configs.key = $1;

		-- name: UpsertRuntimeConfig :exec
		INSERT INTO site_configs (key, value) VALUES ($1, $2)
		ON CONFLICT (key) DO UPDATE SET value = $2 WHERE site_configs.key = $1;

		-- name: DeleteRuntimeConfig :exec
		DELETE FROM site_configs
		WHERE site_configs.key = $1;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,7 @@
		"github.com/coder/coder/v2/coderd/notifications/render"
		"github.com/coder/coder/v2/coderd/notifications/types"
		markdown "github.com/coder/coder/v2/coderd/render"
		"github.com/coder/coder/v2/coderd/runtimeconfig"
		"github.com/coder/coder/v2/codersdk"
		)

Expand DownExpand Up		@@ -63,7 +64,7 @@
		return &SMTPHandler{cfg: cfg, helpers: helpers, log: log}
		}

		func (s *SMTPHandler) Dispatcher(payload types.MessagePayload, titleTmpl, bodyTmpl string) (DeliveryFunc, error) {
		func (s *SMTPHandler) Dispatcher(cfg runtimeconfig.Manager,payload types.MessagePayload, titleTmpl, bodyTmpl string) (DeliveryFunc, error) {
Check failure on line 67 in coderd/notifications/dispatch/smtp.go View workflow job for this annotation GitHub Actions/ lint `unused-parameter: parameter 'cfg' seems to be unused, consider removing or renaming it as _ (revive)`
		// First render the subject & body into their own discrete strings.
		subject, err := markdown.PlaintextFromMarkdown(titleTmpl)
		if err != nil {
Expand Down