Skip to content

Commit 63292ed

Browse files
committed
Update some deps
1 parent 2e72a71 commit 63292ed

File tree

3 files changed

+1209
-277
lines changed

3 files changed

+1209
-277
lines changed

cli/flash/cc3220/xds110/xds110_client.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package xds110
2020

2121
import (
2222
"bytes"
23+
"context"
2324
"encoding/binary"
2425
"fmt"
2526
"strings"
@@ -135,9 +136,14 @@ func (xc *XDS110Client) doCommand(cmd xds110Command, argBuf *bytes.Buffer, respP
135136
if err != nil {
136137
return nil, errors.Annotatef(err, "failed to send command")
137138
}
138-
xc.inEndp.Timeout = timeout
139+
ctx := context.TODO()
140+
if timeout != 0 {
141+
ctx2, done := context.WithTimeout(ctx, timeout)
142+
ctx = ctx2
143+
defer done()
144+
}
139145
resp := make([]byte, maxPacketLen)
140-
n, err := xc.inEndp.Read(resp)
146+
n, err := xc.inEndp.ReadContext(ctx, resp)
141147
if err != nil {
142148
return nil, errors.Annotatef(err, "failed to read response")
143149
}

go.mod

+26-19
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,48 @@ module github.com/mongoose-os/mos
33
go 1.13
44

55
require (
6-
cloud.google.com/go v0.34.1-0.20190121211145-9063a0d1967a
7-
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
8-
github.com/aws/aws-sdk-go v1.15.56-0.20181015212728-6e42625fcba9
6+
cloud.google.com/go v0.97.0 // indirect
7+
cloud.google.com/go/kms v1.0.0 // indirect
8+
cloud.google.com/go/pubsub v1.3.1
9+
github.com/Microsoft/go-winio v0.5.1 // indirect
10+
github.com/Microsoft/hcsshim v0.9.0 // indirect
11+
github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7 // indirect
12+
github.com/aws/aws-sdk-go v1.41.4
913
github.com/cesanta/go-serial v0.0.0-20170105152649-4dff7aff019e
1014
github.com/cesanta/hid v0.0.0-20190304122332-79d86877855b
11-
github.com/docker/docker v17.12.0-ce-rc1.0.20181016164535-5271c7cb484d+incompatible // indirect
15+
github.com/containerd/cgroups v1.0.2 // indirect
16+
github.com/docker/docker v20.10.9+incompatible // indirect
1217
github.com/eclipse/paho.mqtt.golang v1.1.2-0.20181011101702-c95f2f508baf
1318
github.com/elazarl/go-bindata-assetfs v1.0.1
1419
github.com/fatih/color v1.7.1-0.20181010231311-3f9d52f7176a
15-
github.com/fsouza/go-dockerclient v1.5.0
20+
github.com/fsouza/go-dockerclient v1.7.4
1621
github.com/go-bindata/go-bindata v3.1.2+incompatible
17-
github.com/go-git/go-git/v5 v5.1.0
22+
github.com/go-git/go-git/v5 v5.4.2
1823
github.com/go-ini/ini v1.39.0
24+
github.com/go-logr/logr v1.1.0 // indirect
1925
github.com/gofrs/flock v0.7.1
20-
github.com/google/gousb v0.0.0-20181005115310-15d2fa288b98
26+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
27+
github.com/google/gousb v1.1.1
2128
github.com/juju/errors v0.0.0-20200330140219-3fe23663418f
2229
github.com/juju/testing v0.0.0-20200706033705-4c23f9c453cd // indirect
2330
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
31+
github.com/kevinburke/ssh_config v1.1.0 // indirect
2432
github.com/mattn/go-colorable v0.1.7 // indirect
25-
github.com/mattn/go-shellwords v1.0.4-0.20180605041737-f8471b0a71de
33+
github.com/mattn/go-shellwords v1.0.6
2634
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
27-
github.com/sergi/go-diff v1.1.0
35+
github.com/sergi/go-diff v1.2.0
2836
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
2937
github.com/smartystreets/goconvey v1.6.4 // indirect
30-
github.com/spf13/pflag v1.0.3
38+
github.com/spf13/pflag v1.0.5
39+
github.com/xanzy/ssh-agent v0.3.1 // indirect
3140
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
32-
go.opencensus.io v0.19.0 // indirect
3341
goji.io v2.0.0+incompatible
34-
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
35-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
36-
golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c
37-
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527
38-
google.golang.org/api v0.1.1-0.20190122000720-c96cd22f2b6d
39-
google.golang.org/genproto v0.0.0-20190123001331-8819c946db44 // indirect
42+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
43+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
44+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
45+
golang.org/x/sys v0.0.0-20211015200801-69063c4bb744
46+
google.golang.org/api v0.57.0
4047
gopkg.in/ini.v1 v1.57.0 // indirect
41-
gopkg.in/yaml.v2 v2.2.4
42-
k8s.io/klog/v2 v2.3.0
48+
gopkg.in/yaml.v2 v2.4.0
49+
k8s.io/klog/v2 v2.20.0
4350
)

0 commit comments

Comments
 (0)