From 2da039301ce0fe79024fe20ac657a603952d4d16 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 31 Aug 2024 22:02:26 +0200 Subject: [PATCH] Upgrade all dependencies This requires us to catch up with API changes to pkg/filesystem/path. --- MODULE.bazel | 18 +- MODULE.bazel.lock | 185 +++++++++++------- cmd/bb_runner/main.go | 4 +- cmd/bb_virtual_tmp/main.go | 2 +- cmd/bb_worker/main.go | 4 +- go.mod | 54 ++--- go.sum | 53 +++++ pkg/builder/command.go | 2 +- pkg/builder/naive_build_directory.go | 2 +- pkg/builder/output_hierarchy.go | 4 +- pkg/builder/output_hierarchy_test.go | 12 +- pkg/filesystem/configuration.go | 2 +- pkg/filesystem/lazy_directory_test.go | 4 +- .../virtual/base_symlink_factory.go | 2 +- .../virtual/user_settable_symlink.go | 2 +- .../virtual/user_settable_symlink_test.go | 2 +- .../bazel_output_service.pb.go | 2 +- .../bazel_output_service_grpc.pb.go | 2 +- .../rev2/bazel_output_service_rev2.pb.go | 2 +- .../buildqueuestate/buildqueuestate.pb.go | 2 +- .../buildqueuestate_grpc.pb.go | 2 +- pkg/proto/cas/cas.pb.go | 2 +- .../completed_action_logger.pb.go | 2 +- .../completed_action_logger_grpc.pb.go | 2 +- .../bb_noop_worker/bb_noop_worker.pb.go | 2 +- .../configuration/bb_runner/bb_runner.pb.go | 2 +- .../bb_scheduler/bb_scheduler.pb.go | 2 +- .../bb_virtual_tmp/bb_virtual_tmp.pb.go | 2 +- .../configuration/bb_worker/bb_worker.pb.go | 2 +- pkg/proto/configuration/cas/cas.pb.go | 2 +- .../credentials/credentials.pb.go | 2 +- .../configuration/filesystem/filesystem.pb.go | 2 +- .../filesystem/virtual/virtual.pb.go | 2 +- .../configuration/scheduler/scheduler.pb.go | 2 +- .../outputpathpersistency.pb.go | 2 +- pkg/proto/remoteworker/remoteworker.pb.go | 2 +- .../remoteworker/remoteworker_grpc.pb.go | 2 +- pkg/proto/resourceusage/resourceusage.pb.go | 2 +- pkg/proto/runner/runner.pb.go | 2 +- pkg/proto/runner/runner_grpc.pb.go | 2 +- pkg/proto/tmp_installer/tmp_installer.pb.go | 2 +- .../tmp_installer/tmp_installer_grpc.pb.go | 2 +- pkg/runner/local_runner.go | 20 +- pkg/runner/local_runner_test.go | 4 +- pkg/runner/local_runner_unix.go | 4 +- .../temporary_directory_symlinking_runner.go | 2 +- ...porary_directory_symlinking_runner_test.go | 4 +- 47 files changed, 264 insertions(+), 174 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d15276e8..8040cb8a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,22 +1,22 @@ module(name = "com_github_buildbarn_bb_remote_execution") -bazel_dep(name = "aspect_bazel_lib", version = "2.7.8") -bazel_dep(name = "aspect_rules_js", version = "1.42.3") +bazel_dep(name = "aspect_bazel_lib", version = "2.8.1") +bazel_dep(name = "aspect_rules_js", version = "2.0.1") bazel_dep(name = "com_github_buildbarn_bb_storage") bazel_dep(name = "com_github_buildbarn_go_xdr") -bazel_dep(name = "gazelle", version = "0.37.0") +bazel_dep(name = "gazelle", version = "0.38.0") bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5") -bazel_dep(name = "protobuf", version = "27.1") -bazel_dep(name = "rules_go", version = "0.48.1") +bazel_dep(name = "protobuf", version = "27.3") +bazel_dep(name = "rules_go", version = "0.50.0") bazel_dep(name = "rules_jsonnet", version = "0.6.0") -bazel_dep(name = "rules_oci", version = "1.7.6") -bazel_dep(name = "rules_pkg", version = "0.10.1") +bazel_dep(name = "rules_oci", version = "1.8.0") +bazel_dep(name = "rules_pkg", version = "1.0.1") bazel_dep(name = "rules_proto", version = "6.0.2") -bazel_dep(name = "toolchains_llvm", version = "1.0.0") +bazel_dep(name = "toolchains_llvm", version = "1.1.2") git_override( module_name = "com_github_buildbarn_bb_storage", - commit = "a869915feea7333a85e92e7a9f7a4821969408d6", + commit = "af9ad48525bbf476d0a0999760b648e1e96237e5", remote = "https://github.com/buildbarn/bb-storage.git", ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index c2c15322..6d33d45f 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -13,11 +13,11 @@ "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.28.0/MODULE.bazel": "d793416e81c34d137d75ef84fe622df6c550826772a7f06e3b98a0d1c347fe1c", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.42.1/MODULE.bazel": "b7aca918a7c7f4cb9ea223e7e2cba294760659ec7364cc551df156067e4a3621", - "https://bcr.bazel.build/modules/aspect_bazel_lib/1.42.3/MODULE.bazel": "e4529e12d8cd5b828e2b5960d07d3ec032541740d419d7d5b859cabbf5b056f9", - "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.8/MODULE.bazel": "1631a1bbb119fc372f9aaa55df6c7d0a59fdb1640324b3d5c0047d976eb57aae", - "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.8/source.json": "896a2b322e70b0d1517b8758159e71fa3c2bf7bce5ecda3eb99c9e84fdd71e5e", - "https://bcr.bazel.build/modules/aspect_rules_js/1.42.3/MODULE.bazel": "eeaa3093e9c5da7ff24482372b7900254874305b96b429ee9d7f546059ccdca0", - "https://bcr.bazel.build/modules/aspect_rules_js/1.42.3/source.json": "0999eef9a1cb39274d9cfc7c911ff5ff82326acd720e714de07de42c68cbd786", + "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.7/MODULE.bazel": "491f8681205e31bb57892d67442ce448cda4f472a8e6b3dc062865e29a64f89c", + "https://bcr.bazel.build/modules/aspect_bazel_lib/2.8.1/MODULE.bazel": "812d2dd42f65dca362152101fbec418029cc8fd34cbad1a2fde905383d705838", + "https://bcr.bazel.build/modules/aspect_bazel_lib/2.8.1/source.json": "95a6b56904e2d8bfea164dc6c98ccafe8cb75cb0623cb6ef5b3cfb15fdddabd6", + "https://bcr.bazel.build/modules/aspect_rules_js/2.0.1/MODULE.bazel": "a09d32aa997ad899fcd88dc6e629188f03351994f0698bc32a9979c5bcfd5c31", + "https://bcr.bazel.build/modules/aspect_rules_js/2.0.1/source.json": "62bda0d34f3817af165d1903b890ecbf6e50d652492f8bb83682636e997b5619", "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd", "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015", @@ -62,8 +62,8 @@ "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/MODULE.bazel": "42a46b9ca5f2c25e1cd8dab1c70d0c09cb5886802d0134001ef4b5ece6125248", "https://bcr.bazel.build/modules/jsonnet_go/0.20.0/source.json": "a490acce3381d722f6a52a07c5ffeda4a3cc771a0802a2e115e07ef5c462a27c", "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902", - "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.1/MODULE.bazel": "0141a50e989576ee064c11ce8dd5ec89993525bd9f9a09c5618e4dacc8df9352", - "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.1/source.json": "4ea3f46eb63107e1f1164adc1897bd95bf0fe9673ea632f56cae2f0572eaecc7", + "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.2/MODULE.bazel": "af47c38e3e5419b6b79575c02abc95f23c56d7ff4695f08ad4a6d1c807092ddc", + "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.2/source.json": "cd3888f5785aa7e991a2138958d07c818892452ead22005a3401d58180051193", "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee", "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37", "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615", @@ -73,8 +73,8 @@ "https://bcr.bazel.build/modules/platforms/0.0.9/source.json": "cd74d854bf16a9e002fb2ca7b1a421f4403cda29f824a765acd3a8c56f8d43e6", "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", "https://bcr.bazel.build/modules/protobuf/23.1/MODULE.bazel": "88b393b3eb4101d18129e5db51847cd40a5517a53e81216144a8c32dfeeca52a", - "https://bcr.bazel.build/modules/protobuf/27.1/MODULE.bazel": "703a7b614728bb06647f965264967a8ef1c39e09e8f167b3ca0bb1fd80449c0d", - "https://bcr.bazel.build/modules/protobuf/27.1/source.json": "11a2567425ffebb89ff59e94fc8a55bc78a418d52a4cc415069ce7c793571352", + "https://bcr.bazel.build/modules/protobuf/27.3/MODULE.bazel": "d94898cbf9d6d25c0edca2521211413506b68a109a6b01776832ed25154d23d7", + "https://bcr.bazel.build/modules/protobuf/27.3/source.json": "d6fdc641a99c600df6eb0fa5b99879ca497dbcf6fd1287372576a83f82dd93b6", "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573", "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", @@ -95,6 +95,7 @@ "https://bcr.bazel.build/modules/rules_java/5.1.0/MODULE.bazel": "324b6478b0343a3ce7a9add8586ad75d24076d6d43d2f622990b9c1cfd8a1b15", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39", + "https://bcr.bazel.build/modules/rules_java/6.3.0/MODULE.bazel": "a97c7678c19f236a956ad260d59c86e10a463badb7eb2eda787490f4c969b963", "https://bcr.bazel.build/modules/rules_java/6.4.0/MODULE.bazel": "e986a9fe25aeaa84ac17ca093ef13a4637f6107375f64667a15999f77db6c8f6", "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel": "50dece891cfdf1741ea230d001aa9c14398062f2b7c066470accace78e412bc2", "https://bcr.bazel.build/modules/rules_java/7.5.0/MODULE.bazel": "b329bf9aa07a58bd1ccb37bfdcd9528acf6f12712efb38c3a8553c2cc2494806", @@ -104,22 +105,22 @@ "https://bcr.bazel.build/modules/rules_jsonnet/0.6.0/source.json": "d1783eeaeea5329dd5a8e890bcbda93001d62f9936c15ffce6cdc51828bfd6ba", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", + "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", "https://bcr.bazel.build/modules/rules_jvm_external/5.3/MODULE.bazel": "bf93870767689637164657731849fb887ad086739bd5d360d90007a581d5527d", "https://bcr.bazel.build/modules/rules_jvm_external/6.0/MODULE.bazel": "37c93a5a78d32e895d52f86a8d0416176e915daabd029ccb5594db422e87c495", "https://bcr.bazel.build/modules/rules_jvm_external/6.0/source.json": "73cc8818203a182e7374adf137f428d276190b2e2bef3022c231990cf0e594aa", "https://bcr.bazel.build/modules/rules_kotlin/1.9.0/MODULE.bazel": "ef85697305025e5a61f395d4eaede272a5393cee479ace6686dba707de804d59", "https://bcr.bazel.build/modules/rules_kotlin/1.9.0/source.json": "e4e8566acbfc02cc701c169d756ee99bca1c395a0d1dc69293a21a5ef14cac43", "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", - "https://bcr.bazel.build/modules/rules_license/0.0.4/MODULE.bazel": "6a88dd22800cf1f9f79ba32cacad0d3a423ed28efa2c2ed5582eaa78dd3ac1e5", "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d", "https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a", - "https://bcr.bazel.build/modules/rules_nodejs/5.8.2/MODULE.bazel": "6bc03c8f37f69401b888023bf511cb6ee4781433b0cb56236b2e55a21e3a026a", - "https://bcr.bazel.build/modules/rules_nodejs/5.8.2/source.json": "6e82cf5753d835ea18308200bc79b9c2e782efe2e2a4edc004a9162ca93382ca", - "https://bcr.bazel.build/modules/rules_oci/1.7.6/MODULE.bazel": "cf097afc862b7995314708f8026409ec8a91d440e94ee996b92b09518da564f2", - "https://bcr.bazel.build/modules/rules_oci/1.7.6/source.json": "d560c3e3ce9b4dc27755a13a8c274c83003d155041a98d21f1bc06ae4d8809c2", - "https://bcr.bazel.build/modules/rules_pkg/0.10.1/MODULE.bazel": "d6e593e048db5f1028f1f05ceb64b123aa6f1c2d43cba049c036443ab2cc2044", - "https://bcr.bazel.build/modules/rules_pkg/0.10.1/source.json": "a3550442d1530f00fd2a51036250db1891c8fedfd85991c65a0bd0f6daefe0a3", + "https://bcr.bazel.build/modules/rules_nodejs/6.2.0/MODULE.bazel": "ec27907f55eb34705adb4e8257952162a2d4c3ed0f0b3b4c3c1aad1fac7be35e", + "https://bcr.bazel.build/modules/rules_nodejs/6.2.0/source.json": "a77c307175a82982f0847fd6a8660db5b21440d8a9d073642cb4afa7a18612ff", + "https://bcr.bazel.build/modules/rules_oci/1.8.0/MODULE.bazel": "a4d656f6a0e7c7c1a73b9e394e37c8f9bbc237143ce9e19deba7a532fe189552", + "https://bcr.bazel.build/modules/rules_oci/1.8.0/source.json": "c14770a5dfba2980d8f1ebeaac0bfa4848ffb7febfca84ac2a7fd7e8f4d9e1e3", "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc", + "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff", + "https://bcr.bazel.build/modules/rules_pkg/1.0.1/source.json": "bd82e5d7b9ce2d31e380dd9f50c111d678c3bdaca190cb76b0e1c71b05e1ba8a", "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06", "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7", "https://bcr.bazel.build/modules/rules_proto/6.0.0/MODULE.bazel": "b531d7f09f58dce456cd61b4579ce8c86b38544da75184eadaf0a7cb7966453f", @@ -128,7 +129,6 @@ "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7", "https://bcr.bazel.build/modules/rules_python/0.23.1/MODULE.bazel": "49ffccf0511cb8414de28321f5fcf2a31312b47c40cc21577144b7447f2bf300", - "https://bcr.bazel.build/modules/rules_python/0.24.0/MODULE.bazel": "4bff7f583653d0762cda21303da0643cc4c545ddfd9593337f18dad8d1787801", "https://bcr.bazel.build/modules/rules_python/0.25.0/MODULE.bazel": "72f1506841c920a1afec76975b35312410eea3aa7b63267436bfb1dd91d2d382", "https://bcr.bazel.build/modules/rules_python/0.29.0/MODULE.bazel": "2ac8cd70524b4b9ec49a0b8284c79e4cd86199296f82f6e0d5da3f783d660c82", "https://bcr.bazel.build/modules/rules_python/0.31.0/MODULE.bazel": "93a43dc47ee570e6ec9f5779b2e64c1476a6ce921c48cc9a1678a91dd5f8fd58", @@ -139,9 +139,10 @@ "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", "https://bcr.bazel.build/modules/stardoc/0.5.4/MODULE.bazel": "6569966df04610b8520957cb8e97cf2e9faac2c0309657c537ab51c16c18a2a4", "https://bcr.bazel.build/modules/stardoc/0.5.6/MODULE.bazel": "c43dabc564990eeab55e25ed61c07a1aadafe9ece96a4efabb3f8bf9063b71ef", - "https://bcr.bazel.build/modules/stardoc/0.5.6/source.json": "956954c9c45ef492ea4001ce579dc40431fbd75090151e8f9eadf9ed6377a108", - "https://bcr.bazel.build/modules/toolchains_llvm/1.0.0/MODULE.bazel": "410c05d8a21179f501e1d0dc6c325eac78c885d4f44c5438331392ba094bf819", - "https://bcr.bazel.build/modules/toolchains_llvm/1.0.0/source.json": "85babe13e588c25e032d10984ef3ed33fae30554f97bc3cc48867833e52a21ec", + "https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd", + "https://bcr.bazel.build/modules/stardoc/0.6.2/source.json": "d2ff8063b63b4a85e65fe595c4290f99717434fa9f95b4748a79a7d04dfed349", + "https://bcr.bazel.build/modules/toolchains_llvm/1.1.2/MODULE.bazel": "402101d6f73115ec49a3a765a3361c1dd90ba3959fa688ccdcd465c36dbbbc52", + "https://bcr.bazel.build/modules/toolchains_llvm/1.1.2/source.json": "27f3cf531bc654c719b50411cac94613b7676d63e60962243d485af63e13b9ff", "https://bcr.bazel.build/modules/upb/0.0.0-20211020-160625a/MODULE.bazel": "6cced416be2dc5b9c05efd5b997049ba795e5e4e6fafbe1624f4587767638928", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9", @@ -184,8 +185,8 @@ }, "@@aspect_bazel_lib~//lib:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "SK+5VjMKVX5gfuC//JqN+b1rWW3PNLeAEsqwiD3CAOA=", - "usagesDigest": "lhyQVM8A1CX7NWsxOLQjr0WH1sGzS004M7l1V/cppUY=", + "bzlTransitiveDigest": "o+c8qRBWojmxp6XnxraB8cDLR3egI6E7hjYq4t1rzM8=", + "usagesDigest": "ctoOAaYBc+vADOcIkHRjVIKBMa+yqb9N5pKV6dmknc4=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -651,8 +652,8 @@ }, "@@aspect_rules_js~//npm:extensions.bzl%pnpm": { "general": { - "bzlTransitiveDigest": "5/dLyczQeTQqdqtw3WvT0KGY9HFyIoorbtjELgb6zP8=", - "usagesDigest": "03JjegAYiYMi5wJokhB1cebZ6EQaQmBcCZC0tMNzKYg=", + "bzlTransitiveDigest": "4Iw6LV64Aj6lRXhjiUFU8ZHA8x4Jzlt6IRPUVNTOiqc=", + "usagesDigest": "4l7bmRQkO3X4QRe/n4qLKHBozj6dLXGRKt+QHkMt8R0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -705,7 +706,8 @@ "lifecycle_hooks": [], "extra_build_content": "load(\"@aspect_rules_js//js:defs.bzl\", \"js_binary\")\njs_binary(name = \"pnpm\", data = glob([\"package/**\"]), entry_point = \"package/dist/pnpm.cjs\", visibility = [\"//visibility:public\"])", "generate_bzl_library_targets": false, - "extract_full_archive": true + "extract_full_archive": true, + "system_tar": "auto" } } }, @@ -749,11 +751,6 @@ "bazel_features~", "bazel_features_version", "bazel_features~~version_extension~bazel_features_version" - ], - [ - "bazel_features~", - "bazel_tools", - "bazel_tools" ] ] } @@ -1168,8 +1165,8 @@ }, "@@rules_nodejs~//nodejs:extensions.bzl%node": { "general": { - "bzlTransitiveDigest": "liNCpme8abwnUcdsL6FZlbuEqQRiO4GmDTZyX6QuOH4=", - "usagesDigest": "tNbapk4XU/ruMfFbyR8m4sHB03wSP8sbhRQEmIv/gqo=", + "bzlTransitiveDigest": "0IJr1Jg3Dns9QKY65MtauFLtHjjP3n1DgN0+ZAjFYXo=", + "usagesDigest": "QaaCjO0WbxbalX+3ei3mvAH3DxI2biGkZ5h5rxhaOwk=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -1183,57 +1180,93 @@ }, "nodejs_linux_s390x": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "linux_s390x", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "linux_s390x" } }, "nodejs_windows_amd64": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "windows_amd64", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "windows_amd64" } }, "nodejs_toolchains": { - "bzlFile": "@@rules_nodejs~//nodejs/private:toolchains_repo.bzl", - "ruleClassName": "toolchains_repo", + "bzlFile": "@@rules_nodejs~//nodejs/private:nodejs_toolchains_repo.bzl", + "ruleClassName": "nodejs_toolchains_repo", "attributes": { "user_node_repository_name": "nodejs" } }, "nodejs_linux_amd64": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "linux_amd64", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "linux_amd64" } }, "nodejs_linux_ppc64le": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "linux_ppc64le", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "linux_ppc64le" } }, "nodejs_darwin_amd64": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "darwin_amd64", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "darwin_amd64" } }, "nodejs_linux_arm64": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "linux_arm64", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "linux_arm64" } }, "nodejs": { @@ -1245,31 +1278,26 @@ }, "nodejs_darwin_arm64": { "bzlFile": "@@rules_nodejs~//nodejs:repositories.bzl", - "ruleClassName": "node_repositories", + "ruleClassName": "_nodejs_repositories", "attributes": { - "platform": "darwin_arm64", - "node_version": "16.19.0" + "node_download_auth": {}, + "node_repositories": {}, + "node_urls": [ + "https://nodejs.org/dist/v{version}/{filename}" + ], + "node_version": "18.20.3", + "include_headers": false, + "platform": "darwin_arm64" } } }, - "recordedRepoMappingEntries": [ - [ - "rules_nodejs~", - "bazel_skylib", - "bazel_skylib~" - ], - [ - "rules_nodejs~", - "bazel_tools", - "bazel_tools" - ] - ] + "recordedRepoMappingEntries": [] } }, "@@rules_oci~//oci:extensions.bzl%oci": { "general": { - "bzlTransitiveDigest": "L9B5v2OyWozSrPJ/Znus2uW78K10EngDC6zh5/NL1E0=", - "usagesDigest": "kxQAcSyM9mLxO6WEW6lWksuq4/hyrHRIkUeeTlEB3bo=", + "bzlTransitiveDigest": "+UObPSehBvY4JgsKrrCNmKYw5WtXA0jtnDvu8EcROcc=", + "usagesDigest": "KlHtwR1ApTn7s2w4XaHO/78hm4gca4kpKJBUFXO2fLA=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -1426,7 +1454,8 @@ "repository": "library/busybox", "identifier": "sha256:97e3873d1f61ba651b632e4755fc52e1d90c9f6e4f01d9b720f37af5efed17e5", "platform": "linux/arm64/v8", - "target_name": "busybox_linux_arm64_v8" + "target_name": "busybox_linux_arm64_v8", + "bazel_tags": [] } }, "yq_linux_s390x": { @@ -1525,7 +1554,8 @@ "repository": "distroless/static", "identifier": "sha256:7e5c6a2a4ae854242874d36171b31d26e0539c98fc6080f942f16b03e82851ab", "platform": "linux/arm64/v8", - "target_name": "distroless_static_linux_arm64_v8" + "target_name": "distroless_static_linux_arm64_v8", + "bazel_tags": [] } }, "distroless_static_linux_amd64": { @@ -1537,7 +1567,8 @@ "repository": "distroless/static", "identifier": "sha256:7e5c6a2a4ae854242874d36171b31d26e0539c98fc6080f942f16b03e82851ab", "platform": "linux/amd64", - "target_name": "distroless_static_linux_amd64" + "target_name": "distroless_static_linux_amd64", + "bazel_tags": [] } }, "yq_windows_amd64": { @@ -1641,7 +1672,8 @@ "repository": "library/busybox", "identifier": "sha256:97e3873d1f61ba651b632e4755fc52e1d90c9f6e4f01d9b720f37af5efed17e5", "platform": "linux/amd64", - "target_name": "busybox_linux_amd64" + "target_name": "busybox_linux_amd64", + "bazel_tags": [] } }, "coreutils_windows_amd64": { @@ -2696,7 +2728,7 @@ }, "@@toolchains_llvm~//toolchain/extensions:llvm.bzl%llvm": { "general": { - "bzlTransitiveDigest": "1w0wdH2QnKapJmTbk88f5iQjNlw7vw4f4r1cNf1vWVI=", + "bzlTransitiveDigest": "i2QyNjD/qcSQlxaKhQjSN1uw8mm+ZusH07AWV6RnyQU=", "usagesDigest": "y4GhXw2Nz8XXz5YNQmYPuRmcpk5YSlfm89YT8XMZVcI=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -2751,6 +2783,11 @@ } }, "recordedRepoMappingEntries": [ + [ + "toolchains_llvm~", + "bazel_skylib", + "bazel_skylib~" + ], [ "toolchains_llvm~", "bazel_tools", diff --git a/cmd/bb_runner/main.go b/cmd/bb_runner/main.go index 6387f427..1eecbff4 100644 --- a/cmd/bb_runner/main.go +++ b/cmd/bb_runner/main.go @@ -39,7 +39,7 @@ func main() { } buildDirectoryPath, scopeWalker := path.EmptyBuilder.Join(path.NewAbsoluteScopeWalker(path.VoidComponentWalker)) - if err := path.Resolve(path.NewLocalParser(configuration.BuildDirectoryPath), scopeWalker); err != nil { + if err := path.Resolve(path.LocalFormat.NewParser(configuration.BuildDirectoryPath), scopeWalker); err != nil { return util.StatusWrapf(err, "Failed to resolve build directory %#v", configuration.BuildDirectoryPath) } buildDirectory := re_filesystem.NewLazyDirectory( @@ -108,7 +108,7 @@ func main() { // build actions aren't visible to successive actions. This also // prevents systems from running out of disk space. for _, d := range configuration.CleanTemporaryDirectories { - directory, err := filesystem.NewLocalDirectory(path.NewLocalParser(d)) + directory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(d)) if err != nil { return util.StatusWrapf(err, "Failed to open temporary directory %#v", d) } diff --git a/cmd/bb_virtual_tmp/main.go b/cmd/bb_virtual_tmp/main.go index 0ac2a8a4..ef34e516 100644 --- a/cmd/bb_virtual_tmp/main.go +++ b/cmd/bb_virtual_tmp/main.go @@ -48,7 +48,7 @@ func main() { // Create symbolic link whose target can be set by users. buildDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewUNIXParser(configuration.BuildDirectoryPath), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(configuration.BuildDirectoryPath), scopeWalker); err != nil { return util.StatusWrap(err, "Failed to resolve build directory path") } userSettableSymlink := virtual.NewUserSettableSymlink(buildDirectory) diff --git a/cmd/bb_worker/main.go b/cmd/bb_worker/main.go index 63497668..0ae94228 100644 --- a/cmd/bb_worker/main.go +++ b/cmd/bb_worker/main.go @@ -249,7 +249,7 @@ func main() { case *bb_worker.BuildDirectoryConfiguration_Native: // Directory where actual builds take place. nativeConfiguration := backend.Native - naiveBuildDirectory, err = filesystem.NewLocalDirectory(path.NewLocalParser(nativeConfiguration.BuildDirectoryPath)) + naiveBuildDirectory, err = filesystem.NewLocalDirectory(path.LocalFormat.NewParser(nativeConfiguration.BuildDirectoryPath)) if err != nil { return util.StatusWrapf(err, "Failed to open build directory %v", nativeConfiguration.BuildDirectoryPath) } @@ -262,7 +262,7 @@ func main() { // TODO: Have a single process-wide hardlinking // cache even if multiple build directories are // used. This increases cache hit rate. - cacheDirectory, err := filesystem.NewLocalDirectory(path.NewLocalParser(nativeConfiguration.CacheDirectoryPath)) + cacheDirectory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(nativeConfiguration.CacheDirectoryPath)) if err != nil { return util.StatusWrapf(err, "Failed to open cache directory %#v", nativeConfiguration.CacheDirectoryPath) } diff --git a/go.mod b/go.mod index 8ff588b7..3144f7b0 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,15 @@ module github.com/buildbarn/bb-remote-execution -go 1.22.4 +go 1.23.0 // Using the most recent version causes a cyclic dependency in protoc. replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0 require ( - cloud.google.com/go/longrunning v0.5.12 - github.com/bazelbuild/buildtools v0.0.0-20240804201302-37932ddd7230 + cloud.google.com/go/longrunning v0.6.0 + github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91 github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9 - github.com/buildbarn/bb-storage v0.0.0-20240819085035-a869915feea7 + github.com/buildbarn/bb-storage v0.0.0-20240831193755-af9ad48525bb github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 @@ -17,33 +17,33 @@ require ( github.com/hanwen/go-fuse/v2 v2.5.1 github.com/jmespath/go-jmespath v0.4.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/prometheus/client_golang v1.20.0 + github.com/prometheus/client_golang v1.20.2 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel v1.28.0 - go.opentelemetry.io/otel/trace v1.28.0 + go.opentelemetry.io/otel v1.29.0 + go.opentelemetry.io/otel/trace v1.29.0 go.uber.org/mock v0.4.0 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/sync v0.8.0 golang.org/x/sys v0.24.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 - google.golang.org/grpc v1.65.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed + google.golang.org/grpc v1.66.0 google.golang.org/protobuf v1.34.2 mvdan.cc/gofumpt v0.7.0 ) require ( cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.8.1 // indirect + cloud.google.com/go/auth v0.9.2 // 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 cloud.google.com/go/storage v1.43.0 // indirect github.com/aohorodnyk/mimeheader v0.0.6 // indirect github.com/aws/aws-sdk-go-v2 v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.28 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.28 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.31 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect @@ -53,10 +53,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect github.com/aws/smithy-go v1.20.4 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -71,7 +71,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.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/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect @@ -81,17 +81,17 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.57.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/sercand/kuberesolver/v5 v5.1.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.28.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/contrib/propagators/b3 v1.29.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.29.0 // indirect + go.opentelemetry.io/otel/sdk v1.29.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/crypto v0.26.0 // indirect golang.org/x/mod v0.20.0 // indirect @@ -100,10 +100,10 @@ require ( golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect - google.golang.org/api v0.192.0 // indirect - google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/bytestream v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/api v0.195.0 // indirect + google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect + google.golang.org/genproto/googleapis/bytestream v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/grpc/security/advancedtls v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 2e46e381..e954b08f 100644 --- a/go.sum +++ b/go.sum @@ -3,14 +3,21 @@ cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ= cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc= cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo= cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc= +cloud.google.com/go/auth v0.9.2 h1:I+Rq388FYU8QdbVB1IiPd+6KNdrqtAPE/asiKHShBLM= +cloud.google.com/go/auth v0.9.2/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk= cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= +cloud.google.com/go/compute v1.28.0 h1:OPtBxMcheSS+DWfci803qvPly3d4w7Eu5ztKBcFfzwk= cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4= cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus= +cloud.google.com/go/iam v1.2.0 h1:kZKMKVNk/IsSSc/udOb83K0hL/Yh/Gcqpz+oAkoIFN8= +cloud.google.com/go/iam v1.2.0/go.mod h1:zITGuWgsLZxd8OwAlX+eMFgZDXzBm7icj1PVTYG766Q= cloud.google.com/go/longrunning v0.5.12 h1:5LqSIdERr71CqfUsFlJdBpOkBH8FBCFD7P1nTWy3TYE= cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU= +cloud.google.com/go/longrunning v0.6.0 h1:mM1ZmaNsQsnb+5n1DNPeL0KwQd9jQRqSqSDEkBZr+aI= +cloud.google.com/go/longrunning v0.6.0/go.mod h1:uHzSZqW89h7/pasCWNYdUpwGz3PcVWhrWupreVPYLts= cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -22,8 +29,12 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5L github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg= github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= +github.com/aws/aws-sdk-go-v2/config v1.27.31 h1:kxBoRsjhT3pq0cKthgj6RU6bXTm/2SgdoUMyrVw0rAI= +github.com/aws/aws-sdk-go-v2/config v1.27.31/go.mod h1:z04nZdSWFPaDwK3DdJOG2r+scLQzMYuJeW0CujEm9FM= github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30 h1:aau/oYFtibVovr2rDt8FHlU17BTicFEMAi29V1U+L5Q= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= @@ -44,16 +55,22 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw43CFqqaPB5w3W2c= github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 h1:Wb544Wh+xfSXqJ/j3R4aX9wrKUoZsJNmilBYZb3mKQ4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac= github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhjeeA/Im2q4X0rJZT8= github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 h1:OMsEmCyz2i89XwRwPouAJvhj81wINh+4UK+k/0Yo/q8= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/bazelbuild/buildtools v0.0.0-20240804201302-37932ddd7230 h1:KaVZjqijBr8cjmGm8rnM+7fuQ69d2AZN+gFQA2MBKhY= github.com/bazelbuild/buildtools v0.0.0-20240804201302-37932ddd7230/go.mod h1:yBQGNvRAGhcBTxe4MHiW3Ul7DwoBim4XsKUaXnW1LWc= +github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91 h1:/wpuwyWvp46gZfQCmbR+4SI5ne7IjRUM5lsXTzpAeWM= +github.com/bazelbuild/buildtools v0.0.0-20240827154017-dd10159baa91/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9 h1:Ma3IQbZmIVd8ROR7TZNqN8YnSYKXWtW5t5uUc35pftI= github.com/bazelbuild/remote-apis v0.0.0-20240703191324-0d21f29acdb9/go.mod h1:ry8Y6CkQqCVcYsjPOlLXDX2iRVjOnjogdNwhvHmRcz8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -63,6 +80,8 @@ github.com/buildbarn/bb-storage v0.0.0-20240816064113-d07a29c5d102 h1:RpwFsHr8Yc github.com/buildbarn/bb-storage v0.0.0-20240816064113-d07a29c5d102/go.mod h1:96JvG1P6w+7kgYBO9/ySuCzNjMTYR7oBjcFAevq3gPQ= github.com/buildbarn/bb-storage v0.0.0-20240819085035-a869915feea7 h1:7Xpj+Lra53MnDtSnhoUhXHWJAytDXe1IXSrp0TbiQZw= github.com/buildbarn/bb-storage v0.0.0-20240819085035-a869915feea7/go.mod h1:vte1T088HnMnEsVo+xU/3R54oAKRCkTYFJJpjxC252w= +github.com/buildbarn/bb-storage v0.0.0-20240831193755-af9ad48525bb h1:0yEQ42pYtSzKbHgY1znV8DPCtVgsjmGhQdk1yyegwSY= +github.com/buildbarn/bb-storage v0.0.0-20240831193755-af9ad48525bb/go.mod h1:MJhSMYIrfugeaa3fKDAIdJa7R4MdZUDYF9Vp711+anw= github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 h1:Wtpgk4CIkoEJ7Qx3BwjaMp3TOVv834heqyCC9jMKStM= github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89/go.mod h1:zO8MAbsa53deqysDsONWhnRaj8fNFKDU96pKWrvieOw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -135,6 +154,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/enterprise-certificate-proxy v0.3.3 h1:QRje2j5GZimBzlbhGA2V2QlGNgL8G6e+wGo/+/2bWI0= +github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -180,11 +201,15 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY= +github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= @@ -219,22 +244,38 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0= +go.opentelemetry.io/contrib/propagators/b3 v1.29.0 h1:hNjyoRsAACnhoOLWupItUjABzeYmX3GTTZLzwJluJlk= +go.opentelemetry.io/contrib/propagators/b3 v1.29.0/go.mod h1:E76MTitU1Niwo5NSN+mVxkyLu4h4h7Dp/yh38F2WuIU= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= +go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -353,6 +394,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.192.0 h1:PljqpNAfZaaSpS+TnANfnNAXKdzHM/B9bKhwRlo7JP0= google.golang.org/api v0.192.0/go.mod h1:9VcphjvAxPKLmSxVSzPlSRXy/5ARMEw5bf58WoVXafQ= +google.golang.org/api v0.195.0 h1:Ude4N8FvTKnnQJHU48RFI40jOBgIrL8Zqr3/QeST6yU= +google.golang.org/api v0.195.0/go.mod h1:DOGRWuv3P8TU8Lnz7uQc4hyNqrBpMtD9ppW3wBJurgc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -362,12 +405,20 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= +google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed h1:4C4dbrVFtfIp3GXJdMX1Sj25mahfn5DywOo65/2ISQ8= +google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:ICjniACoWvcDz8c8bOsHVKuuSGDJy1z5M4G0DM3HzTc= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/bytestream v0.0.0-20240814211410-ddb44dafa142 h1:abw8n4dbagiJlEWXb1eDu2nB0NDSf6o4J7YO8Fb/ik0= google.golang.org/genproto/googleapis/bytestream v0.0.0-20240814211410-ddb44dafa142/go.mod h1:gQizMG9jZ0L2ADJaM+JdZV4yTCON/CQpnHRPoM+54w4= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240827150818-7e3bb234dfed h1:AZd1A9fTBvSt2tzzGcvceahgpF8KT9ySxlH7XWDP59k= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:JiVUJxp16VQus+4elMMLG+GNlhUAxy3CmBn3HLBMfaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -378,6 +429,8 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= +google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/examples v0.0.0-20201112215255-90f1b3ee835b h1:NuxyvVZoDfHZwYW9LD4GJiF5/nhiSyP4/InTrvw9Ibk= google.golang.org/grpc/examples v0.0.0-20201112215255-90f1b3ee835b/go.mod h1:IBqQ7wSUJ2Ep09a8rMWFsg4fmI2r38zwsq8a0GgxXpM= google.golang.org/grpc/security/advancedtls v1.0.0 h1:/KQ7VP/1bs53/aopk9QhuPyFAp9Dm9Ejix3lzYkCrDA= diff --git a/pkg/builder/command.go b/pkg/builder/command.go index 58be49ad..c5961310 100644 --- a/pkg/builder/command.go +++ b/pkg/builder/command.go @@ -102,7 +102,7 @@ func ConvertCommandToShellScript(command *remoteexecution.Command, w io.StringWr // Switch to the right working directory. workingDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewUNIXParser(command.WorkingDirectory), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(command.WorkingDirectory), scopeWalker); err != nil { return util.StatusWrap(err, "Failed to resolve working directory") } if _, err := w.WriteString("cd "); err != nil { diff --git a/pkg/builder/naive_build_directory.go b/pkg/builder/naive_build_directory.go index 9e984d1c..d36ac325 100644 --- a/pkg/builder/naive_build_directory.go +++ b/pkg/builder/naive_build_directory.go @@ -152,7 +152,7 @@ func (d *naiveBuildDirectory) mergeDirectoryContents(ctx context.Context, group return status.Errorf(codes.InvalidArgument, "Symlink %#v has an invalid name", symlink.Name) } childPathTrace := pathTrace.Append(component) - if err := inputDirectory.Symlink(path.NewUNIXParser(symlink.Target), component); err != nil { + if err := inputDirectory.Symlink(path.UNIXFormat.NewParser(symlink.Target), component); err != nil { return util.StatusWrapf(err, "Failed to create input symlink %#v", childPathTrace.GetUNIXString()) } } diff --git a/pkg/builder/output_hierarchy.go b/pkg/builder/output_hierarchy.go index 92a3f76e..8c0cdd32 100644 --- a/pkg/builder/output_hierarchy.go +++ b/pkg/builder/output_hierarchy.go @@ -470,7 +470,7 @@ type OutputHierarchy struct { // message. func NewOutputHierarchy(command *remoteexecution.Command) (*OutputHierarchy, error) { var workingDirectory outputNodePath - if err := path.Resolve(path.NewUNIXParser(command.WorkingDirectory), path.NewRelativeScopeWalker(&workingDirectory)); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(command.WorkingDirectory), path.NewRelativeScopeWalker(&workingDirectory)); err != nil { return nil, util.StatusWrap(err, "Invalid working directory") } @@ -522,7 +522,7 @@ func (oh *OutputHierarchy) lookup(workingDirectory outputNodePath, targetPath st outputPath := outputNodePath{ components: append([]path.Component(nil), workingDirectory.components...), } - if err := path.Resolve(path.NewUNIXParser(targetPath), path.NewRelativeScopeWalker(&outputPath)); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(targetPath), path.NewRelativeScopeWalker(&outputPath)); err != nil { return nil, nil, err } diff --git a/pkg/builder/output_hierarchy_test.go b/pkg/builder/output_hierarchy_test.go index 689009e3..7f939ae5 100644 --- a/pkg/builder/output_hierarchy_test.go +++ b/pkg/builder/output_hierarchy_test.go @@ -287,17 +287,17 @@ func TestOutputHierarchyUploadOutputs(t *testing.T) { foo.EXPECT().Lstat(path.MustNewComponent("path-enoent")).Return(filesystem.FileInfo{}, syscall.ENOENT) // Inspection/uploading of all non-directory outputs. - foo.EXPECT().Readlink(path.MustNewComponent("directory-symlink")).Return(path.NewUNIXParser("directory-symlink-target"), nil) + foo.EXPECT().Readlink(path.MustNewComponent("directory-symlink")).Return(path.UNIXFormat.NewParser("directory-symlink-target"), nil) foo.EXPECT().UploadFile(ctx, path.MustNewComponent("file-regular"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "a58c2f2281011ca2e631b39baa1ab657", 12), nil) foo.EXPECT().UploadFile(ctx, path.MustNewComponent("file-executable"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "7590e1b46240ecb5ea65a80db7ee6fae", 15), nil) - foo.EXPECT().Readlink(path.MustNewComponent("file-symlink")).Return(path.NewUNIXParser("file-symlink-target"), nil) + foo.EXPECT().Readlink(path.MustNewComponent("file-symlink")).Return(path.UNIXFormat.NewParser("file-symlink-target"), nil) foo.EXPECT().UploadFile(ctx, path.MustNewComponent("path-regular"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "44206648b7bb2f3b0d2ed0c52ad2e269", 12), nil) foo.EXPECT().UploadFile(ctx, path.MustNewComponent("path-executable"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "87729325cd08d300fb0e238a3a8da443", 15), nil) - foo.EXPECT().Readlink(path.MustNewComponent("path-symlink")).Return(path.NewUNIXParser("path-symlink-target"), nil) + foo.EXPECT().Readlink(path.MustNewComponent("path-symlink")).Return(path.UNIXFormat.NewParser("path-symlink-target"), nil) // Uploading of /foo/directory-directory. Files with an // unknown type (UNIX sockets, FIFOs) should be ignored. @@ -320,7 +320,7 @@ func TestOutputHierarchyUploadOutputs(t *testing.T) { Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "ee7004c7949d83f130592f15d98ca343", 10), nil) directoryDirectory.EXPECT().UploadFile(ctx, path.MustNewComponent("regular"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "af37d08ae228a87dc6b265fd1019c97d", 7), nil) - directoryDirectory.EXPECT().Readlink(path.MustNewComponent("symlink")).Return(path.NewUNIXParser("symlink-target"), nil) + directoryDirectory.EXPECT().Readlink(path.MustNewComponent("symlink")).Return(path.UNIXFormat.NewParser("symlink-target"), nil) directoryDirectory.EXPECT().Close() contentAddressableStorage.EXPECT().Put( ctx, @@ -906,7 +906,7 @@ func TestOutputHierarchyUploadOutputs(t *testing.T) { }, nil) root.EXPECT().UploadFile(ctx, path.MustNewComponent("file1"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "132d36a32eb9e41afb86d8ba65fe9657", 123), nil) - root.EXPECT().Readlink(path.MustNewComponent("symlink1")).Return(path.NewUNIXParser("target1"), nil) + root.EXPECT().Readlink(path.MustNewComponent("symlink1")).Return(path.UNIXFormat.NewParser("target1"), nil) directory1 := mock.NewMockUploadableDirectory(ctrl) root.EXPECT().EnterUploadableDirectory(path.MustNewComponent("directory1")).Return(directory1, nil) @@ -916,7 +916,7 @@ func TestOutputHierarchyUploadOutputs(t *testing.T) { }, nil) directory1.EXPECT().UploadFile(ctx, path.MustNewComponent("file2"), gomock.Any(), writableFileUploadDelay). Return(digest.MustNewDigest("example", remoteexecution.DigestFunction_MD5, "09ae70542cc258d5c1007d774da5ccb1", 456), nil) - directory1.EXPECT().Readlink(path.MustNewComponent("symlink2")).Return(path.NewUNIXParser("target2"), nil) + directory1.EXPECT().Readlink(path.MustNewComponent("symlink2")).Return(path.UNIXFormat.NewParser("target2"), nil) directory1.EXPECT().Close() rootDirectory := &remoteexecution.Directory{ diff --git a/pkg/filesystem/configuration.go b/pkg/filesystem/configuration.go index 1803e037..94850c56 100644 --- a/pkg/filesystem/configuration.go +++ b/pkg/filesystem/configuration.go @@ -28,7 +28,7 @@ func NewFilePoolFromConfiguration(configuration *pb.FilePoolConfiguration) (File case *pb.FilePoolConfiguration_InMemory: filePool = InMemoryFilePool case *pb.FilePoolConfiguration_DirectoryPath: - directory, err := filesystem.NewLocalDirectory(path.NewLocalParser(backend.DirectoryPath)) + directory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(backend.DirectoryPath)) if err != nil { return nil, util.StatusWrapf(err, "Failed to open directory %#v", backend.DirectoryPath) } diff --git a/pkg/filesystem/lazy_directory_test.go b/pkg/filesystem/lazy_directory_test.go index 5bde695d..8ee739cd 100644 --- a/pkg/filesystem/lazy_directory_test.go +++ b/pkg/filesystem/lazy_directory_test.go @@ -116,7 +116,7 @@ func TestLazyDirectory(t *testing.T) { t.Run("ReadlinkSuccess", func(t *testing.T) { underlyingDirectory := mock.NewMockDirectoryCloser(ctrl) directoryOpener.EXPECT().Call().Return(underlyingDirectory, nil) - underlyingDirectory.EXPECT().Readlink(path.MustNewComponent("symlink")).Return(path.NewUNIXParser("target"), nil) + underlyingDirectory.EXPECT().Readlink(path.MustNewComponent("symlink")).Return(path.UNIXFormat.NewParser("target"), nil) underlyingDirectory.EXPECT().Close().Return(nil) // Call should be forwarded literally. @@ -182,7 +182,7 @@ func TestLazyDirectory(t *testing.T) { underlyingDirectory.EXPECT().Close().Return(nil) // Call should be forwarded literally. - err := directory.Symlink(path.NewUNIXParser("old"), path.MustNewComponent("new")) + err := directory.Symlink(path.UNIXFormat.NewParser("old"), path.MustNewComponent("new")) require.NoError(t, err) }) diff --git a/pkg/filesystem/virtual/base_symlink_factory.go b/pkg/filesystem/virtual/base_symlink_factory.go index e649b7bf..6c28e51d 100644 --- a/pkg/filesystem/virtual/base_symlink_factory.go +++ b/pkg/filesystem/virtual/base_symlink_factory.go @@ -34,7 +34,7 @@ func (f symlink) Readlink() (path.Parser, error) { if !utf8.Valid(f.target) { return nil, status.Error(codes.InvalidArgument, "Symbolic link contents are not valid UTF-8") } - return path.NewUNIXParser(string(f.target)), nil + return path.UNIXFormat.NewParser(string(f.target)), nil } func (f symlink) readlinkString() (string, error) { diff --git a/pkg/filesystem/virtual/user_settable_symlink.go b/pkg/filesystem/virtual/user_settable_symlink.go index 2961d0fe..e2d88c81 100644 --- a/pkg/filesystem/virtual/user_settable_symlink.go +++ b/pkg/filesystem/virtual/user_settable_symlink.go @@ -63,7 +63,7 @@ func (f *UserSettableSymlink) InstallTemporaryDirectory(ctx context.Context, req key := protojson.Format(publicAuthenticationMetadata) temporaryDirectory, scopeWalker := f.buildDirectory.Join(path.NewRelativeScopeWalker(path.VoidComponentWalker)) - if err := path.Resolve(path.NewUNIXParser(request.TemporaryDirectory), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(request.TemporaryDirectory), scopeWalker); err != nil { return nil, err } target := []byte(temporaryDirectory.GetUNIXString()) diff --git a/pkg/filesystem/virtual/user_settable_symlink_test.go b/pkg/filesystem/virtual/user_settable_symlink_test.go index c6ec6b4e..306c0a68 100644 --- a/pkg/filesystem/virtual/user_settable_symlink_test.go +++ b/pkg/filesystem/virtual/user_settable_symlink_test.go @@ -20,7 +20,7 @@ import ( func TestUserSettableSymlink(t *testing.T) { buildDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - require.NoError(t, path.Resolve(path.NewUNIXParser("/var/build"), scopeWalker)) + require.NoError(t, path.Resolve(path.UNIXFormat.NewParser("/var/build"), scopeWalker)) symlink := virtual.NewUserSettableSymlink(buildDirectory) ctx1 := auth.NewContextWithAuthenticationMetadata( diff --git a/pkg/proto/bazeloutputservice/bazel_output_service.pb.go b/pkg/proto/bazeloutputservice/bazel_output_service.pb.go index adf91544..99b91e00 100644 --- a/pkg/proto/bazeloutputservice/bazel_output_service.pb.go +++ b/pkg/proto/bazeloutputservice/bazel_output_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/bazeloutputservice/bazel_output_service.proto package bazeloutputservice diff --git a/pkg/proto/bazeloutputservice/bazel_output_service_grpc.pb.go b/pkg/proto/bazeloutputservice/bazel_output_service_grpc.pb.go index 14fa899b..5ba06f35 100644 --- a/pkg/proto/bazeloutputservice/bazel_output_service_grpc.pb.go +++ b/pkg/proto/bazeloutputservice/bazel_output_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/bazeloutputservice/bazel_output_service.proto package bazeloutputservice diff --git a/pkg/proto/bazeloutputservice/rev2/bazel_output_service_rev2.pb.go b/pkg/proto/bazeloutputservice/rev2/bazel_output_service_rev2.pb.go index 512b510b..997d3a8e 100644 --- a/pkg/proto/bazeloutputservice/rev2/bazel_output_service_rev2.pb.go +++ b/pkg/proto/bazeloutputservice/rev2/bazel_output_service_rev2.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/bazeloutputservice/rev2/bazel_output_service_rev2.proto package bazeloutputservicerev2 diff --git a/pkg/proto/buildqueuestate/buildqueuestate.pb.go b/pkg/proto/buildqueuestate/buildqueuestate.pb.go index 001a4260..19375896 100644 --- a/pkg/proto/buildqueuestate/buildqueuestate.pb.go +++ b/pkg/proto/buildqueuestate/buildqueuestate.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/buildqueuestate/buildqueuestate.proto package buildqueuestate diff --git a/pkg/proto/buildqueuestate/buildqueuestate_grpc.pb.go b/pkg/proto/buildqueuestate/buildqueuestate_grpc.pb.go index a5850420..2e85e8e0 100644 --- a/pkg/proto/buildqueuestate/buildqueuestate_grpc.pb.go +++ b/pkg/proto/buildqueuestate/buildqueuestate_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/buildqueuestate/buildqueuestate.proto package buildqueuestate diff --git a/pkg/proto/cas/cas.pb.go b/pkg/proto/cas/cas.pb.go index 7705673a..f0e26e99 100644 --- a/pkg/proto/cas/cas.pb.go +++ b/pkg/proto/cas/cas.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/cas/cas.proto package cas diff --git a/pkg/proto/completedactionlogger/completed_action_logger.pb.go b/pkg/proto/completedactionlogger/completed_action_logger.pb.go index e24aaed8..44461cfe 100644 --- a/pkg/proto/completedactionlogger/completed_action_logger.pb.go +++ b/pkg/proto/completedactionlogger/completed_action_logger.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/completedactionlogger/completed_action_logger.proto package completedactionlogger diff --git a/pkg/proto/completedactionlogger/completed_action_logger_grpc.pb.go b/pkg/proto/completedactionlogger/completed_action_logger_grpc.pb.go index 9a858510..04ef3f6a 100644 --- a/pkg/proto/completedactionlogger/completed_action_logger_grpc.pb.go +++ b/pkg/proto/completedactionlogger/completed_action_logger_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/completedactionlogger/completed_action_logger.proto package completedactionlogger diff --git a/pkg/proto/configuration/bb_noop_worker/bb_noop_worker.pb.go b/pkg/proto/configuration/bb_noop_worker/bb_noop_worker.pb.go index 2b1fc4b3..9ea4ecc9 100644 --- a/pkg/proto/configuration/bb_noop_worker/bb_noop_worker.pb.go +++ b/pkg/proto/configuration/bb_noop_worker/bb_noop_worker.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/bb_noop_worker/bb_noop_worker.proto package bb_noop_worker diff --git a/pkg/proto/configuration/bb_runner/bb_runner.pb.go b/pkg/proto/configuration/bb_runner/bb_runner.pb.go index 0d615a6e..8207e430 100644 --- a/pkg/proto/configuration/bb_runner/bb_runner.pb.go +++ b/pkg/proto/configuration/bb_runner/bb_runner.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/bb_runner/bb_runner.proto package bb_runner diff --git a/pkg/proto/configuration/bb_scheduler/bb_scheduler.pb.go b/pkg/proto/configuration/bb_scheduler/bb_scheduler.pb.go index 950bd83b..217c51b3 100644 --- a/pkg/proto/configuration/bb_scheduler/bb_scheduler.pb.go +++ b/pkg/proto/configuration/bb_scheduler/bb_scheduler.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/bb_scheduler/bb_scheduler.proto package bb_scheduler diff --git a/pkg/proto/configuration/bb_virtual_tmp/bb_virtual_tmp.pb.go b/pkg/proto/configuration/bb_virtual_tmp/bb_virtual_tmp.pb.go index 9a498434..3209097f 100644 --- a/pkg/proto/configuration/bb_virtual_tmp/bb_virtual_tmp.pb.go +++ b/pkg/proto/configuration/bb_virtual_tmp/bb_virtual_tmp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/bb_virtual_tmp/bb_virtual_tmp.proto package bb_virtual_tmp diff --git a/pkg/proto/configuration/bb_worker/bb_worker.pb.go b/pkg/proto/configuration/bb_worker/bb_worker.pb.go index fb516773..552b115d 100644 --- a/pkg/proto/configuration/bb_worker/bb_worker.pb.go +++ b/pkg/proto/configuration/bb_worker/bb_worker.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/bb_worker/bb_worker.proto package bb_worker diff --git a/pkg/proto/configuration/cas/cas.pb.go b/pkg/proto/configuration/cas/cas.pb.go index b6e0b007..58059400 100644 --- a/pkg/proto/configuration/cas/cas.pb.go +++ b/pkg/proto/configuration/cas/cas.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/cas/cas.proto package cas diff --git a/pkg/proto/configuration/credentials/credentials.pb.go b/pkg/proto/configuration/credentials/credentials.pb.go index d3e4f0ce..7a960793 100644 --- a/pkg/proto/configuration/credentials/credentials.pb.go +++ b/pkg/proto/configuration/credentials/credentials.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/credentials/credentials.proto package credentials diff --git a/pkg/proto/configuration/filesystem/filesystem.pb.go b/pkg/proto/configuration/filesystem/filesystem.pb.go index 3d49df96..aa804f2d 100644 --- a/pkg/proto/configuration/filesystem/filesystem.pb.go +++ b/pkg/proto/configuration/filesystem/filesystem.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/filesystem/filesystem.proto package filesystem diff --git a/pkg/proto/configuration/filesystem/virtual/virtual.pb.go b/pkg/proto/configuration/filesystem/virtual/virtual.pb.go index 21933e58..b4755260 100644 --- a/pkg/proto/configuration/filesystem/virtual/virtual.pb.go +++ b/pkg/proto/configuration/filesystem/virtual/virtual.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/filesystem/virtual/virtual.proto package virtual diff --git a/pkg/proto/configuration/scheduler/scheduler.pb.go b/pkg/proto/configuration/scheduler/scheduler.pb.go index 4d091dc5..8de50389 100644 --- a/pkg/proto/configuration/scheduler/scheduler.pb.go +++ b/pkg/proto/configuration/scheduler/scheduler.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/configuration/scheduler/scheduler.proto package scheduler diff --git a/pkg/proto/outputpathpersistency/outputpathpersistency.pb.go b/pkg/proto/outputpathpersistency/outputpathpersistency.pb.go index bd189beb..999a2d32 100644 --- a/pkg/proto/outputpathpersistency/outputpathpersistency.pb.go +++ b/pkg/proto/outputpathpersistency/outputpathpersistency.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/outputpathpersistency/outputpathpersistency.proto package outputpathpersistency diff --git a/pkg/proto/remoteworker/remoteworker.pb.go b/pkg/proto/remoteworker/remoteworker.pb.go index 55fba6ae..7a699919 100644 --- a/pkg/proto/remoteworker/remoteworker.pb.go +++ b/pkg/proto/remoteworker/remoteworker.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/remoteworker/remoteworker.proto package remoteworker diff --git a/pkg/proto/remoteworker/remoteworker_grpc.pb.go b/pkg/proto/remoteworker/remoteworker_grpc.pb.go index 31c39a48..70415c7d 100644 --- a/pkg/proto/remoteworker/remoteworker_grpc.pb.go +++ b/pkg/proto/remoteworker/remoteworker_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/remoteworker/remoteworker.proto package remoteworker diff --git a/pkg/proto/resourceusage/resourceusage.pb.go b/pkg/proto/resourceusage/resourceusage.pb.go index abe07179..7c1cf064 100644 --- a/pkg/proto/resourceusage/resourceusage.pb.go +++ b/pkg/proto/resourceusage/resourceusage.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/resourceusage/resourceusage.proto package resourceusage diff --git a/pkg/proto/runner/runner.pb.go b/pkg/proto/runner/runner.pb.go index 50106e09..591c6253 100644 --- a/pkg/proto/runner/runner.pb.go +++ b/pkg/proto/runner/runner.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/runner/runner.proto package runner diff --git a/pkg/proto/runner/runner_grpc.pb.go b/pkg/proto/runner/runner_grpc.pb.go index 213f749c..8a297e2b 100644 --- a/pkg/proto/runner/runner_grpc.pb.go +++ b/pkg/proto/runner/runner_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/runner/runner.proto package runner diff --git a/pkg/proto/tmp_installer/tmp_installer.pb.go b/pkg/proto/tmp_installer/tmp_installer.pb.go index ae5e14cf..09a49d11 100644 --- a/pkg/proto/tmp_installer/tmp_installer.pb.go +++ b/pkg/proto/tmp_installer/tmp_installer.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 -// protoc v5.27.1 +// protoc v5.27.3 // source: pkg/proto/tmp_installer/tmp_installer.proto package tmp_installer diff --git a/pkg/proto/tmp_installer/tmp_installer_grpc.pb.go b/pkg/proto/tmp_installer/tmp_installer_grpc.pb.go index 832377a4..babd7b8d 100644 --- a/pkg/proto/tmp_installer/tmp_installer_grpc.pb.go +++ b/pkg/proto/tmp_installer/tmp_installer_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v5.27.1 +// - protoc v5.27.3 // source: pkg/proto/tmp_installer/tmp_installer.proto package tmp_installer diff --git a/pkg/runner/local_runner.go b/pkg/runner/local_runner.go index 13236347..0a4559dc 100644 --- a/pkg/runner/local_runner.go +++ b/pkg/runner/local_runner.go @@ -78,7 +78,7 @@ func (r *localRunner) openLog(logPath string) (filesystem.FileAppender, error) { stack: util.NewNonEmptyStack(filesystem.NopDirectoryCloser(r.buildDirectory)), } defer logFileResolver.closeAll() - if err := path.Resolve(path.NewUNIXParser(logPath), path.NewRelativeScopeWalker(&logFileResolver)); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(logPath), path.NewRelativeScopeWalker(&logFileResolver)); err != nil { return nil, err } if logFileResolver.TerminalName == nil { @@ -101,7 +101,7 @@ func NewPlainCommandCreator(sysProcAttr *syscall.SysProcAttr) CommandCreator { if err := path.Resolve(workingDirectoryParser, scopeWalker); err != nil { return nil, util.StatusWrap(err, "Failed to resolve working directory") } - workingDirectoryStr, err := path.GetLocalString(workingDirectory) + workingDirectoryStr, err := path.LocalFormat.GetString(workingDirectory) if err != nil { return nil, util.StatusWrap(err, "Failed to create local representation of working directory") } @@ -141,11 +141,11 @@ func (r *localRunner) Run(ctx context.Context, request *runner.RunRequest) (*run } inputRootDirectory, scopeWalker := r.buildDirectoryPath.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewUNIXParser(request.InputRootDirectory), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(request.InputRootDirectory), scopeWalker); err != nil { return nil, util.StatusWrap(err, "Failed to resolve input root directory") } - cmd, err := r.commandCreator(ctx, request.Arguments, inputRootDirectory, path.NewUNIXParser(request.WorkingDirectory), request.EnvironmentVariables["PATH"]) + cmd, err := r.commandCreator(ctx, request.Arguments, inputRootDirectory, path.UNIXFormat.NewParser(request.WorkingDirectory), request.EnvironmentVariables["PATH"]) if err != nil { return nil, err } @@ -154,10 +154,10 @@ func (r *localRunner) Run(ctx context.Context, request *runner.RunRequest) (*run cmd.Env = make([]string, 0, len(request.EnvironmentVariables)+1) if r.setTmpdirEnvironmentVariable && request.TemporaryDirectory != "" { temporaryDirectory, scopeWalker := r.buildDirectoryPath.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewUNIXParser(request.TemporaryDirectory), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(request.TemporaryDirectory), scopeWalker); err != nil { return nil, util.StatusWrap(err, "Failed to resolve temporary directory") } - temporaryDirectoryStr, err := path.GetLocalString(temporaryDirectory) + temporaryDirectoryStr, err := path.LocalFormat.GetString(temporaryDirectory) if err != nil { return nil, util.StatusWrap(err, "Failed to create local representation of temporary directory") } @@ -226,7 +226,7 @@ func (r *localRunner) CheckReadiness(ctx context.Context, request *runner.CheckR stack: util.NewNonEmptyStack(filesystem.NopDirectoryCloser(r.buildDirectory)), } defer pathResolver.closeAll() - if err := path.Resolve(path.NewUNIXParser(request.Path), path.NewRelativeScopeWalker(&pathResolver)); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(request.Path), path.NewRelativeScopeWalker(&pathResolver)); err != nil { return nil, util.StatusWrapfWithCode(err, codes.Internal, "Failed to resolve path %#v in build directory", request.Path) } if name := pathResolver.TerminalName; name != nil { @@ -242,15 +242,15 @@ func (r *localRunner) CheckReadiness(ctx context.Context, request *runner.CheckR // search path that is part of the PATH environment variable. func getExecutablePath(baseDirectory *path.Builder, searchPathStr, argv0 string) (string, error) { searchPath, scopeWalker := baseDirectory.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewLocalParser(searchPathStr), scopeWalker); err != nil { + if err := path.Resolve(path.LocalFormat.NewParser(searchPathStr), scopeWalker); err != nil { return "", err } executablePath, scopeWalker := searchPath.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewLocalParser(argv0), scopeWalker); err != nil { + if err := path.Resolve(path.LocalFormat.NewParser(argv0), scopeWalker); err != nil { return "", err } - return path.GetLocalString(executablePath) + return path.LocalFormat.GetString(executablePath) } // lookupExecutable returns the path of an executable, taking the PATH diff --git a/pkg/runner/local_runner_test.go b/pkg/runner/local_runner_test.go index e8ca02c7..eede6b06 100644 --- a/pkg/runner/local_runner_test.go +++ b/pkg/runner/local_runner_test.go @@ -85,12 +85,12 @@ func TestLocalRunnerRun(t *testing.T) { ctrl := gomock.NewController(t) buildDirectoryPath := t.TempDir() - buildDirectory, err := filesystem.NewLocalDirectory(path.NewLocalParser(buildDirectoryPath)) + buildDirectory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(buildDirectoryPath)) require.NoError(t, err) defer buildDirectory.Close() buildDirectoryPathBuilder, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - require.NoError(t, path.Resolve(path.NewUNIXParser(buildDirectoryPath), scopeWalker)) + require.NoError(t, path.Resolve(path.UNIXFormat.NewParser(buildDirectoryPath), scopeWalker)) var cmdPath string var getEnvCommand []string diff --git a/pkg/runner/local_runner_unix.go b/pkg/runner/local_runner_unix.go index ab392e1f..51e067ef 100644 --- a/pkg/runner/local_runner_unix.go +++ b/pkg/runner/local_runner_unix.go @@ -29,7 +29,7 @@ func NewChrootedCommandCreator(sysProcAttr *syscall.SysProcAttr) (CommandCreator // https://github.com/golang/go/issues/39341 cmd := exec.CommandContext(ctx, "/usr/bin/env", append([]string{"--"}, arguments...)...) - inputRootDirectoryStr, err := path.GetLocalString(inputRootDirectory) + inputRootDirectoryStr, err := path.LocalFormat.GetString(inputRootDirectory) if err != nil { return nil, util.StatusWrap(err, "Failed to create local representation of input root directory") } @@ -43,7 +43,7 @@ func NewChrootedCommandCreator(sysProcAttr *syscall.SysProcAttr) (CommandCreator if err := path.Resolve(workingDirectoryParser, scopeWalker); err != nil { return nil, util.StatusWrap(err, "Failed to resolve working directory") } - workingDirectoryStr, err := path.GetLocalString(workingDirectory) + workingDirectoryStr, err := path.LocalFormat.GetString(workingDirectory) if err != nil { return nil, util.StatusWrap(err, "Failed to create local representation of working directory") } diff --git a/pkg/runner/temporary_directory_symlinking_runner.go b/pkg/runner/temporary_directory_symlinking_runner.go index 0623fe39..00f7a8f8 100644 --- a/pkg/runner/temporary_directory_symlinking_runner.go +++ b/pkg/runner/temporary_directory_symlinking_runner.go @@ -60,7 +60,7 @@ func (r *temporaryDirectorySymlinkingRunner) Run(ctx context.Context, request *r // Compute the absolute path of the temporary directory that is // offered by bb_worker. temporaryDirectoryPath, scopeWalker := r.buildDirectoryPath.Join(path.VoidScopeWalker) - if err := path.Resolve(path.NewUNIXParser(request.TemporaryDirectory), scopeWalker); err != nil { + if err := path.Resolve(path.UNIXFormat.NewParser(request.TemporaryDirectory), scopeWalker); err != nil { return nil, util.StatusWrap(err, "Failed to resolve temporary directory") } diff --git a/pkg/runner/temporary_directory_symlinking_runner_test.go b/pkg/runner/temporary_directory_symlinking_runner_test.go index 5b61fab9..79536193 100644 --- a/pkg/runner/temporary_directory_symlinking_runner_test.go +++ b/pkg/runner/temporary_directory_symlinking_runner_test.go @@ -24,7 +24,7 @@ func TestTemporaryDirectorySymlinkingRunnerRun(t *testing.T) { ctrl, ctx := gomock.WithContext(context.Background(), t) buildDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - require.NoError(t, path.Resolve(path.NewUNIXParser("/worker/build"), scopeWalker)) + require.NoError(t, path.Resolve(path.UNIXFormat.NewParser("/worker/build"), scopeWalker)) t.Run("InvalidTemporaryDirectory", func(t *testing.T) { // The temporary directory path provided by bb_worker is @@ -97,7 +97,7 @@ func TestTemporaryDirectorySymlinkingRunnerCheckReadiness(t *testing.T) { ctrl, ctx := gomock.WithContext(context.Background(), t) buildDirectory, scopeWalker := path.EmptyBuilder.Join(path.VoidScopeWalker) - require.NoError(t, path.Resolve(path.NewUNIXParser("/worker/build"), scopeWalker)) + require.NoError(t, path.Resolve(path.UNIXFormat.NewParser("/worker/build"), scopeWalker)) t.Run("InvalidSymlinkPath", func(t *testing.T) { // Readiness checks should fail in case the path at