From 56f91aac0c25e6e80dbaae087227502312accee6 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Mon, 2 Sep 2024 17:55:35 +0200
Subject: Return ArtifactDigest from CreateActionDigestFromCommandLine

---
 src/buildtool/execution_api/remote/bazel/bazel_action.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/buildtool/execution_api/remote/bazel/bazel_action.cpp')

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
index dcbddb8d..15ca949f 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
@@ -16,6 +16,7 @@
 
 #include <utility>  // std::move
 
+#include "src/buildtool/common/artifact_digest_factory.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp"
@@ -24,7 +25,7 @@
 
 BazelAction::BazelAction(
     std::shared_ptr<BazelNetwork> network,
-    bazel_re::Digest root_digest,
+    ArtifactDigest root_digest,
     std::vector<std::string> command,
     std::string cwd,
     std::vector<std::string> output_files,
@@ -112,7 +113,7 @@ auto BazelAction::Execute(Logger const* logger) noexcept
 }
 
 auto BazelAction::CreateBundlesForAction(BazelBlobContainer* blobs,
-                                         bazel_re::Digest const& exec_dir,
+                                         ArtifactDigest const& exec_dir,
                                          bool do_not_cache) const noexcept
     -> std::optional<bazel_re::Digest> {
     using StoreFunc = BazelMsgFactory::ActionDigestRequest::BlobStoreFunc;
@@ -134,5 +135,10 @@ auto BazelAction::CreateBundlesForAction(BazelBlobContainer* blobs,
         .timeout = timeout_,
         .skip_action_cache = do_not_cache,
         .store_blob = std::move(store_blob)};
-    return BazelMsgFactory::CreateActionDigestFromCommandLine(request);
+    auto const action_digest =
+        BazelMsgFactory::CreateActionDigestFromCommandLine(request);
+    if (not action_digest) {
+        return std::nullopt;
+    }
+    return ArtifactDigestFactory::ToBazel(*action_digest);
 }
-- 
cgit v1.2.3