Skip to content

Commit ca1c61b

Browse files
committed
Upgrade to Bazel 8 and Go 1.24.0
1 parent 07366c6 commit ca1c61b

36 files changed

+2406
-3696
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
8.0.1

MODULE.bazel

+20-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module(name = "com_github_buildbarn_bb_storage")
22

3-
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
4-
bazel_dep(name = "aspect_rules_js", version = "2.1.2")
3+
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
4+
bazel_dep(name = "aspect_rules_js", version = "2.1.3")
55
bazel_dep(name = "bazel_remote_apis", version = "0")
6-
bazel_dep(name = "gazelle", version = "0.40.0")
6+
bazel_dep(name = "gazelle", version = "0.42.0")
77
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
88
bazel_dep(name = "jsonnet_go", version = "0.20.0")
9-
bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
10-
bazel_dep(name = "protobuf", version = "29.1")
11-
bazel_dep(name = "rules_go", version = "0.50.1")
9+
bazel_dep(name = "opentelemetry-proto", version = "1.5.0")
10+
bazel_dep(name = "protobuf", version = "29.3")
11+
bazel_dep(name = "rules_go", version = "0.53.0")
1212
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
13-
bazel_dep(name = "rules_oci", version = "2.0.1")
13+
bazel_dep(name = "rules_oci", version = "2.2.2")
1414
bazel_dep(name = "rules_pkg", version = "1.0.1")
15-
bazel_dep(name = "rules_proto", version = "7.0.2")
16-
bazel_dep(name = "toolchains_llvm", version = "1.2.0")
15+
bazel_dep(name = "rules_proto", version = "7.1.0")
16+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
1717

1818
git_override(
1919
module_name = "bazel_remote_apis",
20-
commit = "253013303c9e1d52ebdeb5a3f0f869919e882f20",
20+
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0",
2121
remote = "https://github.com/bazelbuild/remote-apis.git",
2222
)
2323

@@ -26,8 +26,13 @@ single_version_override(
2626
patches = ["//:patches/gazelle/dont-flatten-srcs.diff"],
2727
)
2828

29+
single_version_override(
30+
module_name = "jsonnet",
31+
patches = ["//:patches/jsonnet/bazel-8.diff"],
32+
)
33+
2934
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
30-
go_sdk.download(version = "1.23.3")
35+
go_sdk.download(version = "1.24.0")
3136

3237
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
3338
go_deps.from_file(go_mod = "//:go.mod")
@@ -104,7 +109,10 @@ go_deps_dev.module_override(
104109
path = "golang.org/x/sys",
105110
)
106111
go_deps_dev.module_override(
107-
patches = ["//:patches/org_uber_go_mock/mocks-for-funcs.diff"],
112+
patches = [
113+
"//:patches/org_uber_go_mock/generics.diff",
114+
"//:patches/org_uber_go_mock/mocks-for-funcs.diff",
115+
],
108116
path = "go.uber.org/mock",
109117
)
110118

MODULE.bazel.lock

+880-2,517
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+66-69
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
module github.com/buildbarn/bb-storage
22

3-
go 1.23.0
4-
5-
// https://github.com/bazel-contrib/rules_go/issues/4170
6-
replace golang.org/x/tools => golang.org/x/tools v0.26.0
3+
go 1.24.0
74

85
// rules_go doesn't support gomock's package mode.
96
replace go.uber.org/mock => go.uber.org/mock v0.4.0
107

