Skip to content

Commit

Permalink
dependency updates on 10/7/24, go 1.23. (#425)
Browse files Browse the repository at this point in the history
  • Loading branch information
cosnicolaou authored Oct 9, 2024
1 parent 382bdd5 commit ca2c6ae
Show file tree
Hide file tree
Showing 150 changed files with 922 additions and 1,239 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.22.x]
go-version: [1.22.x, 1.23.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -65,11 +65,11 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x
cache: true

- name: Lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
version: latest

Expand Down
6 changes: 4 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ run:
timeout: 5m
issues-exit-code: 1
tests: true
skip-dirs:

issues:
exclude-dirs:
- x/ref/services/internal/restsigner/signer

linters-settings:
Expand All @@ -26,7 +28,7 @@ linters:
- govet
- ineffassign
- misspell
- exportloopref
- copyloopvar
- staticcheck
- typecheck
- unconvert
Expand Down
45 changes: 15 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,50 +1,35 @@
module v.io

go 1.18
go 1.20

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

require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/tklauser/numcpus v0.9.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.22.5 // indirect
golang.org/dl v0.0.0-20240403152604-14e4fcb94860 // indirect
golang.org/x/sys v0.19.0 // indirect
google.golang.org/protobuf v1.34.0 // indirect
golang.org/x/sys v0.26.0 // indirect
)

replace github.com/youmark/pkcs8 => github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
282 changes: 28 additions & 254 deletions go.sum

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
go 1.22
go 1.22.0

toolchain go1.23.1

