fixup! fix: Improve closure of provisioner and agent tailnet dial

mafredri · mafredri · commit 1dfbb39197b9 · 2023-02-14T14:16:09.000Z
diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
@@ -46,7 +46,7 @@ func TestProvisionerDaemonServe(t *testing.T) {
 			codersdk.ProvisionerTypeEcho,
 		}, map[string]string{})
 		require.NoError(t, err)
-		srv.DRPCConn().Close()
+		srv.Close()
 	})
 
 	t.Run("OrganizationNoPerms", func(t *testing.T) {
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -521,7 +521,7 @@ func (p *Server) closeWithError(err error) error {
 	p.opts.Logger.Debug(context.Background(), "closing server with error", slog.Error(err))
 
 	if c, ok := p.clientValue.Load().(proto.DRPCProvisionerDaemonClient); ok {
-		_ = c.Close()
+		_ = c.DRPCConn().Close()
 	}
 
 	return err

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ func (p *Server) closeWithError(err error) error {`
`521`	`521`	`p.opts.Logger.Debug(context.Background(), "closing server with error", slog.Error(err))`
`522`	`522`
`523`	`523`	`if c, ok := p.clientValue.Load().(proto.DRPCProvisionerDaemonClient); ok {`
`524`		`- _ = c.Close()`
	`524`	`+ _ = c.DRPCConn().Close()`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`return err`