Server boots

ammario · ammario · commit 03b08fab4b59 · 2023-02-26T02:20:29.000Z
diff --git a/cli/bigcli/option.go b/cli/bigcli/option.go
@@ -28,7 +28,7 @@ func (a Annotations) Mark(key string, value string) Annotations {
 	} else {
 		aa = make(Annotations)
 	}
-	a[key] = value
+	aa[key] = value
 	return aa
 }
 
@@ -178,7 +178,11 @@ func (os *OptionSet) SetDefaults() error {
 		}
 		if opt.Value == nil {
 			merr = multierror.Append(
-				merr, xerrors.Errorf("parse %q: no Value field set", opt.Name),
+				merr,
+				xerrors.Errorf(
+					"parse %q: no Value field set\nFull opt: %+v",
+					opt.Name, opt,
+				),
 			)
 			continue
 		}
diff --git a/cli/bigcli/values.go b/cli/bigcli/values.go
@@ -34,6 +34,10 @@ func (Int64) Type() string {
 type Bool bool
 
 func (b *Bool) Set(s string) error {
+	if s == "" {
+		*b = Bool(false)
+		return nil
+	}
 	bb, err := strconv.ParseBool(s)
 	*b = Bool(bb)
 	return err
diff --git a/cli/root.go b/cli/root.go
@@ -109,7 +109,7 @@ func Core() []*cobra.Command {
 }
 
 func AGPL() []*cobra.Command {
-	all := append(Core(), Server(deployment.NewViper(), func(_ context.Context, o *coderd.Options) (*coderd.API, io.Closer, error) {
+	all := append(Core(), Server(func(_ context.Context, o *coderd.Options) (*coderd.API, io.Closer, error) {
 		api := coderd.New(o)
 		return api, api, nil
 	}))
diff --git a/cli/server.go b/cli/server.go
@@ -172,6 +172,7 @@ func serverOptions(c *codersdk.DeploymentConfig) *bigcli.OptionSet {
 			Flag:       "tls-redirect-http-to-https",
 			Default:    "true",
 			Hidden:     true,
+			Value:      &c.TLS.RedirectHTTP,
 			UseInstead: []bigcli.Option{redirectToAccessURL},
 		},
 		{
@@ -723,7 +724,24 @@ func Server(newAPI func(context.Context, *coderd.Options) (*coderd.API, io.Close
 			defer cancel()
 
 			cfg := &codersdk.DeploymentConfig{
-				TLS: &codersdk.TLSConfig{},
+				TLS:         &codersdk.TLSConfig{},
+				Logging:     &codersdk.LoggingConfig{},
+				Provisioner: &codersdk.ProvisionerConfig{},
+				RateLimit:   &codersdk.RateLimitConfig{},
+				Dangerous:   &codersdk.DangerousConfig{},
+				Trace:       &codersdk.TraceConfig{},
+				Telemetry:   &codersdk.TelemetryConfig{},
+				OIDC:        &codersdk.OIDCConfig{},
+				OAuth2: &codersdk.OAuth2Config{
+					Github: &codersdk.OAuth2GithubConfig{},
+				},
+				Pprof:      &codersdk.PprofConfig{},
+				Prometheus: &codersdk.PrometheusConfig{},
+				DERP: &codersdk.DERP{
+					Server: &codersdk.DERPServerConfig{},
+					Config: &codersdk.DERPConfig{},
+				},
+				Swagger: &codersdk.SwaggerConfig{},
 			}
 			cliOpts := serverOptions(cfg)
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (a Annotations) Mark(key string, value string) Annotations {`
`28`	`28`	`} else {`
`29`	`29`	`aa = make(Annotations)`
`30`	`30`	`}`
`31`		`- a[key] = value`
	`31`	`+ aa[key] = value`
`32`	`32`	`return aa`
`33`	`33`	`}`
`34`	`34`
`@@ -178,7 +178,11 @@ func (os *OptionSet) SetDefaults() error {`
`178`	`178`	`}`
`179`	`179`	`if opt.Value == nil {`
`180`	`180`	`merr = multierror.Append(`
`181`		`- merr, xerrors.Errorf("parse %q: no Value field set", opt.Name),`
	`181`	`+ merr,`
	`182`	`+ xerrors.Errorf(`
	`183`	`+ "parse %q: no Value field set\nFull opt: %+v",`
	`184`	`+ opt.Name, opt,`
	`185`	`+ ),`
`182`	`186`	`)`
`183`	`187`	`continue`
`184`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func Core() []*cobra.Command {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`func AGPL() []*cobra.Command {`
`112`		`- all := append(Core(), Server(deployment.NewViper(), func(_ context.Context, o coderd.Options) (coderd.API, io.Closer, error) {`
	`112`	`+ all := append(Core(), Server(func(_ context.Context, o coderd.Options) (coderd.API, io.Closer, error) {`
`113`	`113`	`api := coderd.New(o)`
`114`	`114`	`return api, api, nil`
`115`	`115`	`}))`