Skip to content

Commit c59c9c9

Browse files
committed
Upgrade all dependencies
While there, make this repo more similar to the other bb-* repos.
1 parent f67a5a2 commit c59c9c9

40 files changed

+30154
-6666
lines changed

.bazelversion

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

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
*.pb.go
21
.*.swp
32
.swp
43
/bazel-*

MODULE.bazel

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
module(name = "com_github_buildbarn_bonanza")
22

33
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
4+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
45
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
56
bazel_dep(name = "com_github_buildbarn_bb_storage")
67
bazel_dep(name = "com_github_buildbarn_go_xdr")
7-
bazel_dep(name = "gazelle", version = "0.37.0")
8-
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
9-
bazel_dep(name = "protobuf", version = "27.1")
10-
bazel_dep(name = "rules_go", version = "0.48.1")
11-
bazel_dep(name = "toolchains_llvm", version = "1.0.0")
8+
bazel_dep(name = "gazelle", version = "0.42.0")
9+
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33")
10+
bazel_dep(name = "protobuf", version = "29.3")
11+
bazel_dep(name = "rules_go", version = "0.53.0")
12+
bazel_dep(name = "rules_proto", version = "7.1.0")
13+
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
1214

1315
git_override(
1416
module_name = "bazel_remote_apis",
15-
commit = "412b880839b3570c2c4336e845f6bd527d348235",
17+
commit = "7f922028fcfac63bdd8431e68de152d9e7a9e2a0",
1618
remote = "https://github.com/bazelbuild/remote-apis.git",
1719
)
1820

1921
git_override(
2022
module_name = "com_github_buildbarn_bb_remote_execution",
21-
commit = "d03d5e3708ed851f7ec73a92e8ba155a97d88793",
23+
commit = "ca77ec14e14dd5d5569bde757dc7b6743496e198",
2224
remote = "https://github.com/buildbarn/bb-remote-execution.git",
2325
)
2426

2527
git_override(
2628
module_name = "com_github_buildbarn_bb_storage",
27-
commit = "ff8c80c6eb4c844b4b79f4f015babc10addc1139",
29+
commit = "85aafcb236ac1365a693d9390a6813db99dbaa0f",
2830
remote = "https://github.com/buildbarn/bb-storage.git",
2931
)
3032

@@ -34,6 +36,11 @@ git_override(
3436
remote = "https://github.com/buildbarn/go-xdr.git",
3537
)
3638

39+
single_version_override(
40+
module_name = "jsonnet",
41+
patches = ["//:patches/jsonnet/bazel-8.diff"],
42+
)
43+
3744
git_override(
3845
module_name = "rules_antlr",
3946
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -47,7 +54,7 @@ git_override(
4754
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
4855
go_sdk.download(
4956
patches = ["//:patches/go_sdk/x25519.diff"],
50-
version = "1.23.0",
57+
version = "1.24.0",
5158
)
5259

5360
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
@@ -69,6 +76,7 @@ use_repo(
6976
"org_golang_google_grpc",
7077
"org_golang_google_protobuf",
7178
"org_golang_x_exp",
79+
"org_golang_x_lint",
7280
"org_golang_x_sync",
7381
"org_golang_x_term",
7482
"org_uber_go_mock",

MODULE.bazel.lock

+834-6,415
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/bonanza_scheduler/main.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func main() {
3535
if err := util.UnmarshalConfigurationFromFile(os.Args[1], &configuration); err != nil {
3636
return util.StatusWrapf(err, "Failed to read configuration from %s", os.Args[1])
3737
}
38-
lifecycleState, _, err := global.ApplyConfiguration(configuration.Global)
38+
lifecycleState, grpcClientFactory, err := global.ApplyConfiguration(configuration.Global)
3939
if err != nil {
4040
return util.StatusWrap(err, "Failed to apply global configuration options")
4141
}
@@ -118,6 +118,7 @@ func main() {
118118
remoteexecution_pb.RegisterExecutionServer(s, buildQueue)
119119
},
120120
siblingsGroup,
121+
grpcClientFactory,
121122
); err != nil {
122123
return util.StatusWrap(err, "Client gRPC server failure")
123124
}
@@ -127,6 +128,7 @@ func main() {
127128
remoteworker_pb.RegisterOperationQueueServer(s, buildQueue)
128129
},
129130
siblingsGroup,
131+
grpcClientFactory,
130132
); err != nil {
131133
return util.StatusWrap(err, "Worker gRPC server failure")
132134
}
@@ -136,6 +138,7 @@ func main() {
136138
buildqueuestate_pb.RegisterBuildQueueStateServer(s, buildQueue)
137139
},
138140
siblingsGroup,
141+
grpcClientFactory,
139142
); err != nil {
140143
return util.StatusWrap(err, "Build queue state gRPC server failure")
141144
}

cmd/bonanza_storage_frontend/main.go

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ func main() {
107107
)
108108
},
109109
siblingsGroup,
110+
grpcClientFactory,
110111
); err != nil {
111112
return util.StatusWrap(err, "gRPC server failure")
112113
}

