From 04765b75fd186329755695a9afba906edfcda135 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Thu, 20 Feb 2025 13:15:38 +0100 Subject: Separate off id generation to a separate library ... and rename appropriately to reflect contents more precisely than the generic "common". This separation also disentangles dependencies a bit. --- src/buildtool/execution_api/common/TARGETS | 23 +++- .../execution_api/common/execution_common.hpp | 132 --------------------- src/buildtool/execution_api/common/ids.hpp | 132 +++++++++++++++++++++ src/buildtool/execution_api/local/TARGETS | 1 + src/buildtool/execution_api/local/local_action.cpp | 2 +- src/buildtool/execution_api/remote/TARGETS | 2 +- .../remote/bazel/bazel_cas_client.cpp | 2 +- src/buildtool/file_system/TARGETS | 2 +- src/buildtool/file_system/file_storage.hpp | 2 +- src/buildtool/storage/TARGETS | 4 +- src/buildtool/storage/garbage_collector.cpp | 2 +- .../storage/repository_garbage_collector.cpp | 2 +- test/buildtool/execution_api/bazel/TARGETS | 1 + .../execution_api/bazel/bytestream_client.test.cpp | 2 +- test/buildtool/execution_api/common/TARGETS | 1 + .../execution_api/common/bytestream_utils.test.cpp | 2 +- test/buildtool/storage/TARGETS | 1 + test/buildtool/storage/large_object_cas.test.cpp | 2 +- test/other_tools/git_operations/TARGETS | 1 + .../git_operations/critical_git_ops.test.cpp | 2 +- 20 files changed, 168 insertions(+), 150 deletions(-) delete mode 100644 src/buildtool/execution_api/common/execution_common.hpp create mode 100644 src/buildtool/execution_api/common/ids.hpp diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 1aff977d..f7258cb6 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -2,8 +2,7 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["common"] , "hdrs": - [ "execution_common.hpp" - , "execution_api.hpp" + [ "execution_api.hpp" , "execution_action.hpp" , "execution_response.hpp" , "tree_reader.hpp" @@ -22,19 +21,33 @@ , ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/file_system", "object_type"] - , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "expected"] - , ["src/utils/cpp", "gsl"] - , ["src/utils/cpp", "hex_string"] ] , "private-deps": [ ["@", "json", "", "json"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/logging", "log_level"] + , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "path"] ] , "stage": ["src", "buildtool", "execution_api", "common"] } +, "ids": + { "type": ["@", "rules", "CC", "library"] + , "name": ["common"] + , "hdrs": ["ids.hpp"] + , "deps": + [ ["@", "fmt", "", "fmt"] + , ["@", "gsl", "", "gsl"] + , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["src/utils/cpp", "gsl"] + , ["src/utils/cpp", "hex_string"] + ] + , "stage": ["src", "buildtool", "execution_api", "common"] + } , "bytestream_utils": { "type": ["@", "rules", "CC", "library"] , "name": ["bytestream_utils"] diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/execution_common.hpp deleted file mode 100644 index 7a55003c..00000000 --- a/src/buildtool/execution_api/common/execution_common.hpp +++ /dev/null @@ -1,132 +0,0 @@ -// 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. - -#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP -#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP - -#ifdef __unix__ -#include -#include -#else -#error "Non-unix is not supported yet" -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fmt/core.h" -#include "gsl/gsl" -#include "src/buildtool/crypto/hash_function.hpp" -#include "src/buildtool/logging/log_level.hpp" -#include "src/buildtool/logging/logger.hpp" -#include "src/utils/cpp/gsl.hpp" -#include "src/utils/cpp/hex_string.hpp" - -/// \brief Create unique ID for current process and thread. -[[nodiscard]] static inline auto CreateProcessUniqueId() noexcept - -> std::optional { -#ifdef __unix__ - pid_t pid{}; - try { - pid = getpid(); - } catch (std::exception const& e) { - Logger::Log(LogLevel::Error, e.what()); - return std::nullopt; - } -#endif - auto tid = std::this_thread::get_id(); - std::ostringstream id{}; - id << pid << "-" << tid; - return id.str(); -} - -/// \brief Create unique path based on file_path. -[[nodiscard]] static inline auto CreateUniquePath( - std::filesystem::path file_path) noexcept - -> std::optional { - auto id = CreateProcessUniqueId(); - if (id) { - return file_path.concat("." + *id); - } - return std::nullopt; -} - -[[nodiscard]] static auto GetNonDeterministicRandomNumber() -> unsigned int { - std::uniform_int_distribution dist{}; - std::random_device urandom{ -#ifdef __unix__ - "/dev/urandom" -#endif - }; - return dist(urandom); -} - -static auto const kRandomConstant = GetNonDeterministicRandomNumber(); - -static void EncodeUUIDVersion4(std::string* uuid) { - constexpr auto kVersionByte = 6UL; - constexpr auto kVersionBits = 0x40U; // version 4: 0100 xxxx - constexpr auto kClearMask = 0x0fU; - Expects(uuid->size() >= kVersionByte); - auto& byte = uuid->at(kVersionByte); - byte = static_cast(kVersionBits | - (kClearMask & static_cast(byte))); -} - -static void EncodeUUIDVariant1(std::string* uuid) { - constexpr auto kVariantByte = 8UL; - constexpr auto kVariantBits = 0x80U; // variant 1: 10xx xxxx - constexpr auto kClearMask = 0x3fU; - Expects(uuid->size() >= kVariantByte); - auto& byte = uuid->at(kVariantByte); - byte = static_cast(kVariantBits | - (kClearMask & static_cast(byte))); -} - -/// \brief Create UUID version 4 from seed. -[[nodiscard]] static inline auto CreateUUIDVersion4(std::string const& seed) - -> std::string { - constexpr auto kRawLength = 16UL; - constexpr auto kHexDashPos = std::array{8UL, 12UL, 16UL, 20UL}; - - // The type of HashFunction is irrelevant here. It is used for - // identification purposes only. SHA256 is used. - HashFunction const hash_function{HashFunction::Type::PlainSHA256}; - auto value = fmt::format("{}-{}", std::to_string(kRandomConstant), seed); - auto uuid = hash_function.PlainHashData(value).Bytes(); - EncodeUUIDVersion4(&uuid); - EncodeUUIDVariant1(&uuid); - Expects(uuid.size() >= kRawLength); - - std::size_t cur{}; - std::ostringstream ss{}; - auto uuid_hex = ToHexString(uuid.substr(0, kRawLength)); - for (auto pos : kHexDashPos) { - ss << uuid_hex.substr(cur, pos - cur) << '-'; - cur = pos; - } - ss << uuid_hex.substr(cur); - EnsuresAudit(ss.str().size() == (2 * kRawLength) + kHexDashPos.size()); - return ss.str(); -} - -#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP diff --git a/src/buildtool/execution_api/common/ids.hpp b/src/buildtool/execution_api/common/ids.hpp new file mode 100644 index 00000000..0c5f689a --- /dev/null +++ b/src/buildtool/execution_api/common/ids.hpp @@ -0,0 +1,132 @@ +// 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. + +#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP +#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP + +#ifdef __unix__ +#include +#include +#else +#error "Non-unix is not supported yet" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "fmt/core.h" +#include "gsl/gsl" +#include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/gsl.hpp" +#include "src/utils/cpp/hex_string.hpp" + +/// \brief Create unique ID for current process and thread. +[[nodiscard]] static inline auto CreateProcessUniqueId() noexcept + -> std::optional { +#ifdef __unix__ + pid_t pid{}; + try { + pid = getpid(); + } catch (std::exception const& e) { + Logger::Log(LogLevel::Error, e.what()); + return std::nullopt; + } +#endif + auto tid = std::this_thread::get_id(); + std::ostringstream id{}; + id << pid << "-" << tid; + return id.str(); +} + +/// \brief Create unique path based on file_path. +[[nodiscard]] static inline auto CreateUniquePath( + std::filesystem::path file_path) noexcept + -> std::optional { + auto id = CreateProcessUniqueId(); + if (id) { + return file_path.concat("." + *id); + } + return std::nullopt; +} + +[[nodiscard]] static auto GetNonDeterministicRandomNumber() -> unsigned int { + std::uniform_int_distribution dist{}; + std::random_device urandom{ +#ifdef __unix__ + "/dev/urandom" +#endif + }; + return dist(urandom); +} + +static auto const kRandomConstant = GetNonDeterministicRandomNumber(); + +static void EncodeUUIDVersion4(std::string* uuid) { + constexpr auto kVersionByte = 6UL; + constexpr auto kVersionBits = 0x40U; // version 4: 0100 xxxx + constexpr auto kClearMask = 0x0fU; + Expects(uuid->size() >= kVersionByte); + auto& byte = uuid->at(kVersionByte); + byte = static_cast(kVersionBits | + (kClearMask & static_cast(byte))); +} + +static void EncodeUUIDVariant1(std::string* uuid) { + constexpr auto kVariantByte = 8UL; + constexpr auto kVariantBits = 0x80U; // variant 1: 10xx xxxx + constexpr auto kClearMask = 0x3fU; + Expects(uuid->size() >= kVariantByte); + auto& byte = uuid->at(kVariantByte); + byte = static_cast(kVariantBits | + (kClearMask & static_cast(byte))); +} + +/// \brief Create UUID version 4 from seed. +[[nodiscard]] static inline auto CreateUUIDVersion4(std::string const& seed) + -> std::string { + constexpr auto kRawLength = 16UL; + constexpr auto kHexDashPos = std::array{8UL, 12UL, 16UL, 20UL}; + + // The type of HashFunction is irrelevant here. It is used for + // identification purposes only. SHA256 is used. + HashFunction const hash_function{HashFunction::Type::PlainSHA256}; + auto value = fmt::format("{}-{}", std::to_string(kRandomConstant), seed); + auto uuid = hash_function.PlainHashData(value).Bytes(); + EncodeUUIDVersion4(&uuid); + EncodeUUIDVariant1(&uuid); + Expects(uuid.size() >= kRawLength); + + std::size_t cur{}; + std::ostringstream ss{}; + auto uuid_hex = ToHexString(uuid.substr(0, kRawLength)); + for (auto pos : kHexDashPos) { + ss << uuid_hex.substr(cur, pos - cur) << '-'; + cur = pos; + } + ss << uuid_hex.substr(cur); + EnsuresAudit(ss.str().size() == (2 * kRawLength) + kHexDashPos.size()); + return ss.str(); +} + +#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS index 67507594..04f78c34 100644 --- a/src/buildtool/execution_api/local/TARGETS +++ b/src/buildtool/execution_api/local/TARGETS @@ -48,6 +48,7 @@ , ["@", "json", "", "json"] , ["src/buildtool/execution_api/bazel_msg", "directory_tree"] , ["src/buildtool/execution_api/common", "common_api"] + , ["src/buildtool/execution_api/common", "ids"] , ["src/buildtool/execution_api/execution_service", "cas_utils"] , ["src/buildtool/execution_api/utils", "outputscheck"] , ["src/buildtool/file_system", "object_type"] diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp index 8847692b..0d73d923 100644 --- a/src/buildtool/execution_api/local/local_action.cpp +++ b/src/buildtool/execution_api/local/local_action.cpp @@ -28,7 +28,7 @@ #include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/protocol_traits.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/execution_api/common/tree_reader.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/execution_api/local/local_cas_reader.hpp" diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index 6f9df1c3..39c1a444 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -51,7 +51,7 @@ , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/common/remote", "retry"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] - , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/execution_api/common", "ids"] , ["src/buildtool/file_system", "object_type"] , ["src/utils/cpp", "back_map"] , ["src/utils/cpp", "gsl"] 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 be4b9f0f..d6814b08 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -33,7 +33,7 @@ #include "src/buildtool/common/remote/retry.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/execution_api/common/bytestream_utils.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS index ad5a92dc..5b8378d0 100644 --- a/src/buildtool/file_system/TARGETS +++ b/src/buildtool/file_system/TARGETS @@ -11,7 +11,7 @@ , "hdrs": ["file_storage.hpp"] , "deps": [ "object_type" - , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/execution_api/common", "ids"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] diff --git a/src/buildtool/file_system/file_storage.hpp b/src/buildtool/file_system/file_storage.hpp index 191313dc..5748ae49 100644 --- a/src/buildtool/file_system/file_storage.hpp +++ b/src/buildtool/file_system/file_storage.hpp @@ -22,7 +22,7 @@ #include #include -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS index 2403ec41..cd73c2b3 100644 --- a/src/buildtool/storage/TARGETS +++ b/src/buildtool/storage/TARGETS @@ -23,7 +23,7 @@ , "deps": ["config", ["src/utils/cpp", "file_locking"]] , "private-deps": [ ["@", "fmt", "", "fmt"] - , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/execution_api/common", "ids"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] @@ -90,7 +90,7 @@ , "storage" , ["@", "fmt", "", "fmt"] , ["src/buildtool/crypto", "hash_function"] - , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/execution_api/common", "ids"] , ["src/buildtool/execution_api/common", "message_limits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] diff --git a/src/buildtool/storage/garbage_collector.cpp b/src/buildtool/storage/garbage_collector.cpp index 3ad0f481..f1254eed 100644 --- a/src/buildtool/storage/garbage_collector.cpp +++ b/src/buildtool/storage/garbage_collector.cpp @@ -24,7 +24,7 @@ #include "fmt/core.h" #include "src/buildtool/crypto/hash_function.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/storage/repository_garbage_collector.cpp b/src/buildtool/storage/repository_garbage_collector.cpp index d9fea1da..be3d7857 100644 --- a/src/buildtool/storage/repository_garbage_collector.cpp +++ b/src/buildtool/storage/repository_garbage_collector.cpp @@ -18,7 +18,7 @@ #include #include "fmt/core.h" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index a5ddbc77..7b1a139e 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -58,6 +58,7 @@ , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"] , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["@", "src", "src/buildtool/execution_api/common", "ids"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/file_system", "object_type"] diff --git a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp index fa50eb0a..07d85671 100644 --- a/test/buildtool/execution_api/bazel/bytestream_client.test.cpp +++ b/test/buildtool/execution_api/bazel/bytestream_client.test.cpp @@ -26,7 +26,7 @@ #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/bytestream_utils.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS index 864a5e7c..2990c7e7 100644 --- a/test/buildtool/execution_api/common/TARGETS +++ b/test/buildtool/execution_api/common/TARGETS @@ -34,6 +34,7 @@ , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"] , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["@", "src", "src/buildtool/execution_api/common", "ids"] , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/utils/cpp", "expected"] , ["", "catch-main"] diff --git a/test/buildtool/execution_api/common/bytestream_utils.test.cpp b/test/buildtool/execution_api/common/bytestream_utils.test.cpp index 82faef38..4c20b7f2 100644 --- a/test/buildtool/execution_api/common/bytestream_utils.test.cpp +++ b/test/buildtool/execution_api/common/bytestream_utils.test.cpp @@ -21,7 +21,7 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/crypto/hash_function.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/utils/cpp/expected.hpp" #include "test/utils/hermeticity/test_hash_function_type.hpp" diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS index d6119462..a941ea56 100644 --- a/test/buildtool/storage/TARGETS +++ b/test/buildtool/storage/TARGETS @@ -60,6 +60,7 @@ , "bazel_msg_factory" ] , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["@", "src", "src/buildtool/execution_api/common", "ids"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_type"] , ["@", "src", "src/buildtool/storage", "config"] diff --git a/test/buildtool/storage/large_object_cas.test.cpp b/test/buildtool/storage/large_object_cas.test.cpp index 76ee7f88..64dba3d6 100644 --- a/test/buildtool/storage/large_object_cas.test.cpp +++ b/test/buildtool/storage/large_object_cas.test.cpp @@ -30,7 +30,7 @@ #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/storage/config.hpp" diff --git a/test/other_tools/git_operations/TARGETS b/test/other_tools/git_operations/TARGETS index 77b1ee2f..26815c5a 100644 --- a/test/other_tools/git_operations/TARGETS +++ b/test/other_tools/git_operations/TARGETS @@ -7,6 +7,7 @@ [ ["@", "catch2", "", "catch2"] , ["@", "fmt", "", "fmt"] , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["@", "src", "src/buildtool/execution_api/common", "ids"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["@", "src", "src/other_tools/git_operations", "git_ops_types"] diff --git a/test/other_tools/git_operations/critical_git_ops.test.cpp b/test/other_tools/git_operations/critical_git_ops.test.cpp index d36dadef..66dda32e 100644 --- a/test/other_tools/git_operations/critical_git_ops.test.cpp +++ b/test/other_tools/git_operations/critical_git_ops.test.cpp @@ -25,7 +25,7 @@ #include "catch2/catch_test_macros.hpp" #include "fmt/core.h" -#include "src/buildtool/execution_api/common/execution_common.hpp" +#include "src/buildtool/execution_api/common/ids.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/other_tools/git_operations/git_ops_types.hpp" -- cgit v1.2.3