Skip to content

feat: Support config files with viper #4558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Oct 21, 2022
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
305f2af
wip
f0ssel Oct 13, 2022
bf152f3
idk
f0ssel Oct 14, 2022
3794097
add script
f0ssel Oct 17, 2022
d819ef6
get working with normal fields
f0ssel Oct 17, 2022
14cdd59
get formatting right
f0ssel Oct 17, 2022
a819afd
make arrays work
f0ssel Oct 17, 2022
976be19
support structs
f0ssel Oct 18, 2022
ddfd59f
rename
f0ssel Oct 18, 2022
817704c
fix
f0ssel Oct 18, 2022
451b7c4
more fix
f0ssel Oct 18, 2022
8928789
relay
f0ssel Oct 18, 2022
bc53e5e
fix env
f0ssel Oct 18, 2022
387293e
pass tests
f0ssel Oct 18, 2022
65d73b4
fix tests
f0ssel Oct 18, 2022
c098307
docs
f0ssel Oct 18, 2022
de46a07
remove script test
f0ssel Oct 18, 2022
65d7d56
fix gen
f0ssel Oct 18, 2022
3826228
fix gen
f0ssel Oct 18, 2022
c14f58e
frontend refactor
f0ssel Oct 18, 2022
e306ff1
back to reflect
f0ssel Oct 18, 2022
3cafe7a
more convert
f0ssel Oct 18, 2022
cb95772
move to reflect
f0ssel Oct 19, 2022
45dd962
clean docs
f0ssel Oct 19, 2022
687f474
fix ent
f0ssel Oct 20, 2022
b776d7d
lint
f0ssel Oct 20, 2022
eac9ad3
make gen
f0ssel Oct 20, 2022
42e70ee
try supporting flag
f0ssel Oct 20, 2022
3940948
fix tests
f0ssel Oct 21, 2022
dd2f4ff
add back test
f0ssel Oct 21, 2022
26e698d
add back test2
f0ssel Oct 21, 2022
b3c1ec8
centralize flag name
f0ssel Oct 21, 2022
63587f6
fix ts
f0ssel Oct 21, 2022
d947363
fix ts
f0ssel Oct 21, 2022
9520daf
fix merge
f0ssel Oct 21, 2022
555aaac
make fmt
f0ssel Oct 21, 2022
ef682b9
remove verbose from flag set
f0ssel Oct 21, 2022
ee1ac0b
add json flags
f0ssel Oct 21, 2022
301e4e7
remove server.yaml
f0ssel Oct 21, 2022
8e2e900
fix ts
f0ssel Oct 21, 2022
0d548ed
ensure as much parity as possible
f0ssel Oct 21, 2022
c85657b
revert tls breaking changes
f0ssel Oct 21, 2022
903db7f
make gen
f0ssel Oct 21, 2022
8fae06a
fix docs
f0ssel Oct 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
frontend refactor
  • Loading branch information
f0ssel committed Oct 21, 2022
commit c14f58e15375757cac2bf024e22e0b865d95058b
208 changes: 116 additions & 92 deletions site/src/api/typesGenerated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,19 @@ 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
Expand Down Expand Up @@ -245,63 +258,81 @@ export interface DAUEntry {
readonly amount: number
}

// From codersdk/config.go
export interface DERPConfig {
readonly server: DERPServerConfig
readonly config: DERPConfigConfig
}

// From codersdk/config.go
export interface DERPConfigConfig {
readonly url: string
readonly path: string
}

// From codersdk/workspaceagents.go
export interface DERPRegion {
readonly preferred: boolean
readonly latency_ms: number
}

// From codersdk/config.go
export interface DERPServerConfig {
readonly enabled: boolean
readonly region_id: number
readonly region_code: string
readonly region_name: string
readonly stun_address: string[]
readonly relay_address: string
}

// From codersdk/config.go
export interface DeploymentConfig {
readonly access_url: string
readonly wildcard_access_url: string
readonly address: string
// This is likely an enum in an external package ("time.Duration")
readonly autobuild_poll_interval: number
readonly derp: DERPConfig
readonly prometheus: PrometheusConfig
readonly pprof: PprofConfig
readonly cache_dir: string
readonly in_memory_database: boolean
readonly provisioner_daemon_count: number
readonly oauth2_github: OAuth2GithubConfig
readonly oidc: OIDCConfig
readonly telemetry: TelemetryConfig
readonly tls_config: TLSConfig
readonly trace_enable: boolean
readonly secure_auth_cookie: boolean
readonly ssh_keygen_algorithm: string
readonly auto_import_templates: string[]
// 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/flags.go
export interface DurationFlag {
readonly name: 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 metrics_cache_refresh_interval: number
readonly default: number
// This is likely an enum in an external package ("time.Duration")
readonly agent_stat_refresh_interval: number
readonly verbose: boolean
readonly audit_logging: boolean
readonly browser_only: boolean
readonly user_workspace_quota: number
readonly value: number
}

// From codersdk/features.go
Expand Down Expand Up @@ -356,6 +387,19 @@ 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
Expand Down Expand Up @@ -387,24 +431,6 @@ export interface LoginWithPasswordResponse {
readonly session_token: string
}

// From codersdk/config.go
export interface OAuth2GithubConfig {
readonly client_id: string
readonly allowed_organizations: string[]
readonly allowed_teams: string[]
readonly allow_signups: boolean
readonly enterprise_base_url: string
}

// From codersdk/config.go
export interface OIDCConfig {
readonly allow_signups: boolean
readonly client_id: string
readonly email_domain: string
readonly issuer_url: string
readonly scopes: string[]
}

// From codersdk/organizations.go
export interface Organization {
readonly id: string
Expand Down Expand Up @@ -470,18 +496,6 @@ export interface PatchGroupRequest {
readonly avatar_url?: string
}

// From codersdk/config.go
export interface PprofConfig {
readonly enabled: boolean
readonly address: string
}

// From codersdk/config.go
export interface PrometheusConfig {
readonly enabled: boolean
readonly address: string
}

// From codersdk/provisionerdaemons.go
export interface ProvisionerDaemon {
readonly id: string
Expand Down Expand Up @@ -550,21 +564,31 @@ export interface ServerSentEvent {
readonly data: any
}

// From codersdk/config.go
export interface TLSConfig {
readonly tls_enable: boolean
readonly tls_cert_files: string[]
readonly tls_client_ca_file: string
readonly tls_client_auth: string
readonly tls_key_files: string[]
readonly tls_min_version: string
// 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/config.go
export interface TelemetryConfig {
readonly enable: boolean
readonly trace_enable: boolean
readonly url: 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
Expand Down