imports

Emyrk · Emyrk · commit 8c9bd9d4d924 · 2025-05-09T13:12:48.000-05:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -85,7 +85,6 @@ 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"
 	drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
 	"github.com/coder/coder/v2/codersdk/healthsdk"
 	"github.com/coder/coder/v2/provisionerd/proto"
@@ -1727,7 +1726,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/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"
+	drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
 	"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/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"
+	drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
 	"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
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"golang.org/x/xerrors"`
`9`	`9`
`10`	`10`	`"cdr.dev/slog"`
`11`		`- "github.com/coder/coder/v2/codersdk/drpc"`
	`11`	`+ drpcsdk "github.com/coder/coder/v2/codersdk/drpc"`
`12`	`12`	`"github.com/coder/coder/v2/tailnet/proto"`
`13`	`13`	`)`
`14`	`14`
`@@ -20,5 +20,5 @@ func NewDRPCClient(conn net.Conn, logger slog.Logger) (proto.DRPCTailnetClient,`
`20`	`20`	`if err != nil {`
`21`	`21`	`return nil, xerrors.Errorf("multiplex client: %w", err)`
`22`	`22`	`}`
`23`		`- return proto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)), nil`
	`23`	`+ return proto.NewDRPCTailnetClient(drpcsdk.MultiplexedConn(session)), nil`
`24`	`24`	`}`