execution_response: Allow failures to be reported while populating

As populating the containers from remote response only takes place
once, no assumptions should be made that this cannot fail (for
example if wrong or invalid entries were produced). Instead, return
error messages on failure to callers that can log accordingly.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp
index 61fd3434..d59eb91f 100644
--- a/src/buildtool/execution_api/execution_service/execution_server.cpp
+++ b/src/buildtool/execution_api/execution_service/execution_server.cpp
@@ -94,8 +94,16 @@ auto ExecutionServiceImpl::ToIExecutionAction(
 auto ExecutionServiceImpl::ToBazelExecuteResponse(
     IExecutionResponse::Ptr const& i_execution_response) const noexcept
     -> expected<::bazel_re::ExecuteResponse, std::string> {
-    auto result = ToBazelActionResult(i_execution_response->Artifacts(),
-                                      i_execution_response->DirectorySymlinks(),
+    auto artifacts = i_execution_response->Artifacts();
+    if (not artifacts) {
+        return unexpected{std::move(artifacts).error()};
+    }
+    auto dir_symlinks = i_execution_response->DirectorySymlinks();
+    if (not dir_symlinks) {
+        return unexpected{std::move(dir_symlinks).error()};
+    }
+    auto result = ToBazelActionResult(*std::move(artifacts).value(),
+                                      *std::move(dir_symlinks).value(),
                                       storage_);
     if (not result) {
         return unexpected{std::move(result).error()};