Skip to content

Commit 3783241

Browse files
EmyrkEmyrk
authored
chore: resolve internal drpc package conflict (#17770)
Our internal drpc package name conflicts with the external one in usage. `drpc.*` == external `drpcsdk.*` == internal
1 parent af2941b commit 3783241

File tree

16 files changed

+33
-33
lines changed

16 files changed

+33
-33
lines changed

‎agent/agenttest/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
agentproto "github.com/coder/coder/v2/agent/proto"
2525
"github.com/coder/coder/v2/codersdk"
2626
"github.com/coder/coder/v2/codersdk/agentsdk"
27-
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
27+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2828
"github.com/coder/coder/v2/tailnet"
2929
"github.com/coder/coder/v2/tailnet/proto"
3030
"github.com/coder/coder/v2/testutil"

‎cli/server.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import (
6666
"github.com/coder/coder/v2/coderd/notifications/reports"
6767
"github.com/coder/coder/v2/coderd/runtimeconfig"
6868
"github.com/coder/coder/v2/coderd/webpush"
69+
"github.com/coder/coder/v2/codersdk/drpcsdk"
6970

7071
"github.com/coder/coder/v2/buildinfo"
7172
"github.com/coder/coder/v2/cli/clilog"
@@ -102,7 +103,6 @@ import (
102103
"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
103104
"github.com/coder/coder/v2/coderd/workspacestats"
104105
"github.com/coder/coder/v2/codersdk"
105-
"github.com/coder/coder/v2/codersdk/drpc"
106106
"github.com/coder/coder/v2/cryptorand"
107107
"github.com/coder/coder/v2/provisioner/echo"
108108
"github.com/coder/coder/v2/provisioner/terraform"
@@ -1447,7 +1447,7 @@ func newProvisionerDaemon(
14471447
for _, provisionerType := range provisionerTypes {
14481448
switch provisionerType {
14491449
case codersdk.ProvisionerTypeEcho:
1450-
echoClient, echoServer := drpc.MemTransportPipe()
1450+
echoClient, echoServer := drpcsdk.MemTransportPipe()
14511451
wg.Add(1)
14521452
go func() {
14531453
defer wg.Done()
@@ -1481,7 +1481,7 @@ func newProvisionerDaemon(
14811481
}
14821482

14831483
tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
1484-
terraformClient, terraformServer := drpc.MemTransportPipe()
1484+
terraformClient, terraformServer := drpcsdk.MemTransportPipe()
14851485
wg.Add(1)
14861486
go func() {
14871487
defer wg.Done()

‎coderd/coderd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ import (
8484
"github.com/coder/coder/v2/coderd/workspaceapps"
8585
"github.com/coder/coder/v2/coderd/workspacestats"
8686
"github.com/coder/coder/v2/codersdk"
87-
"github.com/coder/coder/v2/codersdk/drpc"
87+
"github.com/coder/coder/v2/codersdk/drpcsdk"
8888
"github.com/coder/coder/v2/codersdk/healthsdk"
8989
"github.com/coder/coder/v2/provisionerd/proto"
9090
"github.com/coder/coder/v2/provisionersdk"
@@ -1725,7 +1725,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name st
17251725

17261726
func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string) (client proto.DRPCProvisionerDaemonClient, err error) {
17271727
tracer := api.TracerProvider.Tracer(tracing.TracerName)
1728-
clientSession, serverSession := drpc.MemTransportPipe()
1728+
clientSession, serverSession := drpcsdk.MemTransportPipe()
17291729
defer func() {
17301730
if err != nil {
17311731
_ = clientSession.Close()

‎coderd/coderdtest/coderdtest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ import (
8484
"github.com/coder/coder/v2/coderd/workspacestats"
8585
"github.com/coder/coder/v2/codersdk"
8686
"github.com/coder/coder/v2/codersdk/agentsdk"
87-
"github.com/coder/coder/v2/codersdk/drpc"
87+
"github.com/coder/coder/v2/codersdk/drpcsdk"
8888
"github.com/coder/coder/v2/codersdk/healthsdk"
8989
"github.com/coder/coder/v2/cryptorand"
9090
"github.com/coder/coder/v2/provisioner/echo"
@@ -657,7 +657,7 @@ func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string,
657657
// seems t.TempDir() is not safe to call from a different goroutine
658658
workDir := t.TempDir()
659659

660-
echoClient, echoServer := drpc.MemTransportPipe()
660+
echoClient, echoServer := drpcsdk.MemTransportPipe()
661661
ctx, cancelFunc := context.WithCancel(context.Background())
662662
t.Cleanup(func() {
663663
_ = echoClient.Close()

‎coderd/provisionerdserver/provisionerdserver.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
protobuf "google.golang.org/protobuf/proto"
2727

2828
"cdr.dev/slog"
29+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2930

3031
"github.com/coder/quartz"
3132

@@ -43,7 +44,6 @@ import (
4344
"github.com/coder/coder/v2/coderd/tracing"
4445
"github.com/coder/coder/v2/coderd/wspubsub"
4546
"github.com/coder/coder/v2/codersdk"
46-
"github.com/coder/coder/v2/codersdk/drpc"
4747
"github.com/coder/coder/v2/provisioner"
4848
"github.com/coder/coder/v2/provisionerd/proto"
4949
"github.com/coder/coder/v2/provisionersdk"
@@ -707,8 +707,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
707707
default:
708708
return nil, failJob(fmt.Sprintf("unsupported storage method: %s", job.StorageMethod))
709709
}
710-
if protobuf.Size(protoJob) > drpc.MaxMessageSize {
711-
return nil, failJob(fmt.Sprintf("payload was too big: %d > %d", protobuf.Size(protoJob), drpc.MaxMessageSize))
710+
if protobuf.Size(protoJob) > drpcsdk.MaxMessageSize {
711+
return nil, failJob(fmt.Sprintf("payload was too big: %d > %d", protobuf.Size(protoJob), drpcsdk.MaxMessageSize))
712712
}
713713

714714
return protoJob, err

‎codersdk/agentsdk/agentsdk.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/coder/coder/v2/agent/proto"
2323
"github.com/coder/coder/v2/apiversion"
2424
"github.com/coder/coder/v2/codersdk"
25-
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
25+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2626
tailnetproto "github.com/coder/coder/v2/tailnet/proto"
2727
"github.com/coder/websocket"
2828
)

‎codersdk/drpc/transport.go renamed to ‎codersdk/drpcsdk/transport.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package drpc
1+
package drpcsdk
22

33
import (
44
"context"

‎codersdk/provisionerdaemons.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"golang.org/x/xerrors"
1818

1919
"github.com/coder/coder/v2/buildinfo"
20-
"github.com/coder/coder/v2/codersdk/drpc"
20+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2121
"github.com/coder/coder/v2/codersdk/wsjson"
2222
"github.com/coder/coder/v2/provisionerd/proto"
2323
"github.com/coder/coder/v2/provisionerd/runner"
@@ -332,7 +332,7 @@ func (c *Client) ServeProvisionerDaemon(ctx context.Context, req ServeProvisione
332332
_ = wsNetConn.Close()
333333
return nil, xerrors.Errorf("multiplex client: %w", err)
334334
}
335-
return proto.NewDRPCProvisionerDaemonClient(drpc.MultiplexedConn(session)), nil
335+
return proto.NewDRPCProvisionerDaemonClient(drpcsdk.MultiplexedConn(session)), nil
336336
}
337337

338338
type ProvisionerKeyTags map[string]string

‎enterprise/cli/provisionerdaemonstart.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/coder/coder/v2/cli/cliutil"
2626
"github.com/coder/coder/v2/coderd/database"
2727
"github.com/coder/coder/v2/codersdk"
28-
"github.com/coder/coder/v2/codersdk/drpc"
28+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2929
"github.com/coder/coder/v2/provisioner/terraform"
3030
"github.com/coder/coder/v2/provisionerd"
3131
provisionerdproto "github.com/coder/coder/v2/provisionerd/proto"
@@ -173,7 +173,7 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
173173
return err
174174
}
175175

176-
terraformClient, terraformServer := drpc.MemTransportPipe()
176+
terraformClient, terraformServer := drpcsdk.MemTransportPipe()
177177
go func() {
178178
<-ctx.Done()
179179
_ = terraformClient.Close()

‎enterprise/coderd/coderdenttest/coderdenttest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/coder/coder/v2/coderd/database/dbmem"
2626
"github.com/coder/coder/v2/coderd/database/pubsub"
2727
"github.com/coder/coder/v2/codersdk"
28-
"github.com/coder/coder/v2/codersdk/drpc"
28+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2929
"github.com/coder/coder/v2/enterprise/coderd"
3030
"github.com/coder/coder/v2/enterprise/coderd/license"
3131
"github.com/coder/coder/v2/enterprise/dbcrypt"
@@ -344,7 +344,7 @@ func newExternalProvisionerDaemon(t testing.TB, client *codersdk.Client, org uui
344344
return nil
345345
}
346346

347-
provisionerClient, provisionerSrv := drpc.MemTransportPipe()
347+
provisionerClient, provisionerSrv := drpcsdk.MemTransportPipe()
348348
ctx, cancelFunc := context.WithCancel(context.Background())
349349
serveDone := make(chan struct{})
350350
t.Cleanup(func() {

‎enterprise/coderd/provisionerdaemons_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/coder/coder/v2/coderd/rbac"
2626
"github.com/coder/coder/v2/coderd/util/ptr"
2727
"github.com/coder/coder/v2/codersdk"
28-
"github.com/coder/coder/v2/codersdk/drpc"
28+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2929
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
3030
"github.com/coder/coder/v2/enterprise/coderd/license"
3131
"github.com/coder/coder/v2/provisioner/echo"
@@ -396,7 +396,7 @@ func TestProvisionerDaemonServe(t *testing.T) {
396396
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
397397
defer cancel()
398398

399-
terraformClient, terraformServer := drpc.MemTransportPipe()
399+
terraformClient, terraformServer := drpcsdk.MemTransportPipe()
400400
go func() {
401401
<-ctx.Done()
402402
_ = terraformClient.Close()

‎provisioner/echo/serve_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/stretchr/testify/assert"
88
"github.com/stretchr/testify/require"
99

10-
"github.com/coder/coder/v2/codersdk/drpc"
10+
"github.com/coder/coder/v2/codersdk/drpcsdk"
1111
"github.com/coder/coder/v2/provisioner/echo"
1212
"github.com/coder/coder/v2/provisionersdk"
1313
"github.com/coder/coder/v2/provisionersdk/proto"
@@ -20,7 +20,7 @@ func TestEcho(t *testing.T) {
2020
workdir := t.TempDir()
2121

2222
// Create an in-memory provisioner to communicate with.
23-
client, server := drpc.MemTransportPipe()
23+
client, server := drpcsdk.MemTransportPipe()
2424
ctx, cancelFunc := context.WithCancel(context.Background())
2525
t.Cleanup(func() {
2626
_ = client.Close()

‎provisioner/terraform/provision_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"cdr.dev/slog"
2727
"cdr.dev/slog/sloggers/slogtest"
2828

29-
"github.com/coder/coder/v2/codersdk/drpc"
29+
"github.com/coder/coder/v2/codersdk/drpcsdk"
3030
"github.com/coder/coder/v2/provisioner/terraform"
3131
"github.com/coder/coder/v2/provisionersdk"
3232
"github.com/coder/coder/v2/provisionersdk/proto"
@@ -53,7 +53,7 @@ func setupProvisioner(t *testing.T, opts *provisionerServeOptions) (context.Cont
5353
logger := testutil.Logger(t)
5454
opts.logger = &logger
5555
}
56-
client, server := drpc.MemTransportPipe()
56+
client, server := drpcsdk.MemTransportPipe()
5757
ctx, cancelFunc := context.WithCancel(context.Background())
5858
serverErr := make(chan error, 1)
5959
t.Cleanup(func() {

‎provisionerd/provisionerd_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"cdr.dev/slog"
2323
"cdr.dev/slog/sloggers/slogtest"
24-
"github.com/coder/coder/v2/codersdk/drpc"
24+
"github.com/coder/coder/v2/codersdk/drpcsdk"
2525
"github.com/coder/coder/v2/provisionerd"
2626
"github.com/coder/coder/v2/provisionerd/proto"
2727
"github.com/coder/coder/v2/provisionersdk"
@@ -1107,7 +1107,7 @@ func createProvisionerDaemonClient(t *testing.T, done <-chan struct{}, server pr
11071107
return &proto.Empty{}, nil
11081108
}
11091109
}
1110-
clientPipe, serverPipe := drpc.MemTransportPipe()
1110+
clientPipe, serverPipe := drpcsdk.MemTransportPipe()
11111111
t.Cleanup(func() {
11121112
_ = clientPipe.Close()
11131113
_ = serverPipe.Close()
@@ -1143,7 +1143,7 @@ func createProvisionerDaemonClient(t *testing.T, done <-chan struct{}, server pr
11431143
// to the server implementation provided.
11441144
func createProvisionerClient(t *testing.T, done <-chan struct{}, server provisionerTestServer) sdkproto.DRPCProvisionerClient {
11451145
t.Helper()
1146-
clientPipe, serverPipe := drpc.MemTransportPipe()
1146+
clientPipe, serverPipe := drpcsdk.MemTransportPipe()
11471147
t.Cleanup(func() {
11481148
_ = clientPipe.Close()
11491149
_ = serverPipe.Close()

‎provisionersdk/serve_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"go.uber.org/goleak"
1111
"storj.io/drpc/drpcconn"
1212

13-
"github.com/coder/coder/v2/codersdk/drpc"
13+
"github.com/coder/coder/v2/codersdk/drpcsdk"
1414
"github.com/coder/coder/v2/provisionersdk"
1515
"github.com/coder/coder/v2/provisionersdk/proto"
1616
"github.com/coder/coder/v2/testutil"
@@ -24,7 +24,7 @@ func TestProvisionerSDK(t *testing.T) {
2424
t.Parallel()
2525
t.Run("ServeListener", func(t *testing.T) {
2626
t.Parallel()
27-
client, server := drpc.MemTransportPipe()
27+
client, server := drpcsdk.MemTransportPipe()
2828
defer client.Close()
2929
defer server.Close()
3030

@@ -66,7 +66,7 @@ func TestProvisionerSDK(t *testing.T) {
6666

6767
t.Run("ServeClosedPipe", func(t *testing.T) {
6868
t.Parallel()
69-
client, server := drpc.MemTransportPipe()
69+
client, server := drpcsdk.MemTransportPipe()
7070
_ = client.Close()
7171
_ = server.Close()
7272

‎tailnet/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"golang.org/x/xerrors"
99

1010
"cdr.dev/slog"
11-
"github.com/coder/coder/v2/codersdk/drpc"
11+
"github.com/coder/coder/v2/codersdk/drpcsdk"
1212
"github.com/coder/coder/v2/tailnet/proto"
1313
)
1414

@@ -20,5 +20,5 @@ func NewDRPCClient(conn net.Conn, logger slog.Logger) (proto.DRPCTailnetClient,
2020
if err != nil {
2121
return nil, xerrors.Errorf("multiplex client: %w", err)
2222
}
23-
return proto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)), nil
23+
return proto.NewDRPCTailnetClient(drpcsdk.MultiplexedConn(session)), nil
2424
}

0 commit comments

Comments
 (0)