diff options
Diffstat (limited to 'src/buildtool/execution_api/common')
14 files changed, 50 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 0de32644..41eb07b4 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -13,10 +13,11 @@ , "srcs": ["tree_reader_utils.cpp"] , "deps": [ "artifact_blob_container" + , ["@", "fmt", "", "fmt"] , ["@", "gsl", "", "gsl"] + , ["@", "protoc", "", "libprotobuf"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common", "common"] - , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/file_system", "git_repo"] @@ -30,6 +31,7 @@ , "private-deps": [ ["@", "json", "", "json"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/utils/cpp", "path"] ] , "stage": ["src", "buildtool", "execution_api", "common"] } @@ -51,7 +53,10 @@ , "deps": [ "common" , ["@", "gsl", "", "gsl"] + , ["src/buildtool/auth", "auth"] , ["src/buildtool/common", "config"] + , ["src/buildtool/common/remote", "remote_common"] + , ["src/buildtool/common/remote", "retry_config"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/local", "context"] , ["src/buildtool/execution_api/remote", "context"] @@ -60,6 +65,8 @@ [ ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/execution_api/remote", "bazel"] + , ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/storage", "config"] ] } , "message_limits": @@ -87,7 +94,11 @@ , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "execution_api", "common"] - , "private-deps": [["@", "fmt", "", "fmt"]] + , "private-deps": + [ "artifact_blob_container" + , ["@", "fmt", "", "fmt"] + , ["src/buildtool/file_system", "object_type"] + ] } , "blob_tree": { "type": ["@", "rules", "CC", "library"] @@ -105,6 +116,7 @@ , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/file_system", "object_type"] + , ["src/utils/cpp", "expected"] , ["src/utils/cpp", "hex_string"] ] , "stage": ["src", "buildtool", "execution_api", "common"] diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp index 2106f555..23b8b15d 100644 --- a/src/buildtool/execution_api/common/api_bundle.cpp +++ b/src/buildtool/execution_api/common/api_bundle.cpp @@ -14,9 +14,14 @@ #include "src/buildtool/execution_api/common/api_bundle.hpp" +#include <memory> +#include <utility> + #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" +#include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/storage/config.hpp" /// \note Some logic from MakeRemote is duplicated here as that method cannot /// be used without the hash_function field being set prior to the call. diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp index e342ce55..19146f66 100644 --- a/src/buildtool/execution_api/common/api_bundle.hpp +++ b/src/buildtool/execution_api/common/api_bundle.hpp @@ -15,10 +15,12 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_API_BUNDLE_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_API_BUNDLE_HPP -#include <memory> #include <optional> #include "gsl/gsl" +#include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" +#include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" diff --git a/src/buildtool/execution_api/common/blob_tree.cpp b/src/buildtool/execution_api/common/blob_tree.cpp index 6bb503b7..a0d362b4 100644 --- a/src/buildtool/execution_api/common/blob_tree.cpp +++ b/src/buildtool/execution_api/common/blob_tree.cpp @@ -14,6 +14,9 @@ #include "src/buildtool/execution_api/common/blob_tree.hpp" +#include <functional> +#include <string> +#include <unordered_map> #include <utility> #include <variant> @@ -23,6 +26,7 @@ #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/hex_string.hpp" auto BlobTree::FromDirectoryTree(DirectoryTreePtr const& tree, diff --git a/src/buildtool/execution_api/common/blob_tree.hpp b/src/buildtool/execution_api/common/blob_tree.hpp index 051b0fe2..4b2bde01 100644 --- a/src/buildtool/execution_api/common/blob_tree.hpp +++ b/src/buildtool/execution_api/common/blob_tree.hpp @@ -22,6 +22,7 @@ #include <vector> #include "gsl/gsl" +#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" diff --git a/src/buildtool/execution_api/common/common_api.cpp b/src/buildtool/execution_api/common/common_api.cpp index c21d14a4..87079602 100644 --- a/src/buildtool/execution_api/common/common_api.cpp +++ b/src/buildtool/execution_api/common/common_api.cpp @@ -14,10 +14,22 @@ #include "src/buildtool/execution_api/common/common_api.hpp" +#ifdef __unix__ +#include <unistd.h> +#else +#error "Non-unix is not supported yet" +#endif + #include <cstddef> #include <exception> +#include <memory> +#include <sstream> +#include <string> +#include <utility> #include "fmt/core.h" +#include "src/buildtool/execution_api/common/artifact_blob_container.hpp" +#include "src/buildtool/file_system/object_type.hpp" auto CommonRetrieveToFds( std::vector<Artifact::ObjectInfo> const& artifacts_info, diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp index 16931832..991b9875 100644 --- a/src/buildtool/execution_api/common/common_api.hpp +++ b/src/buildtool/execution_api/common/common_api.hpp @@ -20,9 +20,7 @@ #include <functional> #include <iterator> #include <optional> -#include <type_traits> #include <unordered_map> -#include <utility> #include <vector> #include "gsl/gsl" diff --git a/src/buildtool/execution_api/common/execution_action.hpp b/src/buildtool/execution_api/common/execution_action.hpp index a5284ca1..e0d629a7 100644 --- a/src/buildtool/execution_api/common/execution_action.hpp +++ b/src/buildtool/execution_api/common/execution_action.hpp @@ -19,11 +19,8 @@ #include <cstdint> #include <memory> -#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_response.hpp" - -class Logger; -class ExecutionArtifactContainer; +#include "src/buildtool/logging/logger.hpp" /// \brief Abstract action. /// Can execute multiple commands. Commands are executed in arbitrary order and diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp index c9ee276b..7cee8b7e 100644 --- a/src/buildtool/execution_api/common/execution_api.hpp +++ b/src/buildtool/execution_api/common/execution_api.hpp @@ -23,7 +23,6 @@ #include <string> #include <vector> -#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" // Artifact::ObjectInfo #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/execution_common.hpp index 0cf0983d..7a55003c 100644 --- a/src/buildtool/execution_api/common/execution_common.hpp +++ b/src/buildtool/execution_api/common/execution_common.hpp @@ -24,6 +24,8 @@ #include <array> #include <cstddef> +#include <cstdint> +#include <exception> #include <filesystem> #include <optional> #include <random> @@ -31,6 +33,7 @@ #include <string> #include <thread> +#include "fmt/core.h" #include "gsl/gsl" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/execution_api/common/execution_response.hpp b/src/buildtool/execution_api/common/execution_response.hpp index 90c67317..6b313874 100644 --- a/src/buildtool/execution_api/common/execution_response.hpp +++ b/src/buildtool/execution_api/common/execution_response.hpp @@ -20,7 +20,6 @@ #include <string> #include <unordered_map> #include <unordered_set> -#include <vector> #include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" diff --git a/src/buildtool/execution_api/common/stream_dumper.hpp b/src/buildtool/execution_api/common/stream_dumper.hpp index c1d99588..3129c58d 100644 --- a/src/buildtool/execution_api/common/stream_dumper.hpp +++ b/src/buildtool/execution_api/common/stream_dumper.hpp @@ -22,7 +22,6 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" -#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" #include "src/buildtool/file_system/object_type.hpp" diff --git a/src/buildtool/execution_api/common/tree_reader.hpp b/src/buildtool/execution_api/common/tree_reader.hpp index 9c1b295e..7ec66163 100644 --- a/src/buildtool/execution_api/common/tree_reader.hpp +++ b/src/buildtool/execution_api/common/tree_reader.hpp @@ -16,16 +16,15 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_TREE_READER_HPP #include <filesystem> -#include <functional> #include <optional> #include <utility> #include <vector> +#include "google/protobuf/repeated_ptr_field.h" #include "src/buildtool/common/artifact.hpp" +#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" -#include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" struct ReadTreeResult final { diff --git a/src/buildtool/execution_api/common/tree_reader_utils.cpp b/src/buildtool/execution_api/common/tree_reader_utils.cpp index 5a55c059..2ec90cc2 100644 --- a/src/buildtool/execution_api/common/tree_reader_utils.cpp +++ b/src/buildtool/execution_api/common/tree_reader_utils.cpp @@ -15,9 +15,11 @@ #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" #include <exception> -#include <type_traits> +#include <unordered_map> #include <utility> +#include <vector> +#include "google/protobuf/repeated_ptr_field.h" #include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" @@ -25,7 +27,9 @@ #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/hex_string.hpp" +#include "src/utils/cpp/path.hpp" namespace { [[nodiscard]] auto CreateObjectInfo(HashFunction hash_function, |