From 98815eeb5b337684886aff135b4e6bec996883eb Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Mon, 12 May 2025 09:45:13 -0500 Subject: [PATCH] chore: deconflict internal drpc package --- agent/agenttest/client.go | 2 +- cli/server.go | 6 +++--- coderd/coderd.go | 4 ++-- coderd/coderdtest/coderdtest.go | 4 ++-- coderd/provisionerdserver/provisionerdserver.go | 6 +++--- codersdk/agentsdk/agentsdk.go | 2 +- codersdk/{drpc => drpcsdk}/transport.go | 2 +- codersdk/provisionerdaemons.go | 4 ++-- enterprise/cli/provisionerdaemonstart.go | 4 ++-- enterprise/coderd/coderdenttest/coderdenttest.go | 4 ++-- enterprise/coderd/provisionerdaemons_test.go | 4 ++-- provisioner/echo/serve_test.go | 4 ++-- provisioner/terraform/provision_test.go | 4 ++-- provisionerd/provisionerd_test.go | 6 +++--- provisionersdk/serve_test.go | 6 +++--- tailnet/client.go | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) rename codersdk/{drpc => drpcsdk}/transport.go (99%) diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go index a1d14e32a2c55..73fb40e826519 100644 --- a/agent/agenttest/client.go +++ b/agent/agenttest/client.go @@ -24,7 +24,7 @@ import ( agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" - drpcsdk "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/testutil" diff --git a/cli/server.go b/cli/server.go index 48ec8492f0a55..d32ed51c06007 100644 --- a/cli/server.go +++ b/cli/server.go @@ -66,6 +66,7 @@ import ( "github.com/coder/coder/v2/coderd/notifications/reports" "github.com/coder/coder/v2/coderd/runtimeconfig" "github.com/coder/coder/v2/coderd/webpush" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/clilog" @@ -102,7 +103,6 @@ import ( "github.com/coder/coder/v2/coderd/workspaceapps/appurl" "github.com/coder/coder/v2/coderd/workspacestats" "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpc" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/provisioner/echo" "github.com/coder/coder/v2/provisioner/terraform" @@ -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 index d0d3471cdd771..1b4b5746b7f7e 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -84,7 +84,7 @@ import ( "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/coderd/workspacestats" "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/codersdk/healthsdk" "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionersdk" @@ -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 index dbf1f62abfb28..e843d0d748578 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -84,7 +84,7 @@ import ( "github.com/coder/coder/v2/coderd/workspacestats" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/codersdk/healthsdk" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/provisioner/echo" @@ -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 index 68aece517bb2f..a6325eecfd44a 100644 --- 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/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go index 109d14b84d050..8a7ed4d525af4 100644 --- a/codersdk/agentsdk/agentsdk.go +++ b/codersdk/agentsdk/agentsdk.go @@ -22,7 +22,7 @@ import ( "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/codersdk" - drpcsdk "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" tailnetproto "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/websocket" ) diff --git a/codersdk/drpc/transport.go b/codersdk/drpcsdk/transport.go similarity index 99% rename from codersdk/drpc/transport.go rename to codersdk/drpcsdk/transport.go index 55ab521afc17d..84cef5e6d8db1 100644 --- a/codersdk/drpc/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 index 014a68bbce72e..11345a115e07f 100644 --- a/codersdk/provisionerdaemons.go +++ b/codersdk/provisionerdaemons.go @@ -17,7 +17,7 @@ import ( "golang.org/x/xerrors" "github.com/coder/coder/v2/buildinfo" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/codersdk/wsjson" "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionerd/runner" @@ -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 index e0b3e00c63ece..582e14e1c8adc 100644 --- a/enterprise/cli/provisionerdaemonstart.go +++ b/enterprise/cli/provisionerdaemonstart.go @@ -25,7 +25,7 @@ import ( "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/provisionerd" provisionerdproto "github.com/coder/coder/v2/provisionerd/proto" @@ -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 index a72c8c0199695..bd81e5a039599 100644 --- a/enterprise/coderd/coderdenttest/coderdenttest.go +++ b/enterprise/coderd/coderdenttest/coderdenttest.go @@ -25,7 +25,7 @@ import ( "github.com/coder/coder/v2/coderd/database/dbmem" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/enterprise/coderd" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/enterprise/dbcrypt" @@ -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 index a84213f71805f..cdc6267d90971 100644 --- a/enterprise/coderd/provisionerdaemons_test.go +++ b/enterprise/coderd/provisionerdaemons_test.go @@ -25,7 +25,7 @@ import ( "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/provisioner/echo" @@ -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 index dbfdc822eac5a..9168f1be6d22e 100644 --- a/provisioner/echo/serve_test.go +++ b/provisioner/echo/serve_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/echo" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" @@ -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 index ecff965b72984..505fd2df41400 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -26,7 +26,7 @@ import ( "cdr.dev/slog" "cdr.dev/slog/sloggers/slogtest" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" @@ -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 index c711e0d4925c8..a9418d9391c8f 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -21,7 +21,7 @@ import ( "cdr.dev/slog" "cdr.dev/slog/sloggers/slogtest" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionerd" "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionersdk" @@ -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 index ab6ff8b242de9..a78a573e11b02 100644 --- a/provisionersdk/serve_test.go +++ b/provisionersdk/serve_test.go @@ -10,7 +10,7 @@ import ( "go.uber.org/goleak" "storj.io/drpc/drpcconn" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" @@ -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 index 232e534799f13..7712ebc481ef3 100644 --- a/tailnet/client.go +++ b/tailnet/client.go @@ -8,7 +8,7 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog" - "github.com/coder/coder/v2/codersdk/drpc" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet/proto" ) @@ -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 }