Skip to content

Commit ca2c6ae

Browse files
authored
dependency updates on 10/7/24, go 1.23. (#425)
1 parent 382bdd5 commit ca2c6ae

File tree

150 files changed

+922
-1239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+922
-1239
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
strategy:
1212
matrix:
13-
go-version: [1.22.x]
13+
go-version: [1.22.x, 1.23.x]
1414
os: [ubuntu-latest]
1515
runs-on: ${{ matrix.os }}
1616
steps:
@@ -65,11 +65,11 @@ jobs:
6565
- name: Set up Go
6666
uses: actions/setup-go@v5
6767
with:
68-
go-version: 1.22.x
68+
go-version: 1.23.x
6969
cache: true
7070

7171
- name: Lint
72-
uses: golangci/golangci-lint-action@v3
72+
uses: golangci/golangci-lint-action@v4
7373
with:
7474
version: latest
7575

.golangci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ run:
22
timeout: 5m
33
issues-exit-code: 1
44
tests: true
5-
skip-dirs:
5+
6+
issues:
7+
exclude-dirs:
68
- x/ref/services/internal/restsigner/signer
79

810
linters-settings:
@@ -26,7 +28,7 @@ linters:
2628
- govet
2729
- ineffassign
2830
- misspell
29-
- exportloopref
31+
- copyloopvar
3032
- staticcheck
3133
- typecheck
3234
- unconvert

go.mod

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,35 @@
11
module v.io
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/davecgh/go-spew v1.1.1
77
github.com/google/uuid v1.6.0
8-
github.com/gorilla/websocket v1.5.1
9-
github.com/shirou/gopsutil/v3 v3.24.4
8+
github.com/gorilla/websocket v1.5.3
9+
github.com/shirou/gopsutil/v3 v3.24.5
1010
github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5
11-
github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76
12-
golang.org/x/crypto v0.22.0
13-
golang.org/x/mod v0.17.0
14-
golang.org/x/net v0.24.0
15-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
16-
golang.org/x/term v0.19.0
17-
golang.org/x/text v0.14.0
18-
v.io/x/lib v0.1.20
11+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
12+
golang.org/x/crypto v0.28.0
13+
golang.org/x/mod v0.21.0
14+
golang.org/x/net v0.30.0
15+
golang.org/x/sync v0.8.0
16+
golang.org/x/term v0.25.0
17+
golang.org/x/text v0.19.0
18+
v.io/x/lib v0.1.21
1919
v.io/x/ref/internal/logger v0.1.1
2020
v.io/x/ref/lib/flags/sitedefaults v0.1.1
21-
v.io/x/ref/test/compatibility/modules/simple v0.0.0-20220116222041-f948f3a44e0d
21+
v.io/x/ref/test/compatibility/modules/simple v0.0.0-20241008160444-382bdd5cd7b5
2222
)
2323

2424
require (
25-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26-
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
27-
github.com/dgraph-io/ristretto v0.1.1 // indirect
28-
github.com/dustin/go-humanize v1.0.0 // indirect
2925
github.com/go-ole/go-ole v1.3.0 // indirect
30-
github.com/gogo/protobuf v1.3.2 // indirect
31-
github.com/golang/glog v1.0.0 // indirect
32-
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
33-
github.com/golang/protobuf v1.5.2 // indirect
34-
github.com/golang/snappy v0.0.3 // indirect
35-
github.com/google/flatbuffers v1.12.1 // indirect
36-
github.com/klauspost/compress v1.12.3 // indirect
37-
github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
38-
github.com/pkg/errors v0.9.1 // indirect
26+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
3927
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
4028
github.com/shoenig/go-m1cpu v0.1.6 // indirect
4129
github.com/tklauser/go-sysconf v0.3.14 // indirect
42-
github.com/tklauser/numcpus v0.8.0 // indirect
30+
github.com/tklauser/numcpus v0.9.0 // indirect
4331
github.com/yusufpapurcu/wmi v1.2.4 // indirect
44-
go.opencensus.io v0.22.5 // indirect
45-
golang.org/dl v0.0.0-20240403152604-14e4fcb94860 // indirect
46-
golang.org/x/sys v0.19.0 // indirect
47-
google.golang.org/protobuf v1.34.0 // indirect
32+
golang.org/x/sys v0.26.0 // indirect
4833
)
4934