use (
.
Expand Down
10 changes: 5 additions & 5 deletions v23/flow/message/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,11 @@ func (m Setup) ReadDirect(ctx *context.T, orig []byte) (Setup, error) {
if v, data, valid = readVarUint64(data); !valid {
return Setup{}, NewErrInvalidMsg(ctx, SetupType, uint64(len(orig)), 0, nil)
}
m.Versions.Min = version.RPCVersion(v)
m.Versions.Min = version.RPCVersion(v) //nolint:gosec // disable G115
if v, data, valid = readVarUint64(data); !valid {
return Setup{}, NewErrInvalidMsg(ctx, SetupType, uint64(len(orig)), 1, nil)
}
m.Versions.Max = version.RPCVersion(v)
m.Versions.Max = version.RPCVersion(v) //nolint:gosec // disable G115
for field := uint64(2); len(data) > 0; field++ {
var (
payload []byte
Expand Down Expand Up @@ -687,11 +687,11 @@ func (m ProxyResponse) Read(ctx *context.T, orig []byte) (Message, error) {
m.Endpoints = make([]naming.Endpoint, 0, len(data))
for i := 0; len(data) > 0; i++ {
if epBytes, data, valid = readLenBytes(data); !valid {
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), nil)
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), nil) //nolint:gosec // disable G115
}
ep, err := naming.ParseEndpoint(string(epBytes))
if err != nil {
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), err)
return ProxyResponse{}, NewErrInvalidMsg(ctx, ProxyResponseType, uint64(len(orig)), uint64(i), err) //nolint:gosec // disable G115
}
m.Endpoints = append(m.Endpoints, ep)
}
Expand Down Expand Up @@ -879,7 +879,7 @@ func writeVarUint64(u uint64, buf []byte) []byte {
byte((u&0xff0000)>>16),
byte((u&0xff00)>>8),
byte(u&0xff))
case u <= 0xffffffffffffffff:
case u <= 0xffffffffffffffff: //nolint:staticcheck // disable SA4003
// Note that using a default statement is significantly slower.
return append(buf, 0xff-7,
byte((u&0xff00000000000000)>>56),
Expand Down
2 changes: 1 addition & 1 deletion v23/naming/naming.vdl.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (x *MountFlag) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
*x = MountFlag(value)
*x = MountFlag(value) //nolint:gosec // disable G115
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion v23/query/engine/internal/queryparser/query_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,7 @@ func ConvertValueToAnOperand(value *vdl.Value, off int64) (*Operand, error) {
op.Int = value.Int()
case vdl.Byte, vdl.Uint16, vdl.Uint32, vdl.Uint64:
op.Type = TypInt
op.Int = int64(value.Uint())
op.Int = int64(value.Uint()) //nolint:gosec // disable G115
case vdl.Float32, vdl.Float64:
op.Type = TypFloat
op.Float = value.Float()
Expand Down
50 changes: 25 additions & 25 deletions v23/query/engine/internal/testdata/testdata.vdl.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func (x *RatingsArray) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case done:
return fmt.Errorf("short array, got len %d < 4 %T)", index, *x)
default:
x[index] = int16(elem)
x[index] = int16(elem) //nolint:gosec // disable G115
}
}
switch done, err := dec.NextEntry(); {
Expand Down Expand Up @@ -453,7 +453,7 @@ func (x *EquifaxCreditReport) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.Rating = byte(value)
x.Rating = byte(value) //nolint:gosec // disable G115
}
case 1:
if err := x.FourScoreRatings.VDLRead(dec); err != nil {
Expand Down Expand Up @@ -782,7 +782,7 @@ func (x *TransUnionCreditReport) VDLRead(dec vdl.Decoder) error { //nolint:gocyc
case err != nil:
return err
default:
x.Rating = int16(value)
x.Rating = int16(value) //nolint:gosec // disable G115
}
case 1:
if err := vdlReadAnonMap2(dec, &x.PreviousRatings); err != nil {
Expand Down Expand Up @@ -813,7 +813,7 @@ func vdlReadAnonMap2(dec vdl.Decoder, x *map[string]int16) error {
case err != nil:
return err
default:
elem = int16(value)
elem = int16(value) //nolint:gosec // disable G115
}
if tmpMap == nil {
tmpMap = make(map[string]int16)
Expand Down Expand Up @@ -1503,21 +1503,21 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.B = byte(value)
x.B = byte(value) //nolint:gosec // disable G115
}
case 1:
switch value, err := dec.ReadValueUint(16); {
case err != nil:
return err
default:
x.Ui16 = uint16(value)
x.Ui16 = uint16(value) //nolint:gosec // disable G115
}
case 2:
switch value, err := dec.ReadValueUint(32); {
case err != nil:
return err
default:
x.Ui32 = uint32(value)
x.Ui32 = uint32(value) //nolint:gosec // disable G115
}
case 3:
switch value, err := dec.ReadValueUint(64); {
Expand All @@ -1531,14 +1531,14 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.I16 = int16(value)
x.I16 = int16(value) //nolint:gosec // disable G115
}
case 5:
switch value, err := dec.ReadValueInt(32); {
case err != nil:
return err
default:
x.I32 = int32(value)
x.I32 = int32(value) //nolint:gosec // disable G115
}
case 6:
switch value, err := dec.ReadValueInt(64); {
Expand All @@ -1552,7 +1552,7 @@ func (x *Numbers) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.F32 = float32(value)
x.F32 = float32(value) //nolint:gosec // disable G115
}
case 8:
switch value, err := dec.ReadValueFloat(64); {
Expand Down Expand Up @@ -1969,7 +1969,7 @@ func (x *K) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.A = byte(value)
x.A = byte(value) //nolint:gosec // disable G115
}
case 1:
switch value, err := dec.ReadValueString(); {
Expand Down Expand Up @@ -2052,7 +2052,7 @@ func (x *V) VDLRead(dec vdl.Decoder) error { //nolint:gocyclo
case err != nil:
return err
default:
x.B = float32(value)
x.B = float32(value) //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -2295,7 +2295,7 @@ func vdlReadAnonMap5(dec vdl.Decoder, x *map[int16][]map[string]struct{}) error
if tmpMap == nil {
tmpMap = make(map[int16][]map[string]struct{})
}
tmpMap[int16(key)] = elem
tmpMap[int16(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3029,7 +3029,7 @@ func vdlReadAnonMap9(dec vdl.Decoder, x *map[byte]string) error {
if tmpMap == nil {
tmpMap = make(map[byte]string)
}
tmpMap[byte(key)] = elem
tmpMap[byte(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3060,7 +3060,7 @@ func vdlReadAnonMap10(dec vdl.Decoder, x *map[uint16]string) error {
if tmpMap == nil {
tmpMap = make(map[uint16]string)
}
tmpMap[uint16(key)] = elem
tmpMap[uint16(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3091,7 +3091,7 @@ func vdlReadAnonMap11(dec vdl.Decoder, x *map[uint32]string) error {
if tmpMap == nil {
tmpMap = make(map[uint32]string)
}
tmpMap[uint32(key)] = elem
tmpMap[uint32(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3153,7 +3153,7 @@ func vdlReadAnonMap13(dec vdl.Decoder, x *map[int16]string) error {
if tmpMap == nil {
tmpMap = make(map[int16]string)
}
tmpMap[int16(key)] = elem
tmpMap[int16(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3184,7 +3184,7 @@ func vdlReadAnonMap14(dec vdl.Decoder, x *map[int32]string) error {
if tmpMap == nil {
tmpMap = make(map[int32]string)
}
tmpMap[int32(key)] = elem
tmpMap[int32(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3246,7 +3246,7 @@ func vdlReadAnonMap16(dec vdl.Decoder, x *map[float32]string) error {
if tmpMap == nil {
tmpMap = make(map[float32]string)
}
tmpMap[float32(key)] = elem
tmpMap[float32(key)] = elem //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3870,7 +3870,7 @@ func vdlReadAnonSet22(dec vdl.Decoder, x *map[byte]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[byte]struct{})
}
tmpMap[byte(key)] = struct{}{}
tmpMap[byte(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand All @@ -3894,7 +3894,7 @@ func vdlReadAnonSet23(dec vdl.Decoder, x *map[uint16]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[uint16]struct{})
}
tmpMap[uint16(key)] = struct{}{}
tmpMap[uint16(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand All @@ -3918,7 +3918,7 @@ func vdlReadAnonSet24(dec vdl.Decoder, x *map[uint32]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[uint32]struct{})
}
tmpMap[uint32(key)] = struct{}{}
tmpMap[uint32(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -3966,7 +3966,7 @@ func vdlReadAnonSet26(dec vdl.Decoder, x *map[int16]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[int16]struct{})
}
tmpMap[int16(key)] = struct{}{}
tmpMap[int16(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand All @@ -3990,7 +3990,7 @@ func vdlReadAnonSet27(dec vdl.Decoder, x *map[int32]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[int32]struct{})
}
tmpMap[int32(key)] = struct{}{}
tmpMap[int32(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand Down Expand Up @@ -4038,7 +4038,7 @@ func vdlReadAnonSet29(dec vdl.Decoder, x *map[float32]struct{}) error {
if tmpMap == nil {
tmpMap = make(map[float32]struct{})
}
tmpMap[float32(key)] = struct{}{}
tmpMap[float32(key)] = struct{}{} //nolint:gosec // disable G115
}
}
}
Expand Down
Loading

0 comments on commit ca2c6ae

Please sign in to comment.