Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3783241

Browse files
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 parentaf2941b commit3783241

File tree

16 files changed

+33
-33
lines changed

16 files changed

+33
-33
lines changed

‎agent/agenttest/client.go‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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:=rangeprovisionerTypes {
14481448
switchprovisionerType {
14491449
casecodersdk.ProvisionerTypeEcho:
1450-
echoClient,echoServer:=drpc.MemTransportPipe()
1450+
echoClient,echoServer:=drpcsdk.MemTransportPipe()
14511451
wg.Add(1)
14521452
gofunc() {
14531453
deferwg.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
gofunc() {
14871487
deferwg.Done()

‎coderd/coderd.go‎

Lines changed: 2 additions & 2 deletions
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,namestring,provisionerTypes []codersdk.ProvisionerType,provisionerTagsmap[string]string) (client proto.DRPCProvisionerDaemonClient,errerror) {
17271727
tracer:=api.TracerProvider.Tracer(tracing.TracerName)
1728-
clientSession,serverSession:=drpc.MemTransportPipe()
1728+
clientSession,serverSession:=drpcsdk.MemTransportPipe()
17291729
deferfunc() {
17301730
iferr!=nil {
17311731
_=clientSession.Close()

‎coderd/coderdtest/coderdtest.go‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 3 deletions
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
returnnil,failJob(fmt.Sprintf("unsupported storage method: %s",job.StorageMethod))
709709
}
710-
ifprotobuf.Size(protoJob)>drpc.MaxMessageSize {
711-
returnnil,failJob(fmt.Sprintf("payload was too big: %d > %d",protobuf.Size(protoJob),drpc.MaxMessageSize))
710+
ifprotobuf.Size(protoJob)>drpcsdk.MaxMessageSize {
711+
returnnil,failJob(fmt.Sprintf("payload was too big: %d > %d",protobuf.Size(protoJob),drpcsdk.MaxMessageSize))
712712
}
713713

714714
returnprotoJob,err

‎codersdk/agentsdk/agentsdk.go‎

Lines changed: 1 addition & 1 deletion
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
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagedrpc
1+
packagedrpcsdk
22

33
import (
44
"context"

‎codersdk/provisionerdaemons.go‎

Lines changed: 2 additions & 2 deletions
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
returnnil,xerrors.Errorf("multiplex client: %w",err)
334334
}
335-
returnproto.NewDRPCProvisionerDaemonClient(drpc.MultiplexedConn(session)),nil
335+
returnproto.NewDRPCProvisionerDaemonClient(drpcsdk.MultiplexedConn(session)),nil
336336
}
337337

338338
typeProvisionerKeyTagsmap[string]string

‎enterprise/cli/provisionerdaemonstart.go‎

Lines changed: 2 additions & 2 deletions
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
returnerr
174174
}
175175

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

‎enterprise/coderd/coderdenttest/coderdenttest.go‎

Lines changed: 2 additions & 2 deletions
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
returnnil
345345
}
346346

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp