Skip to content

Commit 64e635a

Browse files
committed
Upgrade all dependencies
Fixes: #30
1 parent fe95c5e commit 64e635a

File tree

15 files changed

+501
-779
lines changed

15 files changed

+501
-779
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.1
1+
8.3.1

MODULE.bazel

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
module(name = "com_github_buildbarn_bb_clientd")
22

3-
bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
3+
bazel_dep(name = "aspect_bazel_lib", version = "2.20.0")
44
bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
55
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
66
bazel_dep(name = "com_github_buildbarn_bb_storage")
77
bazel_dep(name = "com_github_buildbarn_go_xdr")
8-
bazel_dep(name = "gazelle", version = "0.42.0")
9-
bazel_dep(name = "jsonnet_go", version = "0.20.0")
10-
bazel_dep(name = "platforms", version = "0.0.11")
11-
bazel_dep(name = "protobuf", version = "29.3")
12-
bazel_dep(name = "rules_jsonnet", version = "0.6.0")
13-
bazel_dep(name = "rules_go", version = "0.53.0")
14-
bazel_dep(name = "rules_pkg", version = "1.0.1")
8+
bazel_dep(name = "gazelle", version = "0.44.0")
9+
bazel_dep(name = "jsonnet_go", version = "0.21.0")
10+
bazel_dep(name = "platforms", version = "1.0.0")
11+
bazel_dep(name = "protobuf", version = "31.1")
12+
bazel_dep(name = "rules_jsonnet", version = "0.7.2")
13+
bazel_dep(name = "rules_go", version = "0.55.1")
14+
bazel_dep(name = "rules_pkg", version = "1.1.0")
1515
bazel_dep(name = "rules_proto", version = "7.1.0")
16-
bazel_dep(name = "toolchains_llvm", version = "1.3.0")
16+
bazel_dep(name = "toolchains_llvm", version = "1.4.0")
1717

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

2424
git_override(
2525
module_name = "com_github_buildbarn_bb_remote_execution",
26-
commit = "ca77ec14e14dd5d5569bde757dc7b6743496e198",
26+
commit = "58b88e8adfbd4cb5c32905383ef9c35ea1f9598e",
2727
remote = "https://github.com/buildbarn/bb-remote-execution.git",
2828
)
2929

3030
git_override(
3131
module_name = "com_github_buildbarn_bb_storage",
32-
commit = "85aafcb236ac1365a693d9390a6813db99dbaa0f",
32+
commit = "3a1f64c0affbdc59d0d2ab186b876ea2366dacc7",
3333
remote = "https://github.com/buildbarn/bb-storage.git",
3434
)
3535

@@ -39,11 +39,6 @@ git_override(
3939
remote = "https://github.com/buildbarn/go-xdr.git",
4040
)
4141

42-
single_version_override(
43-
module_name = "jsonnet",
44-
patches = ["//:patches/jsonnet/bazel-8.diff"],
45-
)
46-
4742
git_override(
4843
module_name = "rules_antlr",
4944
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
@@ -96,7 +91,7 @@ go_deps_dev.module_override(
9691
)
9792
go_deps_dev.module_override(
9893
patches = [
99-
"@com_github_buildbarn_bb_remote_execution//:patches/org_uber_go_mock/generics.diff",
94+
"@com_github_buildbarn_bb_storage//:patches/org_uber_go_mock/generics.diff",
10095
"@com_github_buildbarn_bb_storage//:patches/org_uber_go_mock/mocks-for-funcs.diff",
10196
],
10297
path = "go.uber.org/mock",

MODULE.bazel.lock

Lines changed: 162 additions & 302 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/bb_clientd/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ go_library(
1313
"//pkg/proto/configuration/bb_clientd",
1414
"@bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto",
1515
"@com_github_buildbarn_bb_remote_execution//pkg/cas",
16-
"@com_github_buildbarn_bb_remote_execution//pkg/filesystem",
16+
"@com_github_buildbarn_bb_remote_execution//pkg/filesystem/pool",
1717
"@com_github_buildbarn_bb_remote_execution//pkg/filesystem/virtual",
1818
"@com_github_buildbarn_bb_remote_execution//pkg/filesystem/virtual/configuration",
1919
"@com_github_buildbarn_bb_remote_execution//pkg/proto/bazeloutputservice",

cmd/bb_clientd/main.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/buildbarn/bb-clientd/pkg/outputpathpersistency"
1515
"github.com/buildbarn/bb-clientd/pkg/proto/configuration/bb_clientd"
1616
re_cas "github.com/buildbarn/bb-remote-execution/pkg/cas"
17-
re_filesystem "github.com/buildbarn/bb-remote-execution/pkg/filesystem"
17+
"github.com/buildbarn/bb-remote-execution/pkg/filesystem/pool"
1818
re_vfs "github.com/buildbarn/bb-remote-execution/pkg/filesystem/virtual"
1919
virtual_configuration "github.com/buildbarn/bb-remote-execution/pkg/filesystem/virtual/configuration"
2020
"github.com/buildbarn/bb-remote-execution/pkg/proto/bazeloutputservice"
@@ -71,7 +71,7 @@ func main() {
7171
}
7272

7373
// Storage of files created through the virtual file system.
74-
filePool, err := re_filesystem.NewFilePoolFromConfiguration(configuration.FilePool)
74+
filePool, err := pool.NewFilePoolFromConfiguration(configuration.FilePool)
7575
if err != nil {
7676
return util.StatusWrap(err, "Failed to create file pool")
7777
}
@@ -283,7 +283,10 @@ func main() {
283283
rootHandleAllocator,
284284
sort.Sort,
285285
/* hiddenFilesMatcher = */ func(string) bool { return false },
286-
clock.SystemClock)),
286+
clock.SystemClock,
287+
/* defaultAttributesSetter = */ func(requested re_vfs.AttributesMask, attributes *re_vfs.Attributes) {},
288+
),
289+
),
287290
}))
288291