5035
replace github.com/youmark/pkcs8 => github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a

go.sum

Lines changed: 28 additions & 254 deletions
Large diffs are not rendered by default.

go.work

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
go 1.22
1+
go 1.22.0
2+
3+
toolchain go1.23.1
24

35
use (
46
.

v23/flow/message/message.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ func (m Setup) ReadDirect(ctx *context.T, orig []byte) (Setup, error) {
253253
if v, data, valid = readVarUint64(data); !valid {
254254
return Setup{}, NewErrInvalidMsg(ctx, SetupType, uint64(len(orig)), 0, nil)
255255
}
256-
m.Versions.Min = version.RPCVersion(v)
256+
m.Versions.Min = version.RPCVersion(v) //nolint:gosec // disable G115
257257
if v, data, valid = readVarUint64(data); !valid {
258258
return Setup{}, NewErrInvalidMsg(ctx, SetupType, uint64(len(orig)), 1, nil)
259259
}
260-
m.Versions.Max = version.RPCVersion(v)
260+
m.Versions.Max = version.RPCVersion(v) //nolint:gosec // disable G115
261261
for field := uint64(2); len(data) > 0; field++ {
262262
var (
263263
payload []byte
@@ -687,11 +687,11 @@ func (m ProxyResponse) Read(ctx *context.T, orig []byte) (Message, error) {
687687
m.Endpoints = make([]naming.Endpoint, 0, len(data))
688688
for i := 0; len(data) > 0; i++ {
689689
if epBytes, data, valid = readLenBytes(data); !valid {
690-
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), nil)
690+
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), nil) //nolint:gosec // disable G115
691691
}
692692
ep, err := naming.ParseEndpoint(string(epBytes))
693693
if err != nil {
694-
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), err)
694+
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), err) //nolint:gosec // disable G115
695695
}
696696
m.Endpoints = append(m.Endpoints, ep)
697697
}
@@ -879,7 +879,7 @@ func writeVarUint64(u uint64, buf []byte) []byte {
879879
byte((u&0xff0000)>>16),
880880
byte((u&0xff00)>>8),
881881
byte(u&0xff))
882-
case u <= 0xffffffffffffffff:
882+
case u <= 0xffffffffffffffff: //nolint:staticcheck // disable SA4003
883883
// Note that using a default statement is significantly slower.
884884
return append(buf, 0xff-7,
885885
byte((u&0xff00000000000000)>>56),

v23/naming/naming.vdl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (x *MountFlag) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
6262
case err != nil:
6363
return err
6464
default:
65-
*x = MountFlag(value)
65+
*x = MountFlag(value) //nolint:gosec // disable G115
6666
}
6767
return nil
6868
}

v23/query/engine/internal/queryparser/query_parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,7 @@ func ConvertValueToAnOperand(value *vdl.Value, off int64) (*Operand, error) {
14451445
op.Int = value.Int()
14461446
case vdl.Byte, vdl.Uint16, vdl.Uint32, vdl.Uint64:
14471447
op.Type = TypInt
1448-
op.Int = int64(value.Uint())
1448+
op.Int = int64(value.Uint()) //nolint:gosec // disable G115
14491449
case vdl.Float32, vdl.Float64:
14501450
op.Type = TypFloat
14511451
op.Float = value.Float()

v23/query/engine/internal/testdata/testdata.vdl.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func (x *RatingsArray) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
375375
case done:
376376
return fmt.Errorf("short array, got len %d < 4 %T)", index, *x)
377377
default:
378-
x[index] = int16(elem)
378+
x[index] = int16(elem) //nolint:gosec // disable G115
379379
}
380380
}
381381
switch done, err := dec.NextEntry(); {
@@ -453,7 +453,7 @@ func (x *EquifaxCreditReport) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
453453
case err != nil:
454454
return err
455455
default:
456-
x.Rating = byte(value)
456+
x.Rating = byte(value) //nolint:gosec // disable G115
457457
}
458458
case 1:
459459
if err := x.FourScoreRatings.VDLRead(dec); err != nil {
@@ -782,7 +782,7 @@ func (x *TransUnionCreditReport) VDLRead(dec vdl.Decoder) error { //nolint:gocyc
782782
case err != nil:
783783
return err
784784
default:
785-
x.Rating = int16(value)
785+
x.Rating = int16(value) //nolint:gosec // disable G115
786786
}
787787
case 1:
788788
if err := vdlReadAnonMap2(dec, &x.PreviousRatings); err != nil {
@@ -813,7 +813,7 @@ func vdlReadAnonMap2(dec vdl.Decoder, x *map[string]int16) error {
813813
case err != nil:
814814
return err
815815
default:
816-
elem = int16(value)
816+
elem = int16(value) //nolint:gosec // disable G115
817817
}
818818
if tmpMap == nil {
819819
tmpMap = make(map[string]int16)
@@ -1503,21 +1503,21 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
15031503
case err != nil:
15041504
return err
15051505
default:
1506-
x.B = byte(value)
1506+
x.B = byte(value) //nolint:gosec // disable G115
15071507
}
15081508
case 1:
15091509
switch value, err := dec.ReadValueUint(16); {
15101510
case err != nil:
15111511
return err
15121512
default:
1513-
x.Ui16 = uint16(value)
1513+
x.Ui16 = uint16(value) //nolint:gosec // disable G115
15141514
}
15151515
case 2:
15161516
switch value, err := dec.ReadValueUint(32); {
15171517
case err != nil:
15181518
return err
15191519
default:
1520-
x.Ui32 = uint32(value)
1520+
x.Ui32 = uint32(value) //nolint:gosec // disable G115
15211521
}
15221522
case 3:
15231523
switch value, err := dec.ReadValueUint(64); {
@@ -1531,14 +1531,14 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
15311531
case err != nil:
15321532
return err
15331533
default:
1534-
x.I16 = int16(value)
1534+
x.I16 = int16(value) //nolint:gosec // disable G115
15351535
}
15361536
case 5:
15371537
switch value, err := dec.ReadValueInt(32); {
15381538
case err != nil:
15391539
return err
15401540
default:
1541-
x.I32 = int32(value)
1541+
x.I32 = int32(value) //nolint:gosec // disable G115
15421542
}
15431543
case 6:
15441544
switch value, err := dec.ReadValueInt(64); {
@@ -1552,7 +1552,7 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
15521552
case err != nil:
15531553
return err
15541554
default:
1555-
x.F32 = float32(value)
1555+
x.F32 = float32(value) //nolint:gosec // disable G115
15561556
}
15571557
case 8:
15581558
switch value, err := dec.ReadValueFloat(64); {
@@ -1969,7 +1969,7 @@ func (x *K) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
19691969
case err != nil:
19701970
return err
19711971
default:
1972-
x.A = byte(value)
1972+
x.A = byte(value) //nolint:gosec // disable G115
19731973
}
19741974
case 1:
19751975
switch value, err := dec.ReadValueString(); {
@@ -2052,7 +2052,7 @@ func (x *V) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
20522052
case err != nil:
20532053
return err
20542054
default:
2055-
x.B = float32(value)
2055+
x.B = float32(value) //nolint:gosec // disable G115
20562056
}
20572057
}
20582058
}
@@ -2295,7 +2295,7 @@ func vdlReadAnonMap5(dec vdl.Decoder, x *map[int16][]map[string]struct{}) error
22952295
if tmpMap == nil {
22962296
tmpMap = make(map[int16][]map[string]struct{})
22972297
}
2298-
tmpMap[int16(key)] = elem
2298+
tmpMap[int16(key)] = elem //nolint:gosec // disable G115
22992299
}
23002300
}
23012301
}
@@ -3029,7 +3029,7 @@ func vdlReadAnonMap9(dec vdl.Decoder, x *map[byte]string) error {
30293029
if tmpMap == nil {
30303030
tmpMap = make(map[byte]string)
30313031
}
3032-
tmpMap[byte(key)] = elem
3032+
tmpMap[byte(key)] = elem //nolint:gosec // disable G115
30333033
}
30343034
}
30353035
}
@@ -3060,7 +3060,7 @@ func vdlReadAnonMap10(dec vdl.Decoder, x *map[uint16]string) error {
30603060
if tmpMap == nil {
30613061
tmpMap = make(map[uint16]string)
30623062
}
3063-
tmpMap[uint16(key)] = elem
3063+
tmpMap[uint16(key)] = elem //nolint:gosec // disable G115
30643064
}
30653065
}
30663066
}
@@ -3091,7 +3091,7 @@ func vdlReadAnonMap11(dec vdl.Decoder, x *map[uint32]string) error {
30913091
if tmpMap == nil {
30923092
tmpMap = make(map[uint32]string)
30933093
}
3094-
tmpMap[uint32(key)] = elem
3094+
tmpMap[uint32(key)] = elem //nolint:gosec // disable G115
30953095
}
30963096
}
30973097
}
@@ -3153,7 +3153,7 @@ func vdlReadAnonMap13(dec vdl.Decoder, x *map[int16]string) error {
31533153
if tmpMap == nil {
31543154
tmpMap = make(map[int16]string)
31553155
}
3156-
tmpMap[int16(key)] = elem
3156+
tmpMap[int16(key)] = elem //nolint:gosec // disable G115
31573157
}
31583158
}
31593159
}
@@ -3184,7 +3184,7 @@ func vdlReadAnonMap14(dec vdl.Decoder, x *map[int32]string) error {
31843184
if tmpMap == nil {
31853185
tmpMap = make(map[int32]string)
31863186
}
3187-
tmpMap[int32(key)] = elem
3187+
tmpMap[int32(key)] = elem //nolint:gosec // disable G115
31883188
}
31893189
}
31903190
}
@@ -3246,7 +3246,7 @@ func vdlReadAnonMap16(dec vdl.Decoder, x *map[float32]string) error {
32463246
if tmpMap == nil {
32473247
tmpMap = make(map[float32]string)
32483248
}
3249-
tmpMap[float32(key)] = elem
3249+
tmpMap[float32(key)] = elem //nolint:gosec // disable G115
32503250
}
32513251
}
32523252
}
@@ -3870,7 +3870,7 @@ func vdlReadAnonSet22(dec vdl.Decoder, x *map[byte]struct{}) error {
38703870
if tmpMap == nil {
38713871
tmpMap = make(map[byte]struct{})
38723872
}
3873-
tmpMap[byte(key)] = struct{}{}
3873+
tmpMap[byte(key)] = struct{}{} //nolint:gosec // disable G115
38743874
}
38753875
}
38763876
}
@@ -3894,7 +3894,7 @@ func vdlReadAnonSet23(dec vdl.Decoder, x *map[uint16]struct{}) error {
38943894
if tmpMap == nil {
38953895
tmpMap = make(map[uint16]struct{})
38963896
}
3897-
tmpMap[uint16(key)] = struct{}{}
3897+
tmpMap[uint16(key)] = struct{}{} //nolint:gosec // disable G115
38983898
}
38993899
}
39003900
}
@@ -3918,7 +3918,7 @@ func vdlReadAnonSet24(dec vdl.Decoder, x *map[uint32]struct{}) error {
39183918
if tmpMap == nil {
39193919
tmpMap = make(map[uint32]struct{})
39203920
}
3921-
tmpMap[uint32(key)] = struct{}{}
3921+
tmpMap[uint32(key)] = struct{}{} //nolint:gosec // disable G115
39223922
}
39233923
}
39243924
}
@@ -3966,7 +3966,7 @@ func vdlReadAnonSet26(dec vdl.Decoder, x *map[int16]struct{}) error {
39663966
if tmpMap == nil {
39673967
tmpMap = make(map[int16]struct{})
39683968
}
3969-
tmpMap[int16(key)] = struct{}{}
3969+
tmpMap[int16(key)] = struct{}{} //nolint:gosec // disable G115
39703970
}
39713971
}
39723972
}
@@ -3990,7 +3990,7 @@ func vdlReadAnonSet27(dec vdl.Decoder, x *map[int32]struct{}) error {
39903990
if tmpMap == nil {
39913991
tmpMap = make(map[int32]struct{})
39923992
}
3993-
tmpMap[int32(key)] = struct{}{}
3993+
tmpMap[int32(key)] = struct{}{} //nolint:gosec // disable G115
39943994
}
39953995
}
39963996
}
@@ -4038,7 +4038,7 @@ func vdlReadAnonSet29(dec vdl.Decoder, x *map[float32]struct{}) error {
40384038
if tmpMap == nil {
40394039
tmpMap = make(map[float32]struct{})
40404040
}
4041-
tmpMap[float32(key)] = struct{}{}
4041+
tmpMap[float32(key)] = struct{}{} //nolint:gosec // disable G115
40424042
}
40434043
}
40444044
}

0 commit comments

Comments
 (0)