Skip to content

Commit 552e438

Browse files
f0sself0ssel
committed
move to default
1 parent 429f91b commit 552e438

File tree

2 files changed

+89
-88
lines changed

2 files changed

+89
-88
lines changed

‎cli/deployment/config.go

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -36,46 +36,46 @@ func newConfig() *codersdk.DeploymentConfig {
3636
Usage: "Bind address of the server.",
3737
Flag: "address",
3838
Shorthand: "a",
39-
Value: "127.0.0.1:3000",
39+
Default: "127.0.0.1:3000",
4040
},
4141
AutobuildPollInterval: &codersdk.DeploymentConfigField[time.Duration]{
42-
Name: "Autobuild Poll Interval",
43-
Usage: "Interval to poll for scheduled workspace builds.",
44-
Flag: "autobuild-poll-interval",
45-
Hidden: true,
46-
Value: time.Minute,
42+
Name: "Autobuild Poll Interval",
43+
Usage: "Interval to poll for scheduled workspace builds.",
44+
Flag: "autobuild-poll-interval",
45+
Hidden: true,
46+
Default: time.Minute,
4747
},
4848
DERP: &codersdk.DERP{
4949
Server: &codersdk.DERPServerConfig{
5050
Enable: &codersdk.DeploymentConfigField[bool]{
51-
Name: "DERP Server Enable",
52-
Usage: "Whether to enable or disable the embedded DERP relay server.",
53-
Flag: "derp-server-enable",
54-
Value: true,
51+
Name: "DERP Server Enable",
52+
Usage: "Whether to enable or disable the embedded DERP relay server.",
53+
Flag: "derp-server-enable",
54+
Default: true,
5555
},
5656
RegionID: &codersdk.DeploymentConfigField[int]{
57-
Name: "DERP Server Region ID",
58-
Usage: "Region ID to use for the embedded DERP server.",
59-
Flag: "derp-server-region-id",
60-
Value: 999,
57+
Name: "DERP Server Region ID",
58+
Usage: "Region ID to use for the embedded DERP server.",
59+
Flag: "derp-server-region-id",
60+
Default: 999,
6161
},
6262
RegionCode: &codersdk.DeploymentConfigField[string]{
63-
Name: "DERP Server Region Code",
64-
Usage: "Region code to use for the embedded DERP server.",
65-
Flag: "derp-server-region-code",
66-
Value: "coder",
63+
Name: "DERP Server Region Code",
64+
Usage: "Region code to use for the embedded DERP server.",
65+
Flag: "derp-server-region-code",
66+
Default: "coder",
6767
},
6868
RegionName: &codersdk.DeploymentConfigField[string]{
69-
Name: "DERP Server Region Name",
70-
Usage: "Region name that for the embedded DERP server.",
71-
Flag: "derp-server-region-name",
72-
Value: "Coder Embedded Relay",
69+
Name: "DERP Server Region Name",
70+
Usage: "Region name that for the embedded DERP server.",
71+
Flag: "derp-server-region-name",
72+
Default: "Coder Embedded Relay",
7373
},
7474
STUNAddresses: &codersdk.DeploymentConfigField[[]string]{
75-
Name: "DERP Server STUN Addresses",
76-
Usage: "Addresses for STUN servers to establish P2P connections. Set empty to disable P2P connections.",
77-
Flag: "derp-server-stun-addresses",
78-
Value: []string{"stun.l.google.com:19302"},
75+
Name: "DERP Server STUN Addresses",
76+
Usage: "Addresses for STUN servers to establish P2P connections. Set empty to disable P2P connections.",
77+
Flag: "derp-server-stun-addresses",
78+
Default: []string{"stun.l.google.com:19302"},
7979
},
8080
RelayURL: &codersdk.DeploymentConfigField[string]{
8181
Name: "DERP Server Relay URL",
@@ -104,10 +104,10 @@ func newConfig() *codersdk.DeploymentConfig {
104104
Flag: "prometheus-enable",
105105
},
106106
Address: &codersdk.DeploymentConfigField[string]{
107-
Name: "Prometheus Address",
108-
Usage: "The bind address to serve prometheus metrics.",
109-
Flag: "prometheus-address",
110-
Value: "127.0.0.1:2112",
107+
Name: "Prometheus Address",
108+
Usage: "The bind address to serve prometheus metrics.",
109+
Flag: "prometheus-address",
110+
Default: "127.0.0.1:2112",
111111
},
112112
},
113113
Pprof: &codersdk.PprofConfig{
@@ -117,10 +117,10 @@ func newConfig() *codersdk.DeploymentConfig {
117117
Flag: "pprof-enable",
118118
},
119119
Address: &codersdk.DeploymentConfigField[string]{
120-
Name: "Pprof Address",
121-
Usage: "The bind address to serve pprof.",
122-
Flag: "pprof-address",
123-
Value: "127.0.0.1:6060",
120+
Name: "Pprof Address",
121+
Usage: "The bind address to serve pprof.",
122+
Flag: "pprof-address",
123+
Default: "127.0.0.1:6060",
124124
},
125125
},
126126
ProxyTrustedHeaders: &codersdk.DeploymentConfigField[[]string]{
@@ -134,10 +134,10 @@ func newConfig() *codersdk.DeploymentConfig {
134134
Usage: "Origin addresses to respect \"proxy-trusted-headers\". e.g. example.com",
135135
},
136136
CacheDirectory: &codersdk.DeploymentConfigField[string]{
137-
Name: "Cache Directory",
138-
Usage: "The directory to cache temporary files. If unspecified and $CACHE_DIRECTORY is set, it will be used for compatibility with systemd.",
139-
Flag: "cache-dir",
140-
Value: defaultCacheDir(),
137+
Name: "Cache Directory",
138+
Usage: "The directory to cache temporary files. If unspecified and $CACHE_DIRECTORY is set, it will be used for compatibility with systemd.",
139+
Flag: "cache-dir",
140+
Default: defaultCacheDir(),
141141
},
142142
InMemoryDatabase: &codersdk.DeploymentConfigField[bool]{
143143
Name: "In Memory Database",
@@ -146,10 +146,10 @@ func newConfig() *codersdk.DeploymentConfig {
146146
Hidden: true,
147147
},
148148
ProvisionerDaemons: &codersdk.DeploymentConfigField[int]{
149-
Name: "Provisioner Daemons",
150-
Usage: "Number of provisioner daemons to create on start. If builds are stuck in queued state for a long time, consider increasing this.",
151-
Flag: "provisioner-daemons",
152-
Value: 3,
149+
Name: "Provisioner Daemons",
150+
Usage: "Number of provisioner daemons to create on start. If builds are stuck in queued state for a long time, consider increasing this.",
151+
Flag: "provisioner-daemons",
152+
Default: 3,
153153
},
154154
PostgresURL: &codersdk.DeploymentConfigField[string]{
155155
Name: "Postgres Connection URL",
@@ -192,10 +192,10 @@ func newConfig() *codersdk.DeploymentConfig {
192192
},
193193
OIDC: &codersdk.OIDCConfig{
194194
AllowSignups: &codersdk.DeploymentConfigField[bool]{
195-
Name: "OIDC Allow Signups",
196-
Usage: "Whether new users can sign up with OIDC.",
197-
Flag: "oidc-allow-signups",
198-
Value: true,
195+
Name: "OIDC Allow Signups",
196+
Usage: "Whether new users can sign up with OIDC.",
197+
Flag: "oidc-allow-signups",
198+
Default: true,
199199
},
200200
ClientID: &codersdk.DeploymentConfigField[string]{
201201
Name: "OIDC Client ID",
@@ -218,32 +218,32 @@ func newConfig() *codersdk.DeploymentConfig {
218218
Flag: "oidc-issuer-url",
219219
},
220220
Scopes: &codersdk.DeploymentConfigField[[]string]{
221-
Name: "OIDC Scopes",
222-
Usage: "Scopes to grant when authenticating with OIDC.",
223-
Flag: "oidc-scopes",
224-
Value: []string{oidc.ScopeOpenID, "profile", "email"},
221+
Name: "OIDC Scopes",
222+
Usage: "Scopes to grant when authenticating with OIDC.",
223+
Flag: "oidc-scopes",
224+
Default: []string{oidc.ScopeOpenID, "profile", "email"},
225225
},
226226
},
227227

228228
Telemetry: &codersdk.TelemetryConfig{
229229
Enable: &codersdk.DeploymentConfigField[bool]{
230-
Name: "Telemetry Enable",
231-
Usage: "Whether telemetry is enabled or not. Coder collects anonymized usage data to help improve our product.",
232-
Flag: "telemetry",
233-
Value: flag.Lookup("test.v") == nil,
230+
Name: "Telemetry Enable",
231+
Usage: "Whether telemetry is enabled or not. Coder collects anonymized usage data to help improve our product.",
232+
Flag: "telemetry",
233+
Default: flag.Lookup("test.v") == nil,
234234
},
235235
Trace: &codersdk.DeploymentConfigField[bool]{
236-
Name: "Telemetry Trace",
237-
Usage: "Whether Opentelemetry traces are sent to Coder. Coder collects anonymized application tracing to help improve our product. Disabling telemetry also disables this option.",
238-
Flag: "telemetry-trace",
239-
Value: flag.Lookup("test.v") == nil,
236+
Name: "Telemetry Trace",
237+
Usage: "Whether Opentelemetry traces are sent to Coder. Coder collects anonymized application tracing to help improve our product. Disabling telemetry also disables this option.",
238+
Flag: "telemetry-trace",
239+
Default: flag.Lookup("test.v") == nil,
240240
},
241241
URL: &codersdk.DeploymentConfigField[string]{
242-
Name: "Telemetry URL",
243-
Usage: "URL to send telemetry.",
244-
Flag: "telemetry-url",
245-
Hidden: true,
246-
Value: "https://telemetry.coder.com",
242+
Name: "Telemetry URL",
243+
Usage: "URL to send telemetry.",
244+
Flag: "telemetry-url",
245+
Hidden: true,
246+
Default: "https://telemetry.coder.com",
247247
},
248248
},
249249
TLS: &codersdk.TLSConfig{
@@ -263,21 +263,21 @@ func newConfig() *codersdk.DeploymentConfig {
263263
Flag: "tls-client-ca-file",
264264
},
265265
ClientAuth: &codersdk.DeploymentConfigField[string]{
266-
Name: "TLS Client Auth",
267-
Usage: "Policy the server will follow for TLS Client Authentication. Accepted values are \"none\", \"request\", \"require-any\", \"verify-if-given\", or \"require-and-verify\".",
268-
Flag: "tls-client-auth",
269-
Value: "request",
266+
Name: "TLS Client Auth",
267+
Usage: "Policy the server will follow for TLS Client Authentication. Accepted values are \"none\", \"request\", \"require-any\", \"verify-if-given\", or \"require-and-verify\".",
268+
Flag: "tls-client-auth",
269+
Default: "request",
270270
},
271271
KeyFiles: &codersdk.DeploymentConfigField[[]string]{
272272
Name: "TLS Key Files",
273273
Usage: "Paths to the private keys for each of the certificates. It requires a PEM-encoded file.",
274274
Flag: "tls-key-file",
275275
},
276276
MinVersion: &codersdk.DeploymentConfigField[string]{
277-
Name: "TLS Minimum Version",
278-
Usage: "Minimum supported version of TLS. Accepted values are \"tls10\", \"tls11\", \"tls12\" or \"tls13\"",
279-
Flag: "tls-min-version",
280-
Value: "tls12",
277+
Name: "TLS Minimum Version",
278+
Usage: "Minimum supported version of TLS. Accepted values are \"tls10\", \"tls11\", \"tls12\" or \"tls13\"",
279+
Flag: "tls-min-version",
280+
Default: "tls12",
281281
},
282282
},
283283
TraceEnable: &codersdk.DeploymentConfigField[bool]{
@@ -291,10 +291,10 @@ func newConfig() *codersdk.DeploymentConfig {
291291
Flag: "secure-auth-cookie",
292292
},
293293
SSHKeygenAlgorithm: &codersdk.DeploymentConfigField[string]{
294-
Name: "SSH Keygen Algorithm",
295-
Usage: "The algorithm to use for generating ssh keys. Accepted values are \"ed25519\", \"ecdsa\", or \"rsa4096\".",
296-
Flag: "ssh-keygen-algorithm",
297-
Value: "ed25519",
294+
Name: "SSH Keygen Algorithm",
295+
Usage: "The algorithm to use for generating ssh keys. Accepted values are \"ed25519\", \"ecdsa\", or \"rsa4096\".",
296+
Flag: "ssh-keygen-algorithm",
297+
Default: "ed25519",
298298
},
299299
AutoImportTemplates: &codersdk.DeploymentConfigField[[]string]{
300300
Name: "Auto Import Templates",
@@ -303,24 +303,24 @@ func newConfig() *codersdk.DeploymentConfig {
303303
Hidden: true,
304304
},
305305
MetricsCacheRefreshInterval: &codersdk.DeploymentConfigField[time.Duration]{
306-
Name: "Metrics Cache Refresh Interval",
307-
Usage: "How frequently metrics are refreshed",
308-
Flag: "metrics-cache-refresh-interval",
309-
Hidden: true,
310-
Value: time.Hour,
306+
Name: "Metrics Cache Refresh Interval",
307+
Usage: "How frequently metrics are refreshed",
308+
Flag: "metrics-cache-refresh-interval",
309+
Hidden: true,
310+
Default: time.Hour,
311311
},
312312
AgentStatRefreshInterval: &codersdk.DeploymentConfigField[time.Duration]{
313-
Name: "Agent Stat Refresh Interval",
314-
Usage: "How frequently agent stats are recorded",
315-
Flag: "agent-stats-refresh-interval",
316-
Hidden: true,
317-
Value: 10 * time.Minute,
313+
Name: "Agent Stat Refresh Interval",
314+
Usage: "How frequently agent stats are recorded",
315+
Flag: "agent-stats-refresh-interval",
316+
Hidden: true,
317+
Default: 10 * time.Minute,
318318
},
319319
AuditLogging: &codersdk.DeploymentConfigField[bool]{
320320
Name: "Audit Logging",
321321
Usage: "Specifies whether audit logging is enabled.",
322322
Flag: "audit-logging",
323-
Value: true,
323+
Default: true,
324324
Enterprise: true,
325325
},
326326
BrowserOnly: &codersdk.DeploymentConfigField[bool]{
@@ -450,7 +450,7 @@ func setViperDefaults(prefix string, vip *viper.Viper, target interface{}) {
450450
val = reflect.Indirect(val)
451451
typ := val.Type()
452452
if strings.HasPrefix(typ.Name(), "DeploymentConfigField") {
453-
value := val.FieldByName("Value").Interface()
453+
value := val.FieldByName("Default").Interface()
454454
vip.SetDefault(prefix, value)
455455
return
456456
}
@@ -499,7 +499,7 @@ func setFlags(prefix string, flagset *pflag.FlagSet, vip *viper.Viper, target in
499499
usage = fmt.Sprintf("%s\n%s", usage, cliui.Styles.Placeholder.Render("Consumes $"+formatEnv(prefix)))
500500
shorthand := val.FieldByName("Shorthand").String()
501501
hidden := val.FieldByName("Hidden").Bool()
502-
value := val.FieldByName("Value").Interface()
502+
value := val.FieldByName("Default").Interface()
503503

504504
switch value.(type) {
505505
case string:

‎codersdk/deploymentconfig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ type DeploymentConfigField[T Flaggable] struct {
118118
Shorthand string `json:"shorthand"`
119119
Enterprise bool `json:"enterprise"`
120120
Hidden bool `json:"hidden"`
121+
Default T `json:"default"`
121122
Value T `json:"value"`
122123
}
123124

0 commit comments

Comments
 (0)