Revert "Revert "feat: Support config files with viper"" (#4693)

2026-10-24 01:26:25 +08:00 · 2022-10-21 20:55:20 +00:00
parent d15b4159ef
commit 372fb1f345
35 changed files with 921 additions and 1089 deletions
@@ -667,9 +667,9 @@ export const getAgentListeningPorts = async (
  return response.data
 }

-export const getDeploymentFlags =
-  async (): Promise<TypesGen.DeploymentFlags> => {
-    const response = await axios.get(`/api/v2/flags/deployment`)
+export const getDeploymentConfig =
+  async (): Promise<TypesGen.DeploymentConfig> => {
+    const response = await axios.get(`/api/v2/config/deployment`)
    return response.data
  }

@@ -126,19 +126,6 @@ export interface AzureInstanceIdentityToken {
  readonly encoding: string
 }

-// From codersdk/flags.go
-export interface BoolFlag {
-  readonly name: string
-  readonly flag: string
-  readonly env_var: string
-  readonly shorthand: string
-  readonly description: string
-  readonly enterprise: boolean
-  readonly hidden: boolean
-  readonly default: boolean
-  readonly value: boolean
-}
-
 // From codersdk/buildinfo.go
 export interface BuildInfoResponse {
  readonly external_url: string
@@ -264,75 +251,67 @@ export interface DERPRegion {
  readonly latency_ms: number
 }

-// From codersdk/flags.go
-export interface DeploymentFlags {
-  readonly access_url: StringFlag
-  readonly wildcard_access_url: StringFlag
-  readonly address: StringFlag
-  readonly autobuild_poll_interval: DurationFlag
-  readonly derp_server_enabled: BoolFlag
-  readonly derp_server_region_id: IntFlag
-  readonly derp_server_region_code: StringFlag
-  readonly derp_server_region_name: StringFlag
-  readonly derp_server_stun_address: StringArrayFlag
-  readonly derp_server_relay_address: StringFlag
-  readonly derp_config_url: StringFlag
-  readonly derp_config_path: StringFlag
-  readonly prom_enabled: BoolFlag
-  readonly prom_address: StringFlag
-  readonly pprof_enabled: BoolFlag
-  readonly pprof_address: StringFlag
-  readonly cache_dir: StringFlag
-  readonly in_memory_database: BoolFlag
-  readonly provisioner_daemon_count: IntFlag
-  readonly postgres_url: StringFlag
-  readonly oauth2_github_client_id: StringFlag
-  readonly oauth2_github_client_secret: StringFlag
-  readonly oauth2_github_allowed_organizations: StringArrayFlag
-  readonly oauth2_github_allowed_teams: StringArrayFlag
-  readonly oauth2_github_allow_signups: BoolFlag
-  readonly oauth2_github_enterprise_base_url: StringFlag
-  readonly oidc_allow_signups: BoolFlag
-  readonly oidc_client_id: StringFlag
-  readonly oidc_client_secret: StringFlag
-  readonly oidc_email_domain: StringFlag
-  readonly oidc_issuer_url: StringFlag
-  readonly oidc_scopes: StringArrayFlag
-  readonly telemetry_enable: BoolFlag
-  readonly telemetry_trace_enable: BoolFlag
-  readonly telemetry_url: StringFlag
-  readonly tls_enable: BoolFlag
-  readonly tls_cert_files: StringArrayFlag
-  readonly tls_client_ca_file: StringFlag
-  readonly tls_client_auth: StringFlag
-  readonly tls_key_files: StringArrayFlag
-  readonly tls_min_version: StringFlag
-  readonly trace_enable: BoolFlag
-  readonly secure_auth_cookie: BoolFlag
-  readonly ssh_keygen_algorithm: StringFlag
-  readonly auto_import_templates: StringArrayFlag
-  readonly metrics_cache_refresh_interval: DurationFlag
-  readonly agent_stat_refresh_interval: DurationFlag
-  readonly verbose: BoolFlag
-  readonly audit_logging: BoolFlag
-  readonly browser_only: BoolFlag
-  readonly scim_auth_header: StringFlag
-  readonly user_workspace_quota: IntFlag
+// From codersdk/deploymentconfig.go
+export interface DeploymentConfig {
+  readonly access_url: DeploymentConfigField<string>
+  readonly wildcard_access_url: DeploymentConfigField<string>
+  readonly address: DeploymentConfigField<string>
+  readonly autobuild_poll_interval: DeploymentConfigField<number>
+  readonly derp_server_enabled: DeploymentConfigField<boolean>
+  readonly derp_server_region_id: DeploymentConfigField<number>
+  readonly derp_server_region_code: DeploymentConfigField<string>
+  readonly derp_server_region_name: DeploymentConfigField<string>
+  readonly derp_server_stun_address: DeploymentConfigField<string[]>
+  readonly derp_server_relay_address: DeploymentConfigField<string>
+  readonly derp_config_url: DeploymentConfigField<string>
+  readonly derp_config_path: DeploymentConfigField<string>
+  readonly prometheus_enabled: DeploymentConfigField<boolean>
+  readonly prometheus_address: DeploymentConfigField<string>
+  readonly pprof_enabled: DeploymentConfigField<boolean>
+  readonly pprof_address: DeploymentConfigField<string>
+  readonly cache_directory: DeploymentConfigField<string>
+  readonly in_memory_database: DeploymentConfigField<boolean>
+  readonly provisioner_daemon_count: DeploymentConfigField<number>
+  readonly oauth2_github_client_id: DeploymentConfigField<string>
+  readonly oauth2_github_allowed_organizations: DeploymentConfigField<string[]>
+  readonly oauth2_github_allowed_teams: DeploymentConfigField<string[]>
+  readonly oauth2_github_allow_signups: DeploymentConfigField<boolean>
+  readonly oauth2_github_enterprise_base_url: DeploymentConfigField<string>
+  readonly oidc_allow_signups: DeploymentConfigField<boolean>
+  readonly oidc_client_id: DeploymentConfigField<string>
+  readonly oidc_email_domain: DeploymentConfigField<string>
+  readonly oidc_issuer_url: DeploymentConfigField<string>
+  readonly oidc_scopes: DeploymentConfigField<string[]>
+  readonly telemetry_enable: DeploymentConfigField<boolean>
+  readonly telemetry_trace_enable: DeploymentConfigField<boolean>
+  readonly telemetry_url: DeploymentConfigField<string>
+  readonly tls_enable: DeploymentConfigField<boolean>
+  readonly tls_cert_files: DeploymentConfigField<string[]>
+  readonly tls_client_ca_file: DeploymentConfigField<string>
+  readonly tls_client_auth: DeploymentConfigField<string>
+  readonly tls_key_files: DeploymentConfigField<string[]>
+  readonly tls_min_version: DeploymentConfigField<string>
+  readonly trace_enable: DeploymentConfigField<boolean>
+  readonly secure_auth_cookie: DeploymentConfigField<boolean>
+  readonly ssh_keygen_algorithm: DeploymentConfigField<string>
+  readonly auto_import_templates: DeploymentConfigField<string[]>
+  readonly metrics_cache_refresh_interval: DeploymentConfigField<number>
+  readonly agent_stat_refresh_interval: DeploymentConfigField<number>
+  readonly audit_logging: DeploymentConfigField<boolean>
+  readonly browser_only: DeploymentConfigField<boolean>
+  readonly user_workspace_quota: DeploymentConfigField<number>
 }

-// From codersdk/flags.go
-export interface DurationFlag {
+// From codersdk/deploymentconfig.go
+export interface DeploymentConfigField<T extends Flaggable> {
+  readonly key: string
  readonly name: string
+  readonly usage: string
  readonly flag: string
-  readonly env_var: string
  readonly shorthand: string
-  readonly description: string
  readonly enterprise: boolean
  readonly hidden: boolean
-  // This is likely an enum in an external package ("time.Duration")
-  readonly default: number
-  // This is likely an enum in an external package ("time.Duration")
-  readonly value: number
+  readonly value: T
 }

 // From codersdk/features.go
@@ -387,19 +366,6 @@ export interface Healthcheck {
  readonly threshold: number
 }

-// From codersdk/flags.go
-export interface IntFlag {
-  readonly name: string
-  readonly flag: string
-  readonly env_var: string
-  readonly shorthand: string
-  readonly description: string
-  readonly enterprise: boolean
-  readonly hidden: boolean
-  readonly default: number
-  readonly value: number
-}
-
 // From codersdk/licenses.go
 export interface License {
  readonly id: number
@@ -564,33 +530,6 @@ export interface ServerSentEvent {
  readonly data: any
 }

-// From codersdk/flags.go
-export interface StringArrayFlag {
-  readonly name: string
-  readonly flag: string
-  readonly env_var: string
-  readonly shorthand: string
-  readonly description: string
-  readonly enterprise: boolean
-  readonly hidden: boolean
-  readonly default: string[]
-  readonly value: string[]
-}
-
-// From codersdk/flags.go
-export interface StringFlag {
-  readonly name: string
-  readonly flag: string
-  readonly env_var: string
-  readonly shorthand: string
-  readonly description: string
-  readonly enterprise: boolean
-  readonly secret: boolean
-  readonly hidden: boolean
-  readonly default: string
-  readonly value: string
-}
-
 // From codersdk/templates.go
 export interface Template {
  readonly id: string
@@ -999,3 +938,6 @@ export type WorkspaceStatus =

 // From codersdk/workspacebuilds.go
 export type WorkspaceTransition = "delete" | "start" | "stop"
+
+// From codersdk/deploymentconfig.go
+export type Flaggable = string | boolean | number | string[]