Merge branch 'readclose' into apps

kylecarbs · kylecarbs · commit 4d8b257ae91a · 2022-06-01T03:07:03.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -102,7 +102,6 @@ func New(options *Options) *API {
 			httpmw.RateLimitPerMinute(options.APIRateLimit),
 			apiKeyMiddleware,
 			httpmw.ExtractUserParam(api.Database),
-			authRolesMiddleware,
 		)
 		r.Get("/*", api.workspaceAppsProxyPath)
 	})
diff --git a/provisionersdk/serve.go b/provisionersdk/serve.go
@@ -32,8 +32,8 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
 		config := yamux.DefaultConfig()
 		config.LogOutput = io.Discard
 		stdio, err := yamux.Server(&readWriteCloser{
-			ReadCloser:  os.Stdin,
-			WriteCloser: os.Stdout,
+			ReadCloser: os.Stdin,
+			Writer:     os.Stdout,
 		}, config)
 		if err != nil {
 			return xerrors.Errorf("create yamux: %w", err)
@@ -70,3 +70,8 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
 	}
 	return nil
 }
+
+type readWriteCloser struct {
+	io.ReadCloser
+	io.Writer
+}
diff --git a/provisionersdk/transport.go b/provisionersdk/transport.go
@@ -3,7 +3,7 @@ package provisionersdk
 import (
 	"context"
 	"io"
-	"sync"
+	"net"
 
 	"github.com/hashicorp/yamux"
 	"storj.io/drpc"
@@ -18,22 +18,14 @@ const (
 
 // TransportPipe creates an in-memory pipe for dRPC transport.
 func TransportPipe() (*yamux.Session, *yamux.Session) {
-	clientReader, clientWriter := io.Pipe()
-	serverReader, serverWriter := io.Pipe()
+	c1, c2 := net.Pipe()
 	yamuxConfig := yamux.DefaultConfig()
 	yamuxConfig.LogOutput = io.Discard
-	client, err := yamux.Client(&readWriteCloser{
-		ReadCloser:  clientReader,
-		WriteCloser: serverWriter,
-	}, yamuxConfig)
+	client, err := yamux.Client(c1, yamuxConfig)
 	if err != nil {
 		panic(err)
 	}
-
-	server, err := yamux.Server(&readWriteCloser{
-		ReadCloser:  serverReader,
-		WriteCloser: clientWriter,
-	}, yamuxConfig)
+	server, err := yamux.Server(c2, yamuxConfig)
 	if err != nil {
 		panic(err)
 	}
@@ -45,22 +37,6 @@ func Conn(session *yamux.Session) drpc.Conn {
 	return &multiplexedDRPC{session}
 }
 
-type readWriteCloser struct {
-	closeMutex sync.Mutex
-	io.ReadCloser
-	io.WriteCloser
-}
-
-func (c *readWriteCloser) Close() error {
-	c.closeMutex.Lock()
-	defer c.closeMutex.Unlock()
-	err := c.ReadCloser.Close()
-	if err != nil {
-		return err
-	}
-	return c.WriteCloser.Close()
-}
-
 // Allows concurrent requests on a single dRPC connection.
 // Required for calling functions concurrently.
 type multiplexedDRPC struct {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ func New(options Options) API {`
`102`	`102`	`httpmw.RateLimitPerMinute(options.APIRateLimit),`
`103`	`103`	`apiKeyMiddleware,`
`104`	`104`	`httpmw.ExtractUserParam(api.Database),`
`105`		`- authRolesMiddleware,`
`106`	`105`	`)`
`107`	`106`	`r.Get("/*", api.workspaceAppsProxyPath)`
`108`	`107`	`})`