cmd/bonanza_storage_shard/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func main() {
3333
if err := util.UnmarshalConfigurationFromFile(os.Args[1], &configuration); err != nil {
3434
return util.StatusWrapf(err, "Failed to read configuration from %s", os.Args[1])
3535
}
36-
lifecycleState, _, err := global.ApplyConfiguration(configuration.Global)
36+
lifecycleState, grpcClientFactory, err := global.ApplyConfiguration(configuration.Global)
3737
if err != nil {
3838
return util.StatusWrap(err, "Failed to apply global configuration options")
3939
}
@@ -81,6 +81,7 @@ func main() {
8181
)
8282
},
8383
siblingsGroup,
84+
grpcClientFactory,
8485
); err != nil {
8586
return util.StatusWrap(err, "gRPC server failure")
8687
}

go.mod

+65-66
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,81 @@
11
module github.com/buildbarn/bonanza
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 (
129
github.com/bluekeyes/go-gitdiff v0.8.1
13-
github.com/buildbarn/bb-remote-execution v0.0.0-20241215094620-d03d5e3708ed
14-
github.com/buildbarn/bb-storage v0.0.0-20241220082316-ff8c80c6eb4c
10+
github.com/buildbarn/bb-remote-execution v0.0.0-20250226100620-ca77ec14e14d
11+
github.com/buildbarn/bb-storage v0.0.0-20250226091209-85aafcb236ac
1512
github.com/buildbarn/go-cdc v0.0.0-20240326143813-ab4a540e41c6
1613
github.com/google/uuid v1.6.0
1714
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
18-
github.com/prometheus/client_golang v1.20.5
15+
github.com/prometheus/client_golang v1.21.0
1916
github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4
2017
github.com/seehuhn/mt19937 v1.0.0
2118
github.com/stretchr/testify v1.10.0
2219
github.com/ulikunitz/xz v0.5.12
23-
go.starlark.net v0.0.0-20250205221240-492d3672b3f4
20+
go.starlark.net v0.0.0-20250225190231-0d3f41d403af
2421
go.uber.org/mock v0.5.0
25-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
26-
golang.org/x/sync v0.10.0
27-
golang.org/x/term v0.28.0
28-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422
29-
google.golang.org/grpc v1.69.2
30-
google.golang.org/protobuf v1.36.2
22+
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa
23+
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
24+
golang.org/x/sync v0.11.0
25+
golang.org/x/term v0.29.0
26+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99
27+
google.golang.org/grpc v1.70.0
28+
google.golang.org/protobuf v1.36.5
3129
mvdan.cc/gofumpt v0.7.0
3230
)
3331

