- {deploymentFlags ? ( - + {deploymentConfig ? ( + {children} ) : ( diff --git a/site/src/components/DeploySettingsLayout/OptionsTable.tsx b/site/src/components/DeploySettingsLayout/OptionsTable.tsx index d54c614b48949..8b7fbd111d110 100644 --- a/site/src/components/DeploySettingsLayout/OptionsTable.tsx +++ b/site/src/components/DeploySettingsLayout/OptionsTable.tsx @@ -5,7 +5,7 @@ import TableCell from "@material-ui/core/TableCell" import TableContainer from "@material-ui/core/TableContainer" import TableHead from "@material-ui/core/TableHead" import TableRow from "@material-ui/core/TableRow" -import { DeploymentFlags } from "api/typesGenerated" +import { DeploymentConfig } from "api/typesGenerated" import { OptionDescription, OptionName, @@ -13,7 +13,7 @@ import { } from "components/DeploySettingsLayout/Option" import React from "react" -const OptionsTable: React.FC<{ options: Partial }> = ({ +const OptionsTable: React.FC<{ options: Partial }> = ({ options, }) => { const styles = useStyles() diff --git a/site/src/components/Navbar/Navbar.tsx b/site/src/components/Navbar/Navbar.tsx index 95355e5a1dbe7..56d763b4a66f1 100644 --- a/site/src/components/Navbar/Navbar.tsx +++ b/site/src/components/Navbar/Navbar.tsx @@ -22,7 +22,7 @@ export const Navbar: React.FC = () => { featureVisibility[FeatureNames.AuditLog] && Boolean(permissions?.viewAuditLog) const canViewDeployment = - experimental && Boolean(permissions?.viewDeploymentFlags) + experimental && Boolean(permissions?.viewDeploymentConfig) const onSignOut = () => authSend("SIGN_OUT") return ( diff --git a/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx b/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx index 008f9f25cbe22..150c0fb006afb 100644 --- a/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx +++ b/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx @@ -12,7 +12,7 @@ import { Helmet } from "react-helmet-async" import { pageTitle } from "util/page" const AuthSettingsPage: React.FC = () => { - const { deploymentFlags } = useDeploySettings() + const { deploymentConfig: deploymentConfig } = useDeploySettings() return ( <> @@ -32,7 +32,7 @@ const AuthSettingsPage: React.FC = () => { /> - {deploymentFlags.oidc_client_id.value ? ( + {deploymentConfig.oidc_client_id.value ? ( ) : ( @@ -41,12 +41,12 @@ const AuthSettingsPage: React.FC = () => { @@ -60,7 +60,7 @@ const AuthSettingsPage: React.FC = () => { /> - {deploymentFlags.oauth2_github_client_id.value ? ( + {deploymentConfig.oauth2_github_client_id.value ? ( ) : ( @@ -69,17 +69,17 @@ const AuthSettingsPage: React.FC = () => { diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx index ebf523fb0e5a7..59fd23e7a3308 100644 --- a/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx +++ b/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx @@ -6,7 +6,7 @@ import { Helmet } from "react-helmet-async" import { pageTitle } from "util/page" const GeneralSettingsPage: React.FC = () => { - const { deploymentFlags } = useDeploySettings() + const { deploymentConfig: deploymentConfig } = useDeploySettings() return ( <> @@ -22,9 +22,9 @@ const GeneralSettingsPage: React.FC = () => { diff --git a/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx b/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx index 7bcf9cdede202..23e87a284e4b2 100644 --- a/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx +++ b/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx @@ -6,7 +6,7 @@ import { Helmet } from "react-helmet-async" import { pageTitle } from "util/page" const NetworkSettingsPage: React.FC = () => { - const { deploymentFlags } = useDeploySettings() + const { deploymentConfig: deploymentConfig } = useDeploySettings() return ( <> @@ -22,10 +22,10 @@ const NetworkSettingsPage: React.FC = () => { diff --git a/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx b/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx index 987c61b93c85f..0a7e3afdccae9 100644 --- a/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx +++ b/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx @@ -16,7 +16,7 @@ import { pageTitle } from "util/page" import { XServiceContext } from "xServices/StateContext" const SecuritySettingsPage: React.FC = () => { - const { deploymentFlags } = useDeploySettings() + const { deploymentConfig: deploymentConfig } = useDeploySettings() const xServices = useContext(XServiceContext) const [entitlementsState] = useActor(xServices.entitlementsXService) @@ -34,8 +34,8 @@ const SecuritySettingsPage: React.FC = () => { @@ -89,10 +89,10 @@ const SecuritySettingsPage: React.FC = () => { diff --git a/site/src/xServices/StateContext.tsx b/site/src/xServices/StateContext.tsx index 565ca3023a5b9..8df5003aff85e 100644 --- a/site/src/xServices/StateContext.tsx +++ b/site/src/xServices/StateContext.tsx @@ -3,7 +3,7 @@ import { createContext, FC, ReactNode } from "react" import { ActorRefFrom } from "xstate" import { authMachine } from "./auth/authXService" import { buildInfoMachine } from "./buildInfo/buildInfoXService" -import { deploymentFlagsMachine } from "./deploymentFlags/deploymentFlagsMachine" +import { deploymentConfigMachine } from "./deploymentConfig/deploymentConfigMachine" import { entitlementsMachine } from "./entitlements/entitlementsXService" import { siteRolesMachine } from "./roles/siteRolesXService" @@ -13,7 +13,7 @@ interface XServiceContextType { entitlementsXService: ActorRefFrom siteRolesXService: ActorRefFrom // Since the info here is used by multiple deployment settings page and we don't want to refetch them every time - deploymentFlagsXService: ActorRefFrom + deploymentConfigXService: ActorRefFrom } /** @@ -34,7 +34,7 @@ export const XServiceProvider: FC<{ children: ReactNode }> = ({ children }) => { buildInfoXService: useInterpret(buildInfoMachine), entitlementsXService: useInterpret(entitlementsMachine), siteRolesXService: useInterpret(siteRolesMachine), - deploymentFlagsXService: useInterpret(deploymentFlagsMachine), + deploymentConfigXService: useInterpret(deploymentConfigMachine), }} > {children} diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts index af25518f8bcaa..79439dbc298a4 100644 --- a/site/src/xServices/auth/authXService.ts +++ b/site/src/xServices/auth/authXService.ts @@ -16,7 +16,7 @@ export const checks = { createTemplates: "createTemplates", deleteTemplates: "deleteTemplates", viewAuditLog: "viewAuditLog", - viewDeploymentFlags: "viewDeploymentFlags", + viewDeploymentConfig: "viewDeploymentConfig", createGroup: "createGroup", } as const @@ -57,7 +57,7 @@ export const permissionsToCheck = { }, action: "read", }, - [checks.viewDeploymentFlags]: { + [checks.viewDeploymentConfig]: { object: { resource_type: "deployment_flags", }, diff --git a/site/src/xServices/deploymentFlags/deploymentFlagsMachine.ts b/site/src/xServices/deploymentFlags/deploymentFlagsMachine.ts deleted file mode 100644 index aa18e9d179ce1..0000000000000 --- a/site/src/xServices/deploymentFlags/deploymentFlagsMachine.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { getDeploymentFlags } from "api/api" -import { DeploymentFlags } from "api/typesGenerated" -import { createMachine, assign } from "xstate" - -export const deploymentFlagsMachine = createMachine( - { - id: "deploymentFlagsMachine", - predictableActionArguments: true, - initial: "idle", - schema: { - context: {} as { - deploymentFlags?: DeploymentFlags - getDeploymentFlagsError?: unknown - }, - events: {} as { type: "LOAD" }, - services: {} as { - getDeploymentFlags: { - data: DeploymentFlags - } - }, - }, - tsTypes: {} as import("./deploymentFlagsMachine.typegen").Typegen0, - states: { - idle: { - on: { - LOAD: { - target: "loading", - }, - }, - }, - loading: { - invoke: { - src: "getDeploymentFlags", - onDone: { - target: "loaded", - actions: ["assignDeploymentFlags"], - }, - onError: { - target: "idle", - actions: ["assignGetDeploymentFlagsError"], - }, - }, - }, - loaded: { - type: "final", - }, - }, - }, - { - services: { - getDeploymentFlags, - }, - actions: { - assignDeploymentFlags: assign({ - deploymentFlags: (_, { data }) => data, - }), - assignGetDeploymentFlagsError: assign({ - getDeploymentFlagsError: (_, { data }) => data, - }), - }, - }, -) From d9473632b8dd8d95efe971cd54372dd50c04e9c8 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 02:30:43 +0000 Subject: [PATCH 33/43] fix ts --- .../deploymentConfigMachine.ts | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 site/src/xServices/deploymentConfig/deploymentConfigMachine.ts diff --git a/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts new file mode 100644 index 0000000000000..d5fd0f18bdc3b --- /dev/null +++ b/site/src/xServices/deploymentConfig/deploymentConfigMachine.ts @@ -0,0 +1,62 @@ +import { getDeploymentConfig } from "api/api" +import { DeploymentConfig } from "api/typesGenerated" +import { createMachine, assign } from "xstate" + +export const deploymentConfigMachine = createMachine( + { + id: "deploymentConfigMachine", + predictableActionArguments: true, + initial: "idle", + schema: { + context: {} as { + deploymentConfig?: DeploymentConfig + getDeploymentConfigError?: unknown + }, + events: {} as { type: "LOAD" }, + services: {} as { + getDeploymentConfig: { + data: DeploymentConfig + } + }, + }, + tsTypes: {} as import("./deploymentConfigMachine.typegen").Typegen0, + states: { + idle: { + on: { + LOAD: { + target: "loading", + }, + }, + }, + loading: { + invoke: { + src: "getDeploymentConfig", + onDone: { + target: "loaded", + actions: ["assignDeploymentConfig"], + }, + onError: { + target: "idle", + actions: ["assignGetDeploymentConfigError"], + }, + }, + }, + loaded: { + type: "final", + }, + }, + }, + { + services: { + getDeploymentConfig: getDeploymentConfig, + }, + actions: { + assignDeploymentConfig: assign({ + deploymentConfig: (_, { data }) => data, + }), + assignGetDeploymentConfigError: assign({ + getDeploymentConfigError: (_, { data }) => data, + }), + }, + }, +) From 9520dafc30aec352b188a1ee772f2dfddcdc504b Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 02:37:04 +0000 Subject: [PATCH 34/43] fix merge --- cli/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/server.go b/cli/server.go index a6fd3795bb1ae..ee3cbf41e6fda 100644 --- a/cli/server.go +++ b/cli/server.go @@ -214,22 +214,22 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co // If the access URL is empty, we attempt to run a reverse-proxy // tunnel to make the initial setup really simple. - if dflags.AccessURL.Value == "" { + if cfg.AccessURL.Value == "" { cmd.Printf("Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL\n") tunnel, tunnelErr, err = devtunnel.New(ctxTunnel, logger.Named("devtunnel")) if err != nil { return xerrors.Errorf("create tunnel: %w", err) } - dflags.AccessURL.Value = tunnel.URL + cfg.AccessURL.Value = tunnel.URL - if dflags.WildcardAccessURL.Value == "" { + if cfg.WildcardAccessURL.Value == "" { u, err := parseURL(ctx, tunnel.URL) if err != nil { return xerrors.Errorf("parse tunnel url: %w", err) } // Suffixed wildcard access URL. - dflags.WildcardAccessURL.Value = fmt.Sprintf("*--%s", u.Hostname()) + cfg.WildcardAccessURL.Value = fmt.Sprintf("*--%s", u.Hostname()) } } From 555aaacd30f62748101ed7f6efe6ee39ae172f15 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 02:39:33 +0000 Subject: [PATCH 35/43] make fmt --- .../components/DeploySettingsLayout/DeploySettingsLayout.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx index c53eda63a35bb..f9294d4108f7d 100644 --- a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx +++ b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx @@ -49,7 +49,9 @@ export const DeploySettingsLayout: React.FC = ({

{deploymentConfig ? ( - + {children} ) : ( From ef682b96ccbbb8f324130ce6c6d8cd5a6e95b61a Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 02:50:00 +0000 Subject: [PATCH 36/43] remove verbose from flag set --- site/src/api/typesGenerated.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 6fa61d9db2836..92c915317647d 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -297,7 +297,6 @@ export interface DeploymentConfig { readonly auto_import_templates: DeploymentConfigField readonly metrics_cache_refresh_interval: DeploymentConfigField readonly agent_stat_refresh_interval: DeploymentConfigField - readonly verbose: DeploymentConfigField readonly audit_logging: DeploymentConfigField readonly browser_only: DeploymentConfigField readonly user_workspace_quota: DeploymentConfigField From ee1ac0b84122e8b1d500166965364fc80d61a9fa Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 15:19:12 +0000 Subject: [PATCH 37/43] add json flags --- codersdk/deploymentconfig.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/codersdk/deploymentconfig.go b/codersdk/deploymentconfig.go index b46adb117ee07..1163830a8d983 100644 --- a/codersdk/deploymentconfig.go +++ b/codersdk/deploymentconfig.go @@ -70,14 +70,14 @@ type Flaggable interface { } type DeploymentConfigField[T Flaggable] struct { - Key string - Name string - Usage string - Flag string - Shorthand string - Enterprise bool - Hidden bool - Value T + Key string `json:"key"` + Name string `json:"name"` + Usage string `json:"usage"` + Flag string `json:"flag"` + Shorthand string `json:"shorthand"` + Enterprise bool `json:"enterprise"` + Hidden bool `json:"hidden"` + Value T `json:"value"` } // DeploymentConfig returns the deployment config for the coder server. From 301e4e737849201ecfe0a357120b1933c9f842fc Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 15:23:14 +0000 Subject: [PATCH 38/43] remove server.yaml --- server.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server.yaml diff --git a/server.yaml b/server.yaml deleted file mode 100644 index e69de29bb2d1d..0000000000000 From 8e2e9009167d0c13644d16a509e67e58f44c4815 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 17:18:46 +0000 Subject: [PATCH 39/43] fix ts --- site/src/api/typesGenerated.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 92c915317647d..676c4e0be950f 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -304,14 +304,14 @@ export interface DeploymentConfig { // From codersdk/deploymentconfig.go export interface DeploymentConfigField { - readonly Key: string - readonly Name: string - readonly Usage: string - readonly Flag: string - readonly Shorthand: string - readonly Enterprise: boolean - readonly Hidden: boolean - readonly Value: T + readonly key: string + readonly name: string + readonly usage: string + readonly flag: string + readonly shorthand: string + readonly enterprise: boolean + readonly hidden: boolean + readonly value: T } // From codersdk/features.go From 0d548ede47eb2f6d8e614a844043308704469954 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 18:59:50 +0000 Subject: [PATCH 40/43] ensure as much parity as possible --- cli/deployment/config.go | 30 +++++++++++++++--------------- cli/server.go | 8 ++++---- coderd/deploymentconfig_test.go | 4 ++-- codersdk/deploymentconfig.go | 8 ++++---- enterprise/cli/server.go | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cli/deployment/config.go b/cli/deployment/config.go index 42634b2ca6b6c..a6cbeae0691ee 100644 --- a/cli/deployment/config.go +++ b/cli/deployment/config.go @@ -113,8 +113,8 @@ func newConfig() codersdk.DeploymentConfig { Flag: "pprof-address", Value: "127.0.0.1:6060", }, - CacheDir: codersdk.DeploymentConfigField[string]{ - Key: "cache_dir", + CacheDirectory: codersdk.DeploymentConfigField[string]{ + Key: "cache_directory", Usage: "The directory to cache temporary files. If unspecified and $CACHE_DIRECTORY is set, it will be used for compatibility with systemd.", Flag: "cache-dir", Value: defaultCacheDir(), @@ -125,44 +125,44 @@ func newConfig() codersdk.DeploymentConfig { Flag: "in-memory", Hidden: true, }, - ProvisionerDaemonCount: codersdk.DeploymentConfigField[int]{ - Key: "provisioner.daemon_count", + ProvisionerDaemons: codersdk.DeploymentConfigField[int]{ + Key: "provisioner.daemons", Usage: "Number of provisioner daemons to create on start. If builds are stuck in queued state for a long time, consider increasing this.", Flag: "provisioner-daemons", Value: 3, }, PostgresURL: codersdk.DeploymentConfigField[string]{ - Key: "postgres_url", + Key: "pg_connection_url", Usage: "URL of a PostgreSQL database. If empty, PostgreSQL binaries will be downloaded from Maven (https://repo1.maven.org/maven2) and store all data in the config root. Access the built-in database with \"coder server postgres-builtin-url\".", Flag: "postgres-url", }, OAuth2GithubClientID: codersdk.DeploymentConfigField[string]{ - Key: "oauth2github.client_id", + Key: "oauth2.github.client_id", Usage: "Client ID for Login with GitHub.", Flag: "oauth2-github-client-id", }, OAuth2GithubClientSecret: codersdk.DeploymentConfigField[string]{ - Key: "oauth2github.client_secret", + Key: "oauth2.github.client_secret", Usage: "Client secret for Login with GitHub.", Flag: "oauth2-github-client-secret", }, OAuth2GithubAllowedOrganizations: codersdk.DeploymentConfigField[[]string]{ - Key: "oauth2github.allowed_organizations", + Key: "oauth2.github.allowed_organizations", Usage: "Organizations the user must be a member of to Login with GitHub.", Flag: "oauth2-github-allowed-orgs", }, OAuth2GithubAllowedTeams: codersdk.DeploymentConfigField[[]string]{ - Key: "oauth2github.allowed_teams", + Key: "oauth2.github.allowed_teams", Usage: "Teams inside organizations the user must be a member of to Login with GitHub. Structured as: /.", Flag: "oauth2-github-allowed-teams", }, OAuth2GithubAllowSignups: codersdk.DeploymentConfigField[bool]{ - Key: "oauth2github.allow_signups", + Key: "oauth2.github.allow_signups", Usage: "Whether new users can sign up with GitHub.", Flag: "oauth2-github-allow-signups", }, OAuth2GithubEnterpriseBaseURL: codersdk.DeploymentConfigField[string]{ - Key: "oauth2github.enterprise_base_url", + Key: "oauth2.github.enterprise_base_url", Usage: "Base URL of a GitHub Enterprise deployment to use for Login with GitHub.", Flag: "oauth2-github-enterprise-base-url", }, @@ -204,8 +204,8 @@ func newConfig() codersdk.DeploymentConfig { Flag: "telemetry", Value: flag.Lookup("test.v") == nil, }, - TelemetryTraceEnable: codersdk.DeploymentConfigField[bool]{ - Key: "telemetry.trace.enable", + TelemetryTrace: codersdk.DeploymentConfigField[bool]{ + Key: "telemetry.trace", Usage: "Whether Opentelemetry traces are sent to Coder. Coder collects anonymized application tracing to help improve our product. Disabling telemetry also disables this option.", Flag: "telemetry-trace", Value: flag.Lookup("test.v") == nil, @@ -298,8 +298,8 @@ func newConfig() codersdk.DeploymentConfig { Flag: "browser-only", Enterprise: true, }, - SCIMAuthHeader: codersdk.DeploymentConfigField[string]{ - Key: "scim_auth_header", + SCIMAPIKey: codersdk.DeploymentConfigField[string]{ + Key: "scim_api_key", Usage: "Enables SCIM and sets the authentication header for the built-in SCIM server. New users are automatically created with OIDC authentication.", Flag: "scim-auth-header", Enterprise: true, diff --git a/cli/server.go b/cli/server.go index ee3cbf41e6fda..8f3ce62921c80 100644 --- a/cli/server.go +++ b/cli/server.go @@ -120,7 +120,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co // Only override if telemetryTraceEnable was specifically set. // By default we want it to be controlled by telemetryEnable. if cmd.Flags().Changed("telemetry-trace") { - shouldCoderTrace = cfg.TelemetryTraceEnable.Value + shouldCoderTrace = cfg.TelemetryTrace.Value } if cfg.TraceEnable.Value || shouldCoderTrace { @@ -333,7 +333,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co Database: databasefake.New(), DERPMap: derpMap, Pubsub: database.NewPubsubInMemory(), - CacheDir: cfg.CacheDir.Value, + CacheDir: cfg.CacheDirectory.Value, GoogleTokenValidator: googleTokenValidator, SecureAuthCookie: cfg.SecureAuthCookie.Value, SSHKeygenAlgorithm: sshKeygenAlgorithm, @@ -541,8 +541,8 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co _ = daemon.Close() } }() - for i := 0; i < cfg.ProvisionerDaemonCount.Value; i++ { - daemon, err := newProvisionerDaemon(ctx, coderAPI, logger, cfg.CacheDir.Value, errCh, false) + for i := 0; i < cfg.ProvisionerDaemons.Value; i++ { + daemon, err := newProvisionerDaemon(ctx, coderAPI, logger, cfg.CacheDirectory.Value, errCh, false) if err != nil { return xerrors.Errorf("create provisioner daemon: %w", err) } diff --git a/coderd/deploymentconfig_test.go b/coderd/deploymentconfig_test.go index 7a3aa16c7aa98..2f03e655c671d 100644 --- a/coderd/deploymentconfig_test.go +++ b/coderd/deploymentconfig_test.go @@ -29,7 +29,7 @@ func TestDeploymentConfig(t *testing.T) { cfg.OAuth2GithubClientSecret.Value = hi cfg.OIDCClientSecret.Value = hi cfg.PostgresURL.Value = hi - cfg.SCIMAuthHeader.Value = hi + cfg.SCIMAPIKey.Value = hi client := coderdtest.New(t, &coderdtest.Options{ DeploymentConfig: &cfg, @@ -43,5 +43,5 @@ func TestDeploymentConfig(t *testing.T) { require.Empty(t, scrubbed.OAuth2GithubClientSecret.Value) require.Empty(t, scrubbed.OIDCClientSecret.Value) require.Empty(t, scrubbed.PostgresURL.Value) - require.Empty(t, scrubbed.SCIMAuthHeader.Value) + require.Empty(t, scrubbed.SCIMAPIKey.Value) } diff --git a/codersdk/deploymentconfig.go b/codersdk/deploymentconfig.go index 1163830a8d983..174152e4a29f2 100644 --- a/codersdk/deploymentconfig.go +++ b/codersdk/deploymentconfig.go @@ -28,9 +28,9 @@ type DeploymentConfig struct { PrometheusAddress DeploymentConfigField[string] `json:"prometheus_address"` PprofEnable DeploymentConfigField[bool] `json:"pprof_enabled"` PprofAddress DeploymentConfigField[string] `json:"pprof_address"` - CacheDir DeploymentConfigField[string] `json:"cache_dir"` + CacheDirectory DeploymentConfigField[string] `json:"cache_directory"` InMemoryDatabase DeploymentConfigField[bool] `json:"in_memory_database"` - ProvisionerDaemonCount DeploymentConfigField[int] `json:"provisioner_daemon_count"` + ProvisionerDaemons DeploymentConfigField[int] `json:"provisioner_daemon_count"` PostgresURL DeploymentConfigField[string] `json:"-"` OAuth2GithubClientID DeploymentConfigField[string] `json:"oauth2_github_client_id"` OAuth2GithubClientSecret DeploymentConfigField[string] `json:"-"` @@ -45,7 +45,7 @@ type DeploymentConfig struct { OIDCIssuerURL DeploymentConfigField[string] `json:"oidc_issuer_url"` OIDCScopes DeploymentConfigField[[]string] `json:"oidc_scopes"` TelemetryEnable DeploymentConfigField[bool] `json:"telemetry_enable"` - TelemetryTraceEnable DeploymentConfigField[bool] `json:"telemetry_trace_enable"` + TelemetryTrace DeploymentConfigField[bool] `json:"telemetry_trace_enable"` TelemetryURL DeploymentConfigField[string] `json:"telemetry_url"` TLSEnable DeploymentConfigField[bool] `json:"tls_enable"` TLSCertFiles DeploymentConfigField[[]string] `json:"tls_cert_files"` @@ -61,7 +61,7 @@ type DeploymentConfig struct { AgentStatRefreshInterval DeploymentConfigField[time.Duration] `json:"agent_stat_refresh_interval"` AuditLogging DeploymentConfigField[bool] `json:"audit_logging"` BrowserOnly DeploymentConfigField[bool] `json:"browser_only"` - SCIMAuthHeader DeploymentConfigField[string] `json:"-"` + SCIMAPIKey DeploymentConfigField[string] `json:"-"` UserWorkspaceQuota DeploymentConfigField[int] `json:"user_workspace_quota"` } diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go index 04bbbe037907b..cd04a3be93972 100644 --- a/enterprise/cli/server.go +++ b/enterprise/cli/server.go @@ -60,7 +60,7 @@ func server() *cobra.Command { o := &coderd.Options{ AuditLogging: options.DeploymentConfig.AuditLogging.Value, BrowserOnly: options.DeploymentConfig.BrowserOnly.Value, - SCIMAPIKey: []byte(options.DeploymentConfig.SCIMAuthHeader.Value), + SCIMAPIKey: []byte(options.DeploymentConfig.SCIMAPIKey.Value), UserWorkspaceQuota: options.DeploymentConfig.UserWorkspaceQuota.Value, RBAC: true, DERPServerRelayAddress: options.DeploymentConfig.DERPServerRelayAddress.Value, From c85657b4ee2b8e3f70e63a5a68fb99d053388fda Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 19:03:28 +0000 Subject: [PATCH 41/43] revert tls breaking changes --- cli/deployment/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/deployment/config.go b/cli/deployment/config.go index a6cbeae0691ee..42a875496b090 100644 --- a/cli/deployment/config.go +++ b/cli/deployment/config.go @@ -223,7 +223,7 @@ func newConfig() codersdk.DeploymentConfig { Flag: "tls-enable", }, TLSCertFiles: codersdk.DeploymentConfigField[[]string]{ - Key: "tls.cert_files", + Key: "tls.cert_file", Usage: "Path to each certificate for TLS. It requires a PEM-encoded file. To configure the listener to use a CA certificate, concatenate the primary certificate and the CA certificate together. The primary certificate should appear first in the combined file.", Flag: "tls-cert-file", }, @@ -239,7 +239,7 @@ func newConfig() codersdk.DeploymentConfig { Value: "request", }, TLSKeyFiles: codersdk.DeploymentConfigField[[]string]{ - Key: "tls.key_files", + Key: "tls.key_file", Usage: "Paths to the private keys for each of the certificates. It requires a PEM-encoded file.", Flag: "tls-key-file", }, From 903db7f6e71ff1216097071b7a742fc35c6579b3 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 19:05:33 +0000 Subject: [PATCH 42/43] make gen --- site/src/api/typesGenerated.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 676c4e0be950f..0729f24e784f8 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -269,7 +269,7 @@ export interface DeploymentConfig { readonly prometheus_address: DeploymentConfigField readonly pprof_enabled: DeploymentConfigField readonly pprof_address: DeploymentConfigField - readonly cache_dir: DeploymentConfigField + readonly cache_directory: DeploymentConfigField readonly in_memory_database: DeploymentConfigField readonly provisioner_daemon_count: DeploymentConfigField readonly oauth2_github_client_id: DeploymentConfigField From 8fae06a10f61d3b32e59e00765c82d89f405955e Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 21 Oct 2022 19:17:15 +0000 Subject: [PATCH 43/43] fix docs --- docs/install/kubernetes.md | 2 +- helm/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/install/kubernetes.md b/docs/install/kubernetes.md index ef5d5fb9e90d2..81958e964878c 100644 --- a/docs/install/kubernetes.md +++ b/docs/install/kubernetes.md @@ -102,7 +102,7 @@ to log in and manage templates. # This env variable controls whether or not to auto-import the # "kubernetes" template on first startup. This will not work unless # coder.serviceAccount.workspacePerms is true. - - name: CODER_TEMPLATE_AUTOIMPORT + - name: CODER_AUTO_IMPORT_TEMPLATES value: "kubernetes" #tls: diff --git a/helm/README.md b/helm/README.md index 0fa51303c71a4..95b4ecffe3ed8 100644 --- a/helm/README.md +++ b/helm/README.md @@ -47,10 +47,10 @@ coder: # This env variable controls whether or not to auto-import the "kubernetes" # template on first startup. This will not work unless # coder.serviceAccount.workspacePerms is true. - - name: CODER_TEMPLATE_AUTOIMPORT + - name: CODER_AUTO_IMPORT_TEMPLATES value: "kubernetes" tls: - secretNames: + secretNames: - my-tls-secret-name ```