chore: deconflict internal drpc package

Emyrk · Emyrk · commit 61c2ff94fa4a · 2025-05-12T09:45:58.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -1447,7 +1447,7 @@ func newProvisionerDaemon(
 	for _, provisionerType := range provisionerTypes {
 		switch provisionerType {
 		case codersdk.ProvisionerTypeEcho:
-			echoClient, echoServer := drpc.MemTransportPipe()
+			echoClient, echoServer := drpcsdk.MemTransportPipe()
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -1481,7 +1481,7 @@ func newProvisionerDaemon(
 			}
 
 			tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
-			terraformClient, terraformServer := drpc.MemTransportPipe()
+			terraformClient, terraformServer := drpcsdk.MemTransportPipe()
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1725,7 +1725,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name st
 
 func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string) (client proto.DRPCProvisionerDaemonClient, err error) {
 	tracer := api.TracerProvider.Tracer(tracing.TracerName)
-	clientSession, serverSession := drpc.MemTransportPipe()
+	clientSession, serverSession := drpcsdk.MemTransportPipe()
 	defer func() {
 		if err != nil {
 			_ = clientSession.Close()
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -657,7 +657,7 @@ func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string,
 	// seems t.TempDir() is not safe to call from a different goroutine
 	workDir := t.TempDir()
 
-	echoClient, echoServer := drpc.MemTransportPipe()
+	echoClient, echoServer := drpcsdk.MemTransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	t.Cleanup(func() {
 		_ = echoClient.Close()
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -26,6 +26,7 @@ import (
 	protobuf "google.golang.org/protobuf/proto"
 
 	"cdr.dev/slog"
+	"github.com/coder/coder/v2/codersdk/drpcsdk"
 
 	"github.com/coder/quartz"
 
@@ -43,7 +44,6 @@ import (
 	"github.com/coder/coder/v2/coderd/tracing"
 	"github.com/coder/coder/v2/coderd/wspubsub"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/codersdk/drpc"
 	"github.com/coder/coder/v2/provisioner"
 	"github.com/coder/coder/v2/provisionerd/proto"
 	"github.com/coder/coder/v2/provisionersdk"
@@ -707,8 +707,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 	default:
 		return nil, failJob(fmt.Sprintf("unsupported storage method: %s", job.StorageMethod))
 	}
-	if protobuf.Size(protoJob) > drpc.MaxMessageSize {
-		return nil, failJob(fmt.Sprintf("payload was too big: %d > %d", protobuf.Size(protoJob), drpc.MaxMessageSize))
+	if protobuf.Size(protoJob) > drpcsdk.MaxMessageSize {
+		return nil, failJob(fmt.Sprintf("payload was too big: %d > %d", protobuf.Size(protoJob), drpcsdk.MaxMessageSize))
 	}
 
 	return protoJob, err
diff --git a/codersdk/drpcsdk/transport.go b/codersdk/drpcsdk/transport.go
@@ -1,4 +1,4 @@
-package drpc
+package drpcsdk
 
 import (
 	"context"
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -332,7 +332,7 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione
 		_ = wsNetConn.Close()
 		return nil, xerrors.Errorf("multiplex client: %w", err)
 	}
-	return proto.NewDRPCProvisionerDaemonClient(drpc.MultiplexedConn(session)), nil
+	return proto.NewDRPCProvisionerDaemonClient(drpcsdk.MultiplexedConn(session)), nil
 }
 
 type ProvisionerKeyTags map[string]string
diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go
@@ -173,7 +173,7 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 				return err
 			}
 
-			terraformClient, terraformServer := drpc.MemTransportPipe()
+			terraformClient, terraformServer := drpcsdk.MemTransportPipe()
 			go func() {
 				<-ctx.Done()
 				_ = terraformClient.Close()
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -344,7 +344,7 @@ func newExternalProvisionerDaemon(t testing.TB, client *codersdk.Client, org uui
 		return nil
 	}
 
-	provisionerClient, provisionerSrv := drpc.MemTransportPipe()
+	provisionerClient, provisionerSrv := drpcsdk.MemTransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	serveDone := make(chan struct{})
 	t.Cleanup(func() {
diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
@@ -396,7 +396,7 @@ func TestProvisionerDaemonServe(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
-		terraformClient, terraformServer := drpc.MemTransportPipe()
+		terraformClient, terraformServer := drpcsdk.MemTransportPipe()
 		go func() {
 			<-ctx.Done()
 			_ = terraformClient.Close()
diff --git a/provisioner/echo/serve_test.go b/provisioner/echo/serve_test.go
@@ -20,7 +20,7 @@ func TestEcho(t *testing.T) {
 	workdir := t.TempDir()
 
 	// Create an in-memory provisioner to communicate with.
-	client, server := drpc.MemTransportPipe()
+	client, server := drpcsdk.MemTransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	t.Cleanup(func() {
 		_ = client.Close()
diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
@@ -53,7 +53,7 @@ func setupProvisioner(t *testing.T, opts *provisionerServeOptions) (context.Cont
 		logger := testutil.Logger(t)
 		opts.logger = &logger
 	}
-	client, server := drpc.MemTransportPipe()
+	client, server := drpcsdk.MemTransportPipe()
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	serverErr := make(chan error, 1)
 	t.Cleanup(func() {
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -1107,7 +1107,7 @@ func createProvisionerDaemonClient(t *testing.T, done <-chan struct{}, server pr
 			return &proto.Empty{}, nil
 		}
 	}
-	clientPipe, serverPipe := drpc.MemTransportPipe()
+	clientPipe, serverPipe := drpcsdk.MemTransportPipe()
 	t.Cleanup(func() {
 		_ = clientPipe.Close()
 		_ = serverPipe.Close()
@@ -1143,7 +1143,7 @@ func createProvisionerDaemonClient(t *testing.T, done <-chan struct{}, server pr
 // to the server implementation provided.
 func createProvisionerClient(t *testing.T, done <-chan struct{}, server provisionerTestServer) sdkproto.DRPCProvisionerClient {
 	t.Helper()
-	clientPipe, serverPipe := drpc.MemTransportPipe()
+	clientPipe, serverPipe := drpcsdk.MemTransportPipe()
 	t.Cleanup(func() {
 		_ = clientPipe.Close()
 		_ = serverPipe.Close()
diff --git a/provisionersdk/serve_test.go b/provisionersdk/serve_test.go
@@ -24,7 +24,7 @@ func TestProvisionerSDK(t *testing.T) {
 	t.Parallel()
 	t.Run("ServeListener", func(t *testing.T) {
 		t.Parallel()
-		client, server := drpc.MemTransportPipe()
+		client, server := drpcsdk.MemTransportPipe()
 		defer client.Close()
 		defer server.Close()
 
@@ -66,7 +66,7 @@ func TestProvisionerSDK(t *testing.T) {
 
 	t.Run("ServeClosedPipe", func(t *testing.T) {
 		t.Parallel()
-		client, server := drpc.MemTransportPipe()
+		client, server := drpcsdk.MemTransportPipe()
 		_ = client.Close()
 		_ = server.Close()
 
diff --git a/tailnet/client.go b/tailnet/client.go
@@ -20,5 +20,5 @@ func NewDRPCClient(conn net.Conn, logger slog.Logger) (proto.DRPCTailnetClient,
 	if err != nil {
 		return nil, xerrors.Errorf("multiplex client: %w", err)
 	}
-	return proto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)), nil
+	return proto.NewDRPCTailnetClient(drpcsdk.MultiplexedConn(session)), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package drpc`
	`1`	`+package drpcsdk`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione`
`332`	`332`	`_ = wsNetConn.Close()`
`333`	`333`	`return nil, xerrors.Errorf("multiplex client: %w", err)`
`334`	`334`	`}`
`335`		`- return proto.NewDRPCProvisionerDaemonClient(drpc.MultiplexedConn(session)), nil`
	`335`	`+ return proto.NewDRPCProvisionerDaemonClient(drpcsdk.MultiplexedConn(session)), nil`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`type ProvisionerKeyTags map[string]string`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`173`	`173`	`return err`
`174`	`174`	`}`
`175`	`175`
`176`		`- terraformClient, terraformServer := drpc.MemTransportPipe()`
	`176`	`+ terraformClient, terraformServer := drpcsdk.MemTransportPipe()`
`177`	`177`	`go func() {`
`178`	`178`	`<-ctx.Done()`
`179`	`179`	`_ = terraformClient.Close()`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ func newExternalProvisionerDaemon(t testing.TB, client *codersdk.Client, org uui`
`344`	`344`	`return nil`
`345`	`345`	`}`
`346`	`346`
`347`		`- provisionerClient, provisionerSrv := drpc.MemTransportPipe()`
	`347`	`+ provisionerClient, provisionerSrv := drpcsdk.MemTransportPipe()`
`348`	`348`	`ctx, cancelFunc := context.WithCancel(context.Background())`
`349`	`349`	`serveDone := make(chan struct{})`
`350`	`350`	`t.Cleanup(func() {`