From e62914c686d76d48fad2f4ca019cd95bac8913bf Mon Sep 17 00:00:00 2001
From: Sascha Roloff <sascha.roloff@huawei.com>
Date: Wed, 23 Nov 2022 16:23:57 +0100
Subject: Fix root directory upload to honor tree invariant.

---
 .../execution_api/bazel_msg/blob_tree.cpp          | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 src/buildtool/execution_api/bazel_msg/blob_tree.cpp

(limited to 'src/buildtool/execution_api/bazel_msg/blob_tree.cpp')

diff --git a/src/buildtool/execution_api/bazel_msg/blob_tree.cpp b/src/buildtool/execution_api/bazel_msg/blob_tree.cpp
new file mode 100644
index 00000000..4b06fd7a
--- /dev/null
+++ b/src/buildtool/execution_api/bazel_msg/blob_tree.cpp
@@ -0,0 +1,79 @@
+// Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp"
+
+#include <utility>
+#include <variant>
+
+#include "src/buildtool/common/artifact.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/compatibility/native_support.hpp"
+#include "src/buildtool/file_system/git_cas.hpp"
+#include "src/buildtool/file_system/object_type.hpp"
+#include "src/utils/cpp/hex_string.hpp"
+
+/// NOLINTNEXTLINE(misc-no-recursion)
+auto BlobTree::FromDirectoryTree(DirectoryTreePtr const& tree,
+                                 std::filesystem::path const& parent) noexcept
+    -> std::optional<BlobTreePtr> {
+    GitCAS::tree_entries_t entries;
+    std::vector<BlobTreePtr> nodes;
+    try {
+        entries.reserve(tree->size());
+        for (auto const& [name, node] : *tree) {
+            if (std::holds_alternative<DirectoryTreePtr>(node)) {
+                auto const& dir = std::get<DirectoryTreePtr>(node);
+                auto blob_tree = FromDirectoryTree(dir, parent / name);
+                if (not blob_tree) {
+                    return std::nullopt;
+                }
+                auto raw_id = FromHexString(NativeSupport::Unprefix(
+                    (*blob_tree)->Blob().digest.hash()));
+                if (not raw_id) {
+                    return std::nullopt;
+                }
+                entries[std::move(*raw_id)].emplace_back(name,
+                                                         ObjectType::Tree);
+                // Only add tree objects to the blob tree to be uploaded.
+                nodes.emplace_back((*blob_tree));
+            }
+            else {
+                auto const& artifact = std::get<Artifact const*>(node);
+                auto const& object_info = artifact->Info();
+                if (not object_info) {
+                    return std::nullopt;
+                }
+                auto raw_id = FromHexString(object_info->digest.hash());
+                if (not raw_id) {
+                    return std::nullopt;
+                }
+                entries[std::move(*raw_id)].emplace_back(name,
+                                                         object_info->type);
+            }
+        }
+        if (auto git_tree = GitCAS::CreateShallowTree(entries)) {
+            bazel_re::Digest digest{};
+            digest.set_hash(NativeSupport::Prefix(ToHexString(git_tree->first),
+                                                  /*is_tree=*/true));
+            digest.set_size_bytes(
+                gsl::narrow<google::protobuf::int64>(git_tree->second.size()));
+            return std::make_shared<BlobTree>(
+                BazelBlob{digest, git_tree->second}, nodes);
+        }
+    } catch (...) {
+        return std::nullopt;
+    }
+    return std::nullopt;
+}
-- 
cgit v1.2.3