Jun 1, 2022 · May 31, 2022
diff --git a/provisionersdk/serve.go b/provisionersdk/serve.go
 ifoptions.Listener==nil {
 config:=yamux.DefaultConfig()
 config.LogOutput=io.Discard
 stdio,err:=yamux.Server(readWriteCloser{
 stdio,err:=yamux.Server(&readWriteCloser{
 ReadCloser:os.Stdin,
 Writer:os.Stdout,
 },config)
 // short-lived processes that can be executed concurrently.
 err=srv.Serve(ctx,options.Listener)
 iferr!=nil {
 iferrors.Is(err,io.EOF) {
 returnnil
 }
 iferrors.Is(err,context.Canceled) {
 returnnil
 }
 }
 returnnil
 }

 typereadWriteCloserstruct {
 io.ReadCloser
 io.Writer
 }
diff --git a/provisionersdk/transport.go b/provisionersdk/transport.go
 import (
 "context"
 "io"
 "net"

 "github.com/hashicorp/yamux"
 "storj.io/drpc"

 // 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,
 Writer:     serverWriter,
 }, yamuxConfig)
 client, err := yamux.Client(c1, yamuxConfig)
 if err != nil {
 panic(err)
 }

 server, err := yamux.Server(&readWriteCloser{
 ReadCloser: serverReader,
 Writer:     clientWriter,
 }, yamuxConfig)
 server, err := yamux.Server(c2, yamuxConfig)
 if err != nil {
 panic(err)
 }
 return &multiplexedDRPC{session}
 }

 type readWriteCloser struct {
 io.ReadCloser
 io.Writer
 }

 // 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
Expand Up		@@ -31,7 +31,7 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
		ifoptions.Listener==nil {
		config:=yamux.DefaultConfig()
		config.LogOutput=io.Discard
		stdio,err:=yamux.Server(readWriteCloser{
		stdio,err:=yamux.Server(&readWriteCloser{
		ReadCloser:os.Stdin,
		Writer:os.Stdout,
		},config)
Expand All		@@ -54,6 +54,9 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
		// short-lived processes that can be executed concurrently.
		err=srv.Serve(ctx,options.Listener)
		iferr!=nil {
		iferrors.Is(err,io.EOF) {
		returnnil
		}
		iferrors.Is(err,context.Canceled) {
		returnnil
		}
Expand All		@@ -67,3 +70,8 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
		}
		returnnil
		}

		typereadWriteCloserstruct {
		io.ReadCloser
		io.Writer
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,7 @@ package provisionersdk
		import (
		"context"
		"io"
		"net"

		"github.com/hashicorp/yamux"
		"storj.io/drpc"
Expand All		@@ -17,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,
		Writer: serverWriter,
		}, yamuxConfig)
		client, err := yamux.Client(c1, yamuxConfig)
		if err != nil {
		panic(err)
		}

		server, err := yamux.Server(&readWriteCloser{
		ReadCloser: serverReader,
		Writer: clientWriter,
		}, yamuxConfig)
		server, err := yamux.Server(c2, yamuxConfig)
		if err != nil {
		panic(err)
		}
Expand All		@@ -44,11 +37,6 @@ func Conn(session *yamux.Session) drpc.Conn {
		return &multiplexedDRPC{session}
		}

		type readWriteCloser struct {
		io.ReadCloser
		io.Writer
		}

		// Allows concurrent requests on a single dRPC connection.
		// Required for calling functions concurrently.
		type multiplexedDRPC struct {
Expand Down