Skip to content

Commit

Permalink
chore(go/adbc): bump go version, golang.org/x/tools
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored and lidavidm committed Sep 10, 2024
1 parent c1e7b34 commit edb3229
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 71 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ repos:
- "--linelength=90"
- "--verbose=2"
- repo: https://github.com/golangci/golangci-lint
rev: v1.59.1
rev: v1.61.0
hooks:
- id: golangci-lint
entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m'
types_or: [go]
types_or: [go, go-mod]
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.13.0
hooks:
Expand Down Expand Up @@ -102,7 +102,7 @@ repos:
pass_filenames: false
entry: "./ci/scripts/run_rat_local.sh"
- id: check-cgo-adbc-header
name: Ensure CGO adbc.h is sync'd
name: Ensure CGO adbc.h is syncd
language: script
pass_filenames: true
files: '(c/driver_manager/adbc_driver_manager\.)|(^adbc\.h)'
Expand Down
8 changes: 4 additions & 4 deletions go/adbc/driver/flightsql/flightsql_adbc_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -585,12 +585,12 @@ func (srv *IncrementalPollTestServer) PollFlightInfo(ctx context.Context, desc *
if query.query == "unavailable" {
testCase = unavailableCase
} else {
return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", query.query))
return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", query.query)
}
}

if testCase.differentRetryDescriptor && progress != int64(query.nextIndex) {
return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("Used wrong retry descriptor, expected %d but got %d", query.nextIndex, progress))
return nil, status.Errorf(codes.InvalidArgument, "Used wrong retry descriptor, expected %d but got %d", query.nextIndex, progress)
}

if query.unavailable {
Expand Down Expand Up @@ -645,7 +645,7 @@ func (srv *IncrementalPollTestServer) PollFlightInfoStatement(ctx context.Contex

testCase, ok := srv.testCases[query.GetQuery()]
if !ok {
return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", query.GetQuery()))
return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", query.GetQuery())
}

srv.queries[queryId] = &IncrementalQuery{
Expand All @@ -662,7 +662,7 @@ func (srv *IncrementalPollTestServer) PollFlightInfoPreparedStatement(ctx contex

testCase, ok := srv.testCases[req]
if !ok {
return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", req))
return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", req)
}

srv.mu.Lock()
Expand Down
42 changes: 22 additions & 20 deletions go/adbc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

module github.com/apache/arrow-adbc/go/adbc

go 1.21
go 1.22.0

toolchain go1.22.7

require (
cloud.google.com/go/bigquery v1.62.0
Expand All @@ -31,18 +33,18 @@ require (
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
golang.org/x/oauth2 v0.22.0
golang.org/x/sync v0.8.0
golang.org/x/tools v0.24.0
google.golang.org/api v0.195.0
golang.org/x/tools v0.25.0
google.golang.org/api v0.196.0
google.golang.org/grpc v1.66.1
google.golang.org/protobuf v1.34.2
)

require (
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.1 // indirect
cloud.google.com/go/auth v0.9.3 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.13 // indirect
cloud.google.com/go/iam v1.2.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
Expand Down Expand Up @@ -80,7 +82,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v24.3.25+incompatible // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
Expand All @@ -100,22 +102,22 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
modernc.org/libc v1.45.3 // indirect
Expand Down
Loading

0 comments on commit edb3229

Please sign in to comment.