use clearer args without vararg

mafredri · mafredri · commit 28324ae13c38 · 2023-09-01T12:59:38.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -118,7 +118,7 @@ func (r *RootCmd) Core() []*clibase.Cmd {
 }
 
 func (r *RootCmd) AGPL() []*clibase.Cmd {
-	all := append(r.Core(), r.Server( /* Do not import coderd here. */ ))
+	all := append(r.Core(), r.Server( /* Do not import coderd here. */ nil))
 	return all
 }
 
diff --git a/cli/server.go b/cli/server.go
@@ -305,14 +305,13 @@ func enablePrometheus(
 	), nil
 }
 
-func (r *RootCmd) Server(optionalNewAPI ...func(context.Context, *coderd.Options) (*coderd.API, io.Closer, error)) *clibase.Cmd {
-	if len(optionalNewAPI) == 0 {
-		optionalNewAPI = append(optionalNewAPI, func(_ context.Context, o *coderd.Options) (*coderd.API, io.Closer, error) {
+func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.API, io.Closer, error)) *clibase.Cmd {
+	if newAPI == nil {
+		newAPI = func(_ context.Context, o *coderd.Options) (*coderd.API, io.Closer, error) {
 			api := coderd.New(o)
 			return api, api, nil
-		})
+		}
 	}
-	newAPI := optionalNewAPI[0]
 
 	var (
 		vals = new(codersdk.DeploymentValues)
diff --git a/cli/server_slim.go b/cli/server_slim.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coder/coder/v2/cli/cliui"
 )
 
-func (r *RootCmd) Server() *clibase.Cmd {
+func (r *RootCmd) Server(_ func()) *clibase.Cmd {
 	root := &clibase.Cmd{
 		Use:   "server",
 		Short: "Start a Coder server",
diff --git a/enterprise/cli/root.go b/enterprise/cli/root.go
@@ -11,7 +11,7 @@ type RootCmd struct {
 
 func (r *RootCmd) enterpriseOnly() []*clibase.Cmd {
 	return []*clibase.Cmd{
-		r.Server(),
+		r.Server(nil),
 		r.workspaceProxy(),
 		r.features(),
 		r.licenses(),
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -25,7 +25,7 @@ import (
 	agplcoderd "github.com/coder/coder/v2/coderd"
 )
 
-func (r *RootCmd) Server() *clibase.Cmd {
+func (r *RootCmd) Server(_ func()) *clibase.Cmd {
 	cmd := r.RootCmd.Server(func(ctx context.Context, options *agplcoderd.Options) (*agplcoderd.API, io.Closer, error) {
 		if options.DeploymentValues.DERP.Server.RelayURL.String() != "" {
 			_, err := url.Parse(options.DeploymentValues.DERP.Server.RelayURL.String())

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (r RootCmd) Core() []clibase.Cmd {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func (r RootCmd) AGPL() []clibase.Cmd {`
`121`		`- all := append(r.Core(), r.Server( /* Do not import coderd here. */ ))`
	`121`	`+ all := append(r.Core(), r.Server( /* Do not import coderd here. */ nil))`
`122`	`122`	`return all`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/coder/coder/v2/cli/cliui"`
`12`	`12`	`)`
`13`	`13`
`14`		`-func (r RootCmd) Server() clibase.Cmd {`
	`14`	`+func (r RootCmd) Server(_ func()) clibase.Cmd {`
`15`	`15`	`root := &clibase.Cmd{`
`16`	`16`	`Use: "server",`
`17`	`17`	`Short: "Start a Coder server",`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`agplcoderd "github.com/coder/coder/v2/coderd"`
`26`	`26`	`)`
`27`	`27`
`28`		`-func (r RootCmd) Server() clibase.Cmd {`
	`28`	`+func (r RootCmd) Server(_ func()) clibase.Cmd {`
`29`	`29`	`cmd := r.RootCmd.Server(func(ctx context.Context, options agplcoderd.Options) (agplcoderd.API, io.Closer, error) {`
`30`	`30`	`if options.DeploymentValues.DERP.Server.RelayURL.String() != "" {`
`31`	`31`	`_, err := url.Parse(options.DeploymentValues.DERP.Server.RelayURL.String())`