289292
if err := mount.Expose(siblingsGroup, rootDirectory); err != nil {

go.mod

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/buildbarn/bb-clientd
22

3-
go 1.24.0
3+
go 1.24.5
44

55
// rules_go doesn't support gomock's package mode.
66
replace go.uber.org/mock => go.uber.org/mock v0.4.0
@@ -9,118 +9,120 @@ replace go.uber.org/mock => go.uber.org/mock v0.4.0
99
replace github.com/hanwen/go-fuse/v2 => github.com/hanwen/go-fuse/v2 v2.5.1
1010

1111
require (
12-
github.com/bazelbuild/buildtools v0.0.0-20250204160707-ad48c76ab9b5
13-
github.com/bazelbuild/remote-apis v0.0.0-20250211041012-7f922028fcfa
14-
github.com/buildbarn/bb-remote-execution v0.0.0-20250226100620-ca77ec14e14d
15-
github.com/buildbarn/bb-storage v0.0.0-20250226091209-85aafcb236ac
12+
github.com/bazelbuild/buildtools v0.0.0-20250715102656-62b9413b08bb
13+
github.com/bazelbuild/remote-apis v0.0.0-20250728120203-e94a7ece2a1e
14+
github.com/buildbarn/bb-remote-execution v0.0.0-20250727072438-58b88e8adfbd
15+
github.com/buildbarn/bb-storage v0.0.0-20250804081908-3a1f64c0affb
1616
github.com/stretchr/testify v1.10.0
17-
go.uber.org/mock v0.5.0
17+
go.uber.org/mock v0.5.1
1818
golang.org/x/lint v0.0.0-20241112194109-818c5a804067
19-
golang.org/x/sync v0.11.0
20-
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250224174004-546df14abb99
21-
google.golang.org/grpc v1.70.0
22-
google.golang.org/protobuf v1.36.5
23-
mvdan.cc/gofumpt v0.7.0
19+
golang.org/x/sync v0.16.0
20+
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250728155136-f173205681a0
21+
google.golang.org/grpc v1.74.2
22+
google.golang.org/protobuf v1.36.6
23+
mvdan.cc/gofumpt v0.8.0
2424
)
2525

2626
require (
27-
cel.dev/expr v0.19.0 // indirect
28-
cloud.google.com/go v0.116.0 // indirect
29-
cloud.google.com/go/auth v0.14.1 // indirect
30-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
31-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
32-
cloud.google.com/go/iam v1.2.2 // indirect
33-
cloud.google.com/go/longrunning v0.6.4 // indirect
34-
cloud.google.com/go/monitoring v1.21.2 // indirect
35-
cloud.google.com/go/storage v1.50.0 // indirect
36-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
37-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
38-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
27+
cel.dev/expr v0.24.0 // indirect
28+
cloud.google.com/go v0.121.4 // indirect
29+
cloud.google.com/go/auth v0.16.3 // indirect
30+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
31+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
32+
cloud.google.com/go/iam v1.5.2 // indirect
33+
cloud.google.com/go/longrunning v0.6.7 // indirect
34+
cloud.google.com/go/monitoring v1.24.2 // indirect
35+
cloud.google.com/go/storage v1.56.0 // indirect
36+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
37+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
38+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
3939
github.com/aohorodnyk/mimeheader v0.0.6 // indirect
40-
github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
41-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
42-
github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
43-
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
44-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
46-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
48-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.0 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/s3 v1.76.1 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
57-
github.com/aws/smithy-go v1.22.2 // indirect
40+
github.com/aws/aws-sdk-go-v2 v1.37.1 // indirect
41+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
42+
github.com/aws/aws-sdk-go-v2/config v1.30.2 // indirect
43+
github.com/aws/aws-sdk-go-v2/credentials v1.18.2 // indirect
44+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.1 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.1 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.1 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/sso v1.26.1 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.1 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/sts v1.35.1 // indirect
57+
github.com/aws/smithy-go v1.22.5 // indirect
5858
github.com/beorn7/perks v1.0.1 // indirect
59+
github.com/buildbarn/go-sha256tree v0.0.0-20250310211320-0f70f20e855b // indirect
5960
github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 // indirect
6061
github.com/cespare/xxhash/v2 v2.3.0 // indirect
61-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
62-
github.com/davecgh/go-spew v1.1.1 // indirect
62+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
63+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6364
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
6465
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
6566
github.com/felixge/httpsnoop v1.0.4 // indirect
66-
github.com/fsnotify/fsnotify v1.6.0 // indirect
67+
github.com/fsnotify/fsnotify v1.9.0 // indirect
6768
github.com/fxtlabs/primes v0.0.0-20150821004651-dad82d10a449 // indirect
68-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
69-
github.com/go-logr/logr v1.4.2 // indirect
69+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
70+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
71+
github.com/go-logr/logr v1.4.3 // indirect
7072
github.com/go-logr/stdr v1.2.2 // indirect
71-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7273
github.com/golang/protobuf v1.5.4 // indirect
73-
github.com/google/go-cmp v0.6.0 // indirect
74-
github.com/google/go-jsonnet v0.20.0 // indirect
74+
github.com/google/go-cmp v0.7.0 // indirect
75+
github.com/google/go-jsonnet v0.21.0 // indirect
7576
github.com/google/s2a-go v0.1.9 // indirect
7677
github.com/google/uuid v1.6.0 // indirect
77-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
78-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
78+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
79+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
7980
github.com/gorilla/mux v1.8.1 // indirect
8081
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
8182
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
82-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
83+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
8384
github.com/hanwen/go-fuse/v2 v2.7.2 // indirect
8485
github.com/jmespath/go-jmespath v0.4.0 // indirect
8586
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
86-
github.com/klauspost/compress v1.17.11 // indirect
87+
github.com/klauspost/compress v1.18.0 // indirect
8788
github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd // indirect
8889
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8990
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
90-
github.com/pmezard/go-difflib v1.0.0 // indirect
91-
github.com/prometheus/client_golang v1.21.0 // indirect
92-
github.com/prometheus/client_model v0.6.1 // indirect
93-
github.com/prometheus/common v0.62.0 // indirect
94-
github.com/prometheus/procfs v0.15.1 // indirect
91+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
92+
github.com/prometheus/client_golang v1.23.0 // indirect
93+
github.com/prometheus/client_model v0.6.2 // indirect
94+
github.com/prometheus/common v0.65.0 // indirect
95+
github.com/prometheus/procfs v0.17.0 // indirect
9596
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
96-
go.opencensus.io v0.24.0 // indirect
97+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
98+
github.com/zeebo/errs v1.4.0 // indirect
9799
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
98-
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
101-
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect
102-
go.opentelemetry.io/otel v1.34.0 // indirect
100+
go.opentelemetry.io/contrib/detectors/gcp v1.37.0 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
102+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
103+
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
104+
go.opentelemetry.io/otel v1.37.0 // indirect
103105
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
105-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
106-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
107-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
108-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
109-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
110-
golang.org/x/crypto v0.33.0 // indirect
111-
golang.org/x/mod v0.18.0 // indirect
112-
golang.org/x/net v0.35.0 // indirect
113-
golang.org/x/oauth2 v0.26.0 // indirect
114-
golang.org/x/sys v0.30.0 // indirect
115-
golang.org/x/text v0.22.0 // indirect
116-
golang.org/x/time v0.10.0 // indirect
117-
golang.org/x/tools v0.22.0 // indirect
118-
google.golang.org/api v0.221.0 // indirect
119-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
120-
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
108+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
109+
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
110+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
111+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
112+
go.yaml.in/yaml/v2 v2.4.2 // indirect
113+
golang.org/x/crypto v0.40.0 // indirect
114+
golang.org/x/mod v0.26.0 // indirect
115+
golang.org/x/net v0.42.0 // indirect
116+
golang.org/x/oauth2 v0.30.0 // indirect
117+
golang.org/x/sys v0.34.0 // indirect
118+
golang.org/x/text v0.27.0 // indirect
119+
golang.org/x/time v0.12.0 // indirect
120+
golang.org/x/tools v0.35.0 // indirect
121+
google.golang.org/api v0.244.0 // indirect
122+
google.golang.org/genproto v0.0.0-20250728155136-f173205681a0 // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
122125
google.golang.org/grpc/security/advancedtls v1.0.0 // indirect
123-
gopkg.in/yaml.v2 v2.4.0 // indirect
124126
gopkg.in/yaml.v3 v3.0.1 // indirect
125-
sigs.k8s.io/yaml v1.1.0 // indirect
127+
sigs.k8s.io/yaml v1.6.0 // indirect
126128
)

0 commit comments

Comments
 (0)