BazelCasClient: Use ArtifactBlob in UpdateSingleBlob

3 files changed, 9 insertions, 18 deletions

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
index dc920bca..f6919488 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
@@ -302,7 +302,7 @@ auto BazelCasClient::GetTree(std::string const& instance_name,
 }
 
 auto BazelCasClient::UpdateSingleBlob(std::string const& instance_name,
-                                      BazelBlob const& blob) const noexcept
+                                      ArtifactBlob const& blob) const noexcept
     -> bool {
     logger_.Emit(LogLevel::Trace, [&blob]() {
         std::ostringstream oss{};
@@ -327,7 +327,7 @@ auto BazelCasClient::UpdateSingleBlob(std::string const& instance_name,
         logger_.Emit(LogLevel::Error,
                      "Failed to write {}:{}",
                      blob.digest.hash(),
-                     blob.digest.size_bytes());
+                     blob.digest.size());
     }
     return ok;
 }
@@ -587,16 +587,11 @@ auto BazelCasClient::BatchUpdateBlobs(std::string const& instance_name,
         // trying that again; instead, we fall back to uploading each blob
         // sequentially.
         logger_.Emit(LogLevel::Debug, "Falling back to sequential blob upload");
-        return std::count_if(
-            blobs.begin(),
-            blobs.end(),
-            [this, &instance_name](ArtifactBlob const& blob) {
-                BazelBlob bazel_blob{
-                    ArtifactDigestFactory::ToBazel(blob.digest),
-                    blob.data,
-                    blob.is_exec};
-                return UpdateSingleBlob(instance_name, bazel_blob);
-            });
+        return std::count_if(blobs.begin(),
+                             blobs.end(),
+                             [this, &instance_name](ArtifactBlob const& blob) {
+                                 return UpdateSingleBlob(instance_name, blob);
+                             });
     }
     return updated.size();
 }
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
index 41b323d2..abde3ae2 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
@@ -88,7 +88,7 @@ class BazelCasClient {
     /// \param[in] blob          The blob to upload
     /// \returns Boolean indicating successful upload
     [[nodiscard]] auto UpdateSingleBlob(std::string const& instance_name,
-                                        BazelBlob const& blob) const noexcept
+                                        ArtifactBlob const& blob) const noexcept
         -> bool;
 
     /// \brief Read single blob via incremental bytestream reader
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
index 1f65201c..b435fb8e 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "src/buildtool/common/artifact_digest_factory.hpp"
-#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
 #include "src/buildtool/execution_api/common/content_blob_container.hpp"
 #include "src/buildtool/execution_api/common/message_limits.hpp"
 #include "src/buildtool/logging/log_level.hpp"
@@ -105,10 +104,7 @@ auto BazelNetwork::DoUploadBlobs(
         }
 
         for (auto const& it : to_stream) {
-            BazelBlob bazel_blob{ArtifactDigestFactory::ToBazel(it->digest),
-                                 it->data,
-                                 it->is_exec};
-            if (not cas_->UpdateSingleBlob(instance_name_, bazel_blob)) {
+            if (not cas_->UpdateSingleBlob(instance_name_, *it)) {
                 return false;
             }
             blobs.erase(it);