Skip to content

Commit 0c84636

Browse files
kylecarbskylecarbs
authored
Merge branch 'main' into closeconn
2 parents 4932ba7 + 6bdef06 commit 0c84636

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

‎go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ require (
2020
github.com/coder/retry v1.3.0
2121
github.com/creack/pty v1.1.17
2222
github.com/fatih/color v1.13.0
23-
github.com/gliderlabs/ssh v0.3.3
2423
github.com/go-chi/chi/v5 v5.0.7
2524
github.com/go-chi/render v1.0.1
2625
github.com/go-playground/validator/v10 v10.10.0
@@ -41,6 +40,7 @@ require (
4140
github.com/pion/logging v0.2.2
4241
github.com/pion/transport v0.13.0
4342
github.com/pion/webrtc/v3 v3.1.23
43+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
4444
github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef
4545
github.com/quasilyte/go-ruleguard/dsl v0.3.17
4646
github.com/spf13/cobra v1.3.0
@@ -65,7 +65,6 @@ require (
6565
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
6666
github.com/agext/levenshtein v1.2.3 // indirect
6767
github.com/alecthomas/chroma v0.10.0 // indirect
68-
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
6968
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
7069
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
7170
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
@@ -115,7 +114,6 @@ require (
115114
github.com/pion/stun v0.3.5 // indirect
116115
github.com/pion/turn/v2 v2.0.6 // indirect
117116
github.com/pion/udp v0.1.1 // indirect
118-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
119117
github.com/pkg/errors v0.9.1 // indirect
120118
github.com/pmezard/go-difflib v1.0.0 // indirect
121119
github.com/sirupsen/logrus v1.8.1 // indirect

‎go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
132132
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
133133
github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE=
134134
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
135-
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
136-
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
137135
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
138136
github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
139137
github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
@@ -443,8 +441,6 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
443441
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
444442
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
445443
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
446-
github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA=
447-
github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
448444
github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
449445
github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
450446
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=

‎provisionerd/provisionerd_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ func createProvisionerDaemonClient(t *testing.T, server provisionerDaemonTestSer
406406
err := proto.DRPCRegisterProvisionerDaemon(mux, &server)
407407
require.NoError(t, err)
408408
srv := drpcserver.New(mux)
409+
ctx, cancelFunc := context.WithCancel(context.Background())
410+
t.Cleanup(cancelFunc)
409411
go func() {
410-
ctx, cancelFunc := context.WithCancel(context.Background())
411-
t.Cleanup(cancelFunc)
412412
_ = srv.Serve(ctx, serverPipe)
413413
}()
414414
return proto.NewDRPCProvisionerDaemonClient(provisionersdk.Conn(clientPipe))
@@ -426,9 +426,9 @@ func createProvisionerClient(t *testing.T, server provisionerTestServer) sdkprot
426426
err := sdkproto.DRPCRegisterProvisioner(mux, &server)
427427
require.NoError(t, err)
428428
srv := drpcserver.New(mux)
429+
ctx, cancelFunc := context.WithCancel(context.Background())
430+
t.Cleanup(cancelFunc)
429431
go func() {
430-
ctx, cancelFunc := context.WithCancel(context.Background())
431-
t.Cleanup(cancelFunc)
432432
_ = srv.Serve(ctx, serverPipe)
433433
}()
434434
return sdkproto.NewDRPCProvisionerClient(provisionersdk.Conn(clientPipe))

0 commit comments

Comments
 (0)