fix outdated references

Author: sreya

go.mod

@@ -28,6 +28,7 @@ require (
 	github.com/rjeczalik/notify v0.9.2
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
+	go.uber.org/goleak v1.1.12 // indirect
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/net v0.0.0-20210913180222-943fd674d43e
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c

go.sum

@@ -422,6 +422,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -667,6 +669,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/cmd/tunnel.go

@@ -117,7 +117,8 @@ func (c *tunnneler) start(ctx context.Context) error {
 		&wsnet.DialOptions{
 			Log:                &dialLog,
 			TURNProxyAuthToken: c.token,
-			TURNProxyURL:       c.brokerAddr,
+			TURNRemoteProxyURL: c.brokerAddr,
+			TURNLocalProxyURL:  c.brokerAddr,
 			ICEServers:         []webrtc.ICEServer{wsnet.TURNProxyICECandidate()},
 		},
 		nil,

wsnet/conn.go

@@ -14,7 +14,7 @@ import (
 	"github.com/pion/webrtc/v3"
 	"nhooyr.io/websocket"
 
-	"coder.com/m/product/coder/pkg/codersdk/legacy"
+	"cdr.dev/coder-cli/coder-sdk"
 )
 
 const (
@@ -89,7 +89,7 @@ func (t *turnProxyDialer) Dial(_, _ string) (c net.Conn, err error) {
 	if err != nil {
 		if resp != nil {
 			defer resp.Body.Close()
-			return nil, legacy.NewHTTPError(resp)
+			return nil, coder.NewHTTPError(resp)
 		}
 		return nil, fmt.Errorf("dial: %w", err)
 	}

wsnet/dial.go

@@ -15,11 +15,10 @@ import (
 	"github.com/pion/webrtc/v3"
 	"golang.org/x/net/proxy"
 	"golang.org/x/xerrors"
-	"k8s.io/utils/pointer"
 	"nhooyr.io/websocket"
 
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/slog"
-	"coder.com/m/product/coder/pkg/codersdk/legacy"
 )
 
 // DialOptions are configurable options for a wsnet connection.
@@ -61,7 +60,7 @@ func DialWebsocket(ctx context.Context, broker string, netOpts *DialOptions, wsO
 			defer func() {
 				_ = resp.Body.Close()
 			}()
-			return nil, legacy.NewHTTPError(resp)
+			return nil, coder.NewHTTPError(resp)
 		}
 		return nil, fmt.Errorf("dial websocket: %w", err)
 	}
@@ -129,8 +128,8 @@ func Dial(ctx context.Context, conn net.Conn, options *DialOptions) (*Dialer, er
 
 	log.Debug(ctx, "creating control channel", slog.F("proto", controlChannel))
 	ctrl, err := rtc.CreateDataChannel(controlChannel, &webrtc.DataChannelInit{
-		Protocol: pointer.String(controlChannel),
-		Ordered:  pointer.Bool(true),
+		Protocol: strptr(controlChannel),
+		Ordered:  boolptr(true),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("create control channel: %w", err)
@@ -386,7 +385,7 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
 
 	d.log.Debug(ctx, "opening data channel")
 	dc, err := d.rtc.CreateDataChannel("proxy", &webrtc.DataChannelInit{
-		Ordered:  pointer.Bool(network != "udp"),
+		Ordered:  boolptr(network != "udp"),
 		Protocol: &proto,
 	})
 	if err != nil {
@@ -463,3 +462,11 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
 	d.log.Debug(ctx, "dial channel ready")
 	return c, nil
 }
+
+func boolptr(b bool) *bool {
+	return &b
+}
+
+func strptr(s string) *string {
+	return &s
+}

wsnet/listen.go

@@ -18,8 +18,8 @@ import (
 	"golang.org/x/xerrors"
 	"nhooyr.io/websocket"
 
+	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/slog"
-	"coder.com/m/product/coder/pkg/codersdk/legacy"
 )
 
 // Codes for DialChannelResponse.
@@ -133,7 +133,7 @@ func (l *listener) dial(ctx context.Context) (<-chan error, error) {
 	conn, resp, err := websocket.Dial(ctx, l.broker, nil)
 	if err != nil {
 		if resp != nil {
-			return nil, legacy.NewHTTPError(resp)
+			return nil, coder.NewHTTPError(resp)
 		}
 		return nil, err
 	}