118
require (
12-
cloud.google.com/go/longrunning v0.6.2
13-
cloud.google.com/go/storage v1.47.0
9+
cloud.google.com/go/longrunning v0.6.4
10+
cloud.google.com/go/storage v1.50.0
1411
github.com/aohorodnyk/mimeheader v0.0.6
15-
github.com/aws/aws-sdk-go-v2 v1.32.4
16-
github.com/aws/aws-sdk-go-v2/config v1.28.4
17-
github.com/aws/aws-sdk-go-v2/credentials v1.17.45
18-
github.com/aws/aws-sdk-go-v2/service/s3 v1.67.0
19-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.0
20-
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44
21-
github.com/bazelbuild/remote-apis v0.0.0-20241031050812-253013303c9e
12+
github.com/aws/aws-sdk-go-v2 v1.36.1
13+
github.com/aws/aws-sdk-go-v2/config v1.29.6
14+
github.com/aws/aws-sdk-go-v2/credentials v1.17.59
15+
github.com/aws/aws-sdk-go-v2/service/s3 v1.76.1
16+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14
17+
github.com/bazelbuild/buildtools v0.0.0-20250204160707-ad48c76ab9b5
18+
github.com/bazelbuild/remote-apis v0.0.0-20250211041012-7f922028fcfa
2219
github.com/fxtlabs/primes v0.0.0-20150821004651-dad82d10a449
2320
github.com/go-jose/go-jose/v3 v3.0.3
2421
github.com/google/go-jsonnet v0.20.0
@@ -31,91 +28,91 @@ require (
3128
github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd
3229
github.com/prometheus/client_golang v1.20.5
3330
github.com/prometheus/client_model v0.6.1
34-
github.com/prometheus/common v0.60.1
31+
github.com/prometheus/common v0.62.0
3532
github.com/sercand/kuberesolver/v5 v5.1.1
36-
github.com/stretchr/testify v1.9.0
37-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
38-
go.opentelemetry.io/contrib/propagators/b3 v1.32.0
39-
go.opentelemetry.io/otel v1.32.0
33+
github.com/stretchr/testify v1.10.0
34+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0
35+
go.opentelemetry.io/contrib/propagators/b3 v1.34.0
36+
go.opentelemetry.io/otel v1.34.0
4037
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
41-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0
42-
go.opentelemetry.io/otel/sdk v1.32.0
43-
go.opentelemetry.io/otel/trace v1.32.0
44-
go.opentelemetry.io/proto/otlp v1.3.1
45-
go.uber.org/mock v0.5.0
38+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0
39+
go.opentelemetry.io/otel/sdk v1.34.0
40+
go.opentelemetry.io/otel/trace v1.34.0
41+
go.opentelemetry.io/proto/otlp v1.5.0
42+
go.uber.org/mock v0.0.0-00010101000000-000000000000
4643
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
47-
golang.org/x/oauth2 v0.24.0
48-
golang.org/x/sync v0.9.0
49-
golang.org/x/sys v0.27.0
50-
google.golang.org/api v0.206.0
51-
google.golang.org/genproto/googleapis/bytestream v0.0.0-20241113202542-65e8d215514f
52-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f
53-
google.golang.org/grpc v1.68.0
44+
golang.org/x/oauth2 v0.26.0
45+
golang.org/x/sync v0.11.0
46+
golang.org/x/sys v0.30.0
47+
google.golang.org/api v0.221.0
48+
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250212204824-5a70512c5d8b
49+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b
50+
google.golang.org/grpc v1.70.0
5451
google.golang.org/grpc/security/advancedtls v1.0.0
55-
google.golang.org/protobuf v1.35.2
52+
google.golang.org/protobuf v1.36.5
5653
mvdan.cc/gofumpt v0.7.0
5754
)
5855

5956
require (
60-
cel.dev/expr v0.18.0 // indirect
57+
cel.dev/expr v0.19.0 // indirect
6158
cloud.google.com/go v0.116.0 // indirect
62-
cloud.google.com/go/auth v0.10.2 // indirect
63-
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
64-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
59+
cloud.google.com/go/auth v0.14.1 // indirect
60+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
61+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
6562
cloud.google.com/go/iam v1.2.2 // indirect
6663
cloud.google.com/go/monitoring v1.21.2 // indirect
6764
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
68-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
69-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
70-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
71-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 // indirect
72-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
73-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
74-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
75-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 // indirect
76-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
77-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 // indirect
78-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect
79-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 // indirect
80-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.5 // indirect
81-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect
82-
github.com/aws/smithy-go v1.22.1 // indirect
65+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
66+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
67+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
68+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
69+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
70+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
71+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
72+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
73+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
74+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.0 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
78+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
79+
github.com/aws/smithy-go v1.22.2 // indirect
8380
github.com/beorn7/perks v1.0.1 // indirect
84-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
8581
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8682
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
8783
github.com/davecgh/go-spew v1.1.1 // indirect
88-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
89-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
84+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
85+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
9086
github.com/felixge/httpsnoop v1.0.4 // indirect
91-
github.com/fsnotify/fsnotify v1.8.0 // indirect
87+
github.com/fsnotify/fsnotify v1.6.0 // indirect
9288
github.com/go-logr/logr v1.4.2 // indirect
9389
github.com/go-logr/stdr v1.2.2 // indirect
9490
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9591
github.com/golang/protobuf v1.5.4 // indirect
9692
github.com/google/go-cmp v0.6.0 // indirect
97-
github.com/google/s2a-go v0.1.8 // indirect
93+
github.com/google/s2a-go v0.1.9 // indirect
9894
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
99-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
100-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
95+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
96+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
10197
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
10298
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
10399
github.com/pmezard/go-difflib v1.0.0 // indirect
104100
github.com/prometheus/procfs v0.15.1 // indirect
105101
go.opencensus.io v0.24.0 // indirect
102+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
106103
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
107-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
108-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
105+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
109106
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
110-
golang.org/x/crypto v0.29.0 // indirect
111-
golang.org/x/mod v0.22.0 // indirect
112-
golang.org/x/net v0.31.0 // indirect
113-
golang.org/x/text v0.20.0 // indirect
114-
golang.org/x/time v0.8.0 // indirect
115-
golang.org/x/tools v0.27.0 // indirect
116-
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
117-
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
118-
google.golang.org/grpc/stats/opentelemetry v0.0.0-20241028142157-ada6787961b3 // indirect
107+
golang.org/x/crypto v0.33.0 // indirect
108+
golang.org/x/mod v0.17.0 // indirect
109+
golang.org/x/net v0.35.0 // indirect
110+
golang.org/x/text v0.22.0 // indirect
111+
golang.org/x/time v0.10.0 // indirect
112+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
113+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
114+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
115+
gopkg.in/yaml.v2 v2.4.0 // indirect
119116
gopkg.in/yaml.v3 v3.0.1 // indirect
120-
sigs.k8s.io/yaml v1.4.0 // indirect
117+
sigs.k8s.io/yaml v1.1.0 // indirect
121118
)

0 commit comments

Comments
 (0)