From a8a167cb206f6c66e52ab4e92e0939e91b8dfed8 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Fri, 21 Feb 2025 16:18:47 +0100 Subject: ArtifactBlob: Convert to a class --- src/buildtool/execution_api/remote/bazel/bazel_response.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/buildtool/execution_api/remote/bazel/bazel_response.cpp') diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index ee207ac7..a0a621a4 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -67,7 +67,7 @@ auto BazelResponse::ReadStringBlob(bazel_re::Digest const& id) noexcept if (digest.has_value()) { auto reader = network_->CreateReader(); if (auto blob = reader.ReadSingleBlob(*digest)) { - return *blob->data; + return *blob->ReadContent(); } } Logger::Log(LogLevel::Warning, @@ -240,11 +240,11 @@ auto BazelResponse::Populate() noexcept -> std::optional { for (auto const& tree_blob : tree_blobs) { try { auto tree = BazelMsgFactory::MessageFromString( - *tree_blob.data); + *tree_blob.ReadContent()); if (not tree) { return fmt::format( "BazelResponse: failed to create Tree for {}", - tree_blob.digest.hash()); + tree_blob.GetDigest().hash()); } // The server does not store the Directory messages it just @@ -266,7 +266,7 @@ auto BazelResponse::Populate() noexcept -> std::optional { return fmt::format( "BazelResponse: unexpected failure gathering digest for " "{}:\n{}", - tree_blob.digest.hash(), + tree_blob.GetDigest().hash(), ex.what()); } ++pos; @@ -291,7 +291,7 @@ auto BazelResponse::UploadTreeMessageDirectories( if (not rootdir_blob) { return unexpected{std::move(rootdir_blob).error()}; } - auto const root_digest = rootdir_blob->digest; + auto const root_digest = rootdir_blob->GetDigest(); // store or upload rootdir blob, taking maximum transfer size into account if (not UpdateContainerAndUpload(&dir_blobs, *std::move(rootdir_blob), @@ -307,7 +307,7 @@ auto BazelResponse::UploadTreeMessageDirectories( if (not blob) { return unexpected{std::move(blob).error()}; } - auto const blob_digest = blob->digest; + auto const blob_digest = blob->GetDigest(); if (not UpdateContainerAndUpload(&dir_blobs, *std::move(blob), /*exception_is_fatal=*/false, -- cgit v1.2.3