Ensure closure on error

mafredri · mafredri · commit b93a8feba171 · 2023-06-13T16:46:04.000Z
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -35,7 +35,7 @@ import (
 // New constructs an Enterprise coderd API instance.
 // This handler is designed to wrap the AGPL Coder code and
 // layer Enterprise functionality on top as much as possible.
-func New(ctx context.Context, options *Options) (*API, error) {
+func New(ctx context.Context, options *Options) (api *API, err error) {
 	if options.EntitlementsUpdateInterval == 0 {
 		options.EntitlementsUpdateInterval = 10 * time.Minute
 	}
@@ -52,13 +52,18 @@ func New(ctx context.Context, options *Options) (*API, error) {
 		options.Options.Authorizer = rbac.NewCachingAuthorizer(options.PrometheusRegistry)
 	}
 	ctx, cancelFunc := context.WithCancel(ctx)
-	api := &API{
+	api = &API{
 		ctx:    ctx,
 		cancel: cancelFunc,
 
 		AGPL:    coderd.New(options.Options),
 		Options: options,
 	}
+	defer func() {
+		if err != nil {
+			_ = api.Close()
+		}
+	}()
 
 	api.AGPL.Options.SetUserGroups = api.setUserGroups
 
@@ -312,8 +317,12 @@ type API struct {
 
 func (api *API) Close() error {
 	api.cancel()
-	_ = api.replicaManager.Close()
-	_ = api.derpMesh.Close()
+	if api.replicaManager != nil {
+		_ = api.replicaManager.Close()
+	}
+	if api.derpMesh != nil {
+		_ = api.derpMesh.Close()
+	}
 	return api.AGPL.Close()
 }
 