3432
require (
35-
cel.dev/expr v0.19.1 // indirect
36-
cloud.google.com/go v0.118.0 // indirect
37-
cloud.google.com/go/auth v0.14.0 // indirect
33+
cel.dev/expr v0.19.0 // indirect
34+
cloud.google.com/go v0.116.0 // indirect
35+
cloud.google.com/go/auth v0.14.1 // indirect
3836
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
3937
cloud.google.com/go/compute/metadata v0.6.0 // indirect
40-
cloud.google.com/go/iam v1.3.1 // indirect
38+
cloud.google.com/go/iam v1.2.2 // indirect
4139
cloud.google.com/go/longrunning v0.6.4 // indirect
42-
cloud.google.com/go/monitoring v1.22.1 // indirect
40+
cloud.google.com/go/monitoring v1.21.2 // indirect
4341
cloud.google.com/go/storage v1.50.0 // indirect
4442
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
45-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
46-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
43+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
44+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
4745
github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1 // indirect
4846
github.com/aohorodnyk/mimeheader v0.0.6 // indirect
49-
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
50-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
51-
github.com/aws/aws-sdk-go-v2/config v1.28.10 // indirect
52-
github.com/aws/aws-sdk-go-v2/credentials v1.17.51 // indirect
53-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
54-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
55-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
56-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
57-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
64-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 // indirect
66-
github.com/aws/smithy-go v1.22.1 // indirect
67-
github.com/bazelbuild/remote-apis v0.0.0-20250106163131-9a0af1d31814 // indirect
47+
github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
48+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
49+
github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
50+
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
51+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.0 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/s3 v1.76.1 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
64+
github.com/aws/smithy-go v1.22.2 // indirect
65+
github.com/bazelbuild/remote-apis v0.0.0-20250211041012-7f922028fcfa // indirect
6866
github.com/beorn7/perks v1.0.1 // indirect
6967
github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 // indirect
7068
github.com/cespare/xxhash/v2 v2.3.0 // indirect
71-
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
69+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
7270
github.com/davecgh/go-spew v1.1.1 // indirect
73-
github.com/envoyproxy/go-control-plane/envoy v1.32.3 // indirect
74-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
71+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
72+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
7573
github.com/felixge/httpsnoop v1.0.4 // indirect
76-
github.com/fsnotify/fsnotify v1.8.0 // indirect
74+
github.com/fsnotify/fsnotify v1.7.0 // indirect
7775
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
7876
github.com/go-logr/logr v1.4.2 // indirect
7977
github.com/go-logr/stdr v1.2.2 // indirect
80-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
78+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8179
github.com/google/go-cmp v0.6.0 // indirect
8280
github.com/google/go-jsonnet v0.20.0 // indirect
8381
github.com/google/s2a-go v0.1.9 // indirect
@@ -94,33 +92,34 @@ require (
9492
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
9593
github.com/pmezard/go-difflib v1.0.0 // indirect
9694
github.com/prometheus/client_model v0.6.1 // indirect
97-
github.com/prometheus/common v0.61.0 // indirect
95+
github.com/prometheus/common v0.62.0 // indirect
9896
github.com/prometheus/procfs v0.15.1 // indirect
9997
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
98+
go.opencensus.io v0.24.0 // indirect
10099
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
101-
go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect
102-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
100+
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
103102
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
104-
go.opentelemetry.io/contrib/propagators/b3 v1.33.0 // indirect
105-
go.opentelemetry.io/otel v1.33.0 // indirect
103+
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect
104+
go.opentelemetry.io/otel v1.34.0 // indirect
106105
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
107-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
108-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
109-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
110-
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
111-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
108+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
109+
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
110+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
112111
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
113-
golang.org/x/crypto v0.32.0 // indirect
114-
golang.org/x/mod v0.22.0 // indirect
115-
golang.org/x/net v0.34.0 // indirect
116-
golang.org/x/oauth2 v0.25.0 // indirect
117-
golang.org/x/sys v0.29.0 // indirect
118-
golang.org/x/text v0.21.0 // indirect
119-
golang.org/x/time v0.9.0 // indirect
120-
golang.org/x/tools v0.29.0 // indirect
121-
google.golang.org/api v0.216.0 // indirect
122-
google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 // indirect
123-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
112+
golang.org/x/crypto v0.33.0 // indirect
113+
golang.org/x/mod v0.23.0 // indirect
114+
golang.org/x/net v0.35.0 // indirect
115+
golang.org/x/oauth2 v0.26.0 // indirect
116+
golang.org/x/sys v0.30.0 // indirect
117+
golang.org/x/text v0.22.0 // indirect
118+
golang.org/x/time v0.10.0 // indirect
119+
golang.org/x/tools v0.30.0 // indirect
120+
google.golang.org/api v0.221.0 // indirect
121+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
122+
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
124123
google.golang.org/grpc/security/advancedtls v1.0.0 // indirect
125124
gopkg.in/yaml.v3 v3.0.1 // indirect
126125
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)