Upgrade go dependencies 2023-12-22

.bazelrc

@@ -1,14 +1,3 @@
-# # Bazel7
-# TODO: With bzlmod we cannot access the WORKSPACE file anymore
-#     $  bazel build //:gazelle
-#     ERROR: /.../external/bazel_gazelle_go_repository_config/BUILD.bazel: no such
-#     target '@@bazel_gazelle_go_repository_config//:WORKSPACE': target 'WORKSPACE'
-#     not declared in package '' defined by
-#     /CAS/bazel-cache/f1a15cfb78ca8fde7615be5d21224669/external/bazel_gazelle_go_repository_config/BUILD.bazel;
-#     however, a source file of this name exists.  (Perhaps add
-#     'exports_files(["WORKSPACE"])' to /BUILD?)
-build --noenable_bzlmod
-
 # Required for @com_google_absl and remoteapis that use it.
 build --cxxopt=-std=c++17
 build --host_cxxopt=-std=c++17

README.md

@@ -35,8 +35,8 @@ at the top right in the GitHub Actions page.
 | Repository | Container images and binaries |
 | ---------- | ----------------------------- |
 | [bb-browser](https://github.com/buildbarn/bb-browser) [`794e38071d`](https://github.com/buildbarn/bb-browser/commits/794e38071d7a18babfc6c57643767d26415dcd63)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20231103T134227Z-794e380](https://ghcr.io/buildbarn/bb-browser:20231103T134227Z-794e380)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/6745964234) |
-| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`fb20d59cb7`](https://github.com/buildbarn/bb-remote-execution/commits/fb20d59cb7015cd8752241b2eca02f0f44ea9f42)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20231212T221000Z-fb20d59](https://ghcr.io/buildbarn/bb-runner-installer:20231212T221000Z-fb20d59)<br/>[ghcr.io/buildbarn/bb-scheduler:20231212T221000Z-fb20d59](https://ghcr.io/buildbarn/bb-scheduler:20231212T221000Z-fb20d59)<br/>[ghcr.io/buildbarn/bb-worker:20231212T221000Z-fb20d59](https://ghcr.io/buildbarn/bb-worker:20231212T221000Z-fb20d59)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/7187892850) |
-| [bb-storage](https://github.com/buildbarn/bb-storage) [`b14f4ae4a8`](https://github.com/buildbarn/bb-storage/commits/b14f4ae4a8572b23343a22deadaf9aab35ded750)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20231216T205759Z-b14f4ae](https://ghcr.io/buildbarn/bb-storage:20231216T205759Z-b14f4ae)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/7234216423) |
+| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`4b3a11b508`](https://github.com/buildbarn/bb-remote-execution/commits/4b3a11b508cf06a3dfa17f141b3ea505bc039434)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20231222T105429Z-4b3a11b](https://ghcr.io/buildbarn/bb-runner-installer:20231222T105429Z-4b3a11b)<br/>[ghcr.io/buildbarn/bb-scheduler:20231222T105429Z-4b3a11b](https://ghcr.io/buildbarn/bb-scheduler:20231222T105429Z-4b3a11b)<br/>[ghcr.io/buildbarn/bb-worker:20231222T105429Z-4b3a11b](https://ghcr.io/buildbarn/bb-worker:20231222T105429Z-4b3a11b)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/7299077275) |
+| [bb-storage](https://github.com/buildbarn/bb-storage) [`e7766ceb04`](https://github.com/buildbarn/bb-storage/commits/e7766ceb0474084a480b1f05e144b30fec70efeb)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20231222T105222Z-e7766ce](https://ghcr.io/buildbarn/bb-storage:20231222T105222Z-e7766ce)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/7299060171) |
 
 ## Changelog
 

WORKSPACE

@@ -19,10 +19,10 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
+    sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
     ],
 )
 
@@ -36,32 +36,22 @@ http_archive(
         "touch WORKSPACE",
         "touch BUILD.bazel",
     ],
-    sha256 = "dcb436cd5a871c29f0a79363678aa54b6b2c1370e718f2384c37f683ae519b38",
-    strip_prefix = "bb-storage-ece87ab6dc2a9e1e592d2032f5a02c3694765cfc/",
+    sha256 = "65882110a7f90518b58d8794d611a8465b1da38498205bd7aaffd63304803a7c",
+    strip_prefix = "bb-storage-068d214ed6a3c10ff405e3d72d9a27710b0256cc/",
     urls = [
-        "https://github.com/buildbarn/bb-storage/archive/ece87ab6dc2a9e1e592d2032f5a02c3694765cfc.zip",
+        "https://github.com/buildbarn/bb-storage/archive/068d214ed6a3c10ff405e3d72d9a27710b0256cc.zip",
     ],
 )
 
 http_archive(
     name = "bazel_gazelle",
     patches = [
         "@com_github_buildbarn_bb_storage_patches//:patches/bazel_gazelle/dont-flatten-srcs.diff",
-        "@com_github_buildbarn_bb_storage_patches//:patches/bazel_gazelle/issue-1595.diff",
     ],
-    sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
+    sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
     ],
 )
 
@@ -78,7 +68,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 
 go_rules_dependencies()
 
-go_register_toolchains(version = "1.20.1")
+go_register_toolchains(version = "1.21.5")
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 

changelog.md

@@ -1,3 +1,16 @@
+# 2023-12-22
+
+* Support Bazel 7
+* Improved readiness checks for FUSE/NFSv4 runners, better error handling
+* Support uploading output directories as Directory Messages
+  For more background see https://github.com/bazelbuild/remote-apis/pull/258
+  and the main change: https://github.com/buildbarn/bb-remote-execution/commit/f9ea0294c9a36683d06aef1840ba39c2eaccfb68
+  • buildbarn/bb-storage@068d214
+  • buildbarn/bb-remote-execution@f9ea029
+  • buildbarn/bb-remote-execution@4b3a11b
+  • buildbarn/bb-clientd@c348521
+* Initial support for mount calls in the Buildbarn 'Directory' struct, with a patched golang/x/sys
+
 # 2023-12-05
 
 * ReferenceExpandingBlobAccess: Add support for CAS references

docker-compose/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    image: ghcr.io/buildbarn/bb-storage:20231216T205759Z-b14f4ae
+    image: ghcr.io/buildbarn/bb-storage:20231222T105222Z-e7766ce
     command:
     - /config/frontend.jsonnet
     expose:
@@ -12,7 +12,7 @@ services:
     - ./config:/config
 
   storage-0:
-    image: ghcr.io/buildbarn/bb-storage:20231216T205759Z-b14f4ae
+    image: ghcr.io/buildbarn/bb-storage:20231222T105222Z-e7766ce
     command:
     - /config/storage.jsonnet
     expose:
@@ -24,7 +24,7 @@ services:
     - ./volumes/storage-cas-0:/storage-cas
 
   storage-1:
-    image: ghcr.io/buildbarn/bb-storage:20231216T205759Z-b14f4ae
+    image: ghcr.io/buildbarn/bb-storage:20231222T105222Z-e7766ce
     command:
     - /config/storage.jsonnet
     expose:
@@ -36,7 +36,7 @@ services:
     - ./volumes/storage-cas-1:/storage-cas
 
   scheduler:
-    image: ghcr.io/buildbarn/bb-scheduler:20231212T221000Z-fb20d59
+    image: ghcr.io/buildbarn/bb-scheduler:20231222T105429Z-4b3a11b
     command:
     - /config/scheduler.jsonnet
     expose:
@@ -60,13 +60,13 @@ services:
     - ./config:/config
 
   runner-installer:
-    image: ghcr.io/buildbarn/bb-runner-installer:20231212T221000Z-fb20d59
+    image: ghcr.io/buildbarn/bb-runner-installer:20231222T105429Z-4b3a11b
     volumes:
     - ./volumes/bb:/bb
 
   # The FUSE worker is the most efficient configuration.
   worker-fuse-ubuntu22-04:
-    image: ghcr.io/buildbarn/bb-worker:20231212T221000Z-fb20d59
+    image: ghcr.io/buildbarn/bb-worker:20231222T105429Z-4b3a11b
     command:
     - /config/worker-fuse-ubuntu22-04.jsonnet
     # Need to be privileged for the FUSE mounting to work.
@@ -102,7 +102,7 @@ services:
   # For situations where the more efficient FUSE worker is not supported,
   # the classic hardlinking example is shown here.
   worker-hardlinking-ubuntu22-04:
-    image: ghcr.io/buildbarn/bb-worker:20231212T221000Z-fb20d59
+    image: ghcr.io/buildbarn/bb-worker:20231222T105429Z-4b3a11b
     command:
     - /config/worker-hardlinking-ubuntu22-04.jsonnet
     # Need to be privileged for the FUSE mounting to work.

go.mod

@@ -11,8 +11,8 @@ replace golang.org/x/tools => golang.org/x/tools v0.8.0
 require (
 	github.com/bazelbuild/rules_go v0.43.0
 	github.com/buildbarn/bb-browser v0.0.0-20231103134227-794e38071d7a
-	github.com/buildbarn/bb-remote-execution v0.0.0-20231212221000-fb20d59cb701
-	github.com/buildbarn/bb-storage v0.0.0-20231216205759-b14f4ae4a857
+	github.com/buildbarn/bb-remote-execution v0.0.0-20231222105429-4b3a11b508cf
+	github.com/buildbarn/bb-storage v0.0.0-20231222105222-e7766ceb0474
 	mvdan.cc/gofumpt v0.5.0
 )
 
@@ -22,35 +22,36 @@ require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/longrunning v0.5.4 // indirect
-	cloud.google.com/go/storage v1.35.1 // indirect
+	cloud.google.com/go/storage v1.36.0 // indirect
 	git.sr.ht/~sbinet/gg v0.5.0 // indirect
 	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
 	github.com/aohorodnyk/mimeheader v0.0.6 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.0 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.25.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.16.0 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.42.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.17.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.19.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.25.1 // indirect
-	github.com/aws/smithy-go v1.16.0 // indirect
-	github.com/bazelbuild/remote-apis v0.0.0-20230822133051-6c32c3b917cc // indirect
+	github.com/aws/aws-sdk-go-v2 v1.24.0 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.26.2 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.16.13 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 // indirect
+	github.com/aws/smithy-go v1.19.0 // indirect
+	github.com/bazelbuild/remote-apis v0.0.0-20231221155620-d20ae8b97fd3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/buildbarn/go-xdr v0.0.0-20231115101217-a9e2aa4cf64b // indirect
 	github.com/buildkite/terminal-to-html v3.2.0+incompatible // indirect
 	github.com/campoy/embedmd v1.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxtlabs/primes v0.0.0-20150821004651-dad82d10a449 // indirect
 	github.com/go-fonts/liberation v0.3.2 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.1 // indirect
@@ -64,7 +65,7 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-jsonnet v0.20.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
@@ -74,7 +75,7 @@ require (
 	github.com/hanwen/go-fuse/v2 v2.4.2 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.17.2 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -83,34 +84,35 @@ require (
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.21.0 // indirect
-	go.opentelemetry.io/otel v1.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
-	go.opentelemetry.io/otel/metric v1.20.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.20.0 // indirect
-	go.opentelemetry.io/otel/trace v1.20.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
 	golang.org/x/image v0.14.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
-	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.15.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	gonum.org/v1/plot v0.14.0 // indirect
-	google.golang.org/api v0.150.0 // indirect
+	google.golang.org/api v0.154.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/bytestream v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect
+	google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )