diff options
Diffstat (limited to 'src')
20 files changed, 94 insertions, 47 deletions
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index 0256ea05..b905970b 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -32,7 +32,6 @@ , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/crypto", "hash_info"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] - , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/execution_api/common", "artifact_blob_container"] , ["src/buildtool/execution_api/common", "bytestream_utils"] , ["src/buildtool/execution_api/common", "common"] @@ -45,6 +44,7 @@ [ ["@", "bazel_remote_apis", "", "remote_execution_proto"] , ["@", "googleapis", "", "google_bytestream_proto"] , ["@", "googleapis", "", "google_longrunning_operations_proto"] + , ["@", "googleapis", "", "google_rpc_status_proto"] ] , "stage": ["src", "buildtool", "execution_api", "remote"] , "private-deps": @@ -55,13 +55,16 @@ , ["src/buildtool/common", "bazel_digest_factory"] , ["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_api"] + , ["src/buildtool/execution_api/common", "content_blob_container"] , ["src/buildtool/execution_api/common", "message_limits"] , ["src/buildtool/execution_api/utils", "outputscheck"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] , ["src/utils/cpp", "gsl"] , ["src/utils/cpp", "path"] + , ["src/utils/cpp", "transformed_range"] ] } , "bazel": @@ -78,8 +81,8 @@ , ["src/buildtool/common/remote", "retry_config"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] - , ["src/buildtool/execution_api/common", "blob_tree"] , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/execution_engine/dag", "dag"] ] , "stage": ["src", "buildtool", "execution_api", "remote"] , "private-deps": @@ -88,15 +91,17 @@ , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common", "protocol_traits"] - , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] + , ["src/buildtool/execution_api/bazel_msg", "directory_tree"] , ["src/buildtool/execution_api/common", "artifact_blob_container"] , ["src/buildtool/execution_api/common", "common_api"] + , ["src/buildtool/execution_api/common", "content_blob_container"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/multithreading", "task_system"] - , ["src/buildtool/storage", "fs_utils"] + , ["src/utils/cpp", "expected"] + , ["src/utils/cpp", "transformed_range"] ] } , "config": @@ -113,8 +118,6 @@ [ ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] , ["src/buildtool/file_system", "file_system_manager"] - , ["src/buildtool/logging", "log_level"] - , ["src/buildtool/logging", "logging"] ] } , "context": diff --git a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp index 51ccfeeb..f6612377 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp @@ -14,6 +14,11 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp" +#include <algorithm> + +#include <grpcpp/grpcpp.h> + +#include "google/protobuf/repeated_ptr_field.h" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp index fb05d5c3..0ddb2a41 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp @@ -15,8 +15,8 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_AC_CLIENT_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_AC_CLIENT_HPP -#include <functional> #include <memory> +#include <optional> #include <string> #include <vector> @@ -26,8 +26,6 @@ #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/common/remote/retry_config.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" /// Implements client side for service defined here: diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp index f805c6fc..3048c98c 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp @@ -14,11 +14,19 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_action.hpp" +#include <algorithm> +#include <compare> +#include <functional> +#include <unordered_map> #include <utility> // std::move +#include <grpcpp/support/status.h> + +#include "gsl/gsl" #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_execution_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" #include "src/buildtool/execution_api/utils/outputscheck.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.hpp b/src/buildtool/execution_api/remote/bazel/bazel_action.hpp index c990cc8e..909bb8fb 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_action.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_action.hpp @@ -15,6 +15,7 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_ACTION_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_ACTION_HPP +#include <chrono> #include <map> #include <memory> #include <optional> @@ -23,10 +24,11 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/common/execution_action.hpp" +#include "src/buildtool/execution_api/common/execution_response.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp" - -class BazelApi; +#include "src/buildtool/logging/logger.hpp" /// \brief Bazel implementation of the abstract Execution Action. /// Uploads all dependencies, creates a Bazel Action and executes it. diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index c9206d1b..6032ab44 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -17,10 +17,12 @@ #include <algorithm> #include <atomic> #include <cstdint> +#include <cstdio> +#include <exception> +#include <functional> #include <iterator> #include <mutex> #include <new> -#include <sstream> #include <unordered_map> #include <unordered_set> #include <utility> // std::move @@ -33,24 +35,22 @@ #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" +#include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" #include "src/buildtool/execution_api/common/common_api.hpp" +#include "src/buildtool/execution_api/common/content_blob_container.hpp" #include "src/buildtool/execution_api/common/stream_dumper.hpp" #include "src/buildtool/execution_api/common/tree_reader.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_action.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_response.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" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" -#include "src/buildtool/storage/fs_utils.hpp" +#include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/transformed_range.hpp" namespace { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index b829529c..3b0a1cb3 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -21,6 +21,7 @@ #include <memory> #include <optional> #include <string> +#include <unordered_set> #include <vector> #include "gsl/gsl" @@ -31,13 +32,13 @@ #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" -#include "src/buildtool/execution_api/common/blob_tree.hpp" +#include "src/buildtool/execution_api/common/artifact_blob_container.hpp" +#include "src/buildtool/execution_api/common/execution_action.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/execution_engine/dag/dag.hpp" // forward declaration for actual implementations class BazelNetwork; -struct ExecutionConfiguration; /// \brief Bazel implementation of the abstract Execution API. class BazelApi final : public IExecutionApi { 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 fa299187..9c3fb23c 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -15,16 +15,20 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" #include <algorithm> +#include <iterator> #include <mutex> #include <shared_mutex> #include <sstream> #include <unordered_map> +#include <unordered_set> +#include <utility> -#include "grpcpp/grpcpp.h" -#include "src/buildtool/common/artifact_digest.hpp" +#include <grpcpp/grpcpp.h> + +#include "google/protobuf/message.h" +#include "google/protobuf/repeated_ptr_field.h" #include "src/buildtool/common/bazel_digest_factory.hpp" #include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" #include "src/buildtool/common/remote/retry_config.hpp" @@ -33,6 +37,7 @@ #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/utils/cpp/transformed_range.hpp" namespace { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp index e2ddc561..69e575e5 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp @@ -16,14 +16,17 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_CAS_CLIENT_HPP #include <cstddef> +#include <cstdint> #include <functional> #include <memory> #include <optional> #include <string> -#include <utility> #include <vector> +#include <grpcpp/support/status.h> + #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" +#include "fmt/core.h" #include "gsl/gsl" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/bazel_types.hpp" @@ -31,9 +34,7 @@ #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bytestream_client.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" /// Implements client side for serivce defined here: diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp index 09f16b8f..74239974 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp @@ -16,9 +16,12 @@ #include <utility> // std::move +#include <grpcpp/grpcpp.h> + #include "fmt/core.h" +#include "google/protobuf/any.pb.h" #include "google/protobuf/text_format.h" -#include "grpcpp/grpcpp.h" +#include "google/rpc/status.pb.h" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp index fd1ff5c1..889ca7a3 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp @@ -16,11 +16,14 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_EXECUTION_CLIENT_HPP #include <cstdint> +#include <functional> #include <memory> #include <optional> #include <string> #include <unordered_map> +#include <grpcpp/grpcpp.h> + #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" #include "google/longrunning/operations.pb.h" #include "gsl/gsl" @@ -29,7 +32,6 @@ #include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" /// Implements client side for service defined here: diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index 34ebb418..a78f8081 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -15,11 +15,14 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp" #include <algorithm> -#include <cstddef> +#include <iterator> +#include <unordered_map> +#include <utility> #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/transformed_range.hpp" BazelNetwork::BazelNetwork( std::string instance_name, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp index 0dce2fbd..b990b324 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp @@ -15,11 +15,9 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_NETWORK_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_NETWORK_HPP -#include <filesystem> #include <memory> #include <optional> #include <string> -#include <utility> #include <vector> #include "gsl/gsl" @@ -29,8 +27,7 @@ #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/crypto/hash_function.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/common/execution_api.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp index 0a8d5638..c5c66c81 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -15,15 +15,20 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp" #include <algorithm> +#include <cstdint> +#include <filesystem> +#include <memory> #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/bazel_digest_factory.hpp" #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" +#include "src/buildtool/execution_api/common/content_blob_container.hpp" #include "src/buildtool/execution_api/common/message_limits.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" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp index 95f64126..d5b537f1 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp @@ -16,12 +16,12 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_TREE_READER_HPP #include <cstddef> -#include <filesystem> #include <functional> #include <iterator> #include <optional> #include <string> #include <unordered_map> +#include <utility> #include <vector> #include "gsl/gsl" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index 638747cb..3aaecb88 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -14,21 +14,32 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" +#include <algorithm> #include <cstddef> +#include <exception> +#include <filesystem> #include <functional> +#include <iterator> +#include <vector> #include "fmt/core.h" +#include "google/protobuf/repeated_ptr_field.h" +#include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/bazel_digest_factory.hpp" #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.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/common/common_api.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" +#include "src/buildtool/execution_api/common/content_blob_container.hpp" +#include "src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp" +#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/gsl.hpp" +#include "src/utils/cpp/path.hpp" namespace { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.hpp b/src/buildtool/execution_api/remote/bazel/bazel_response.hpp index 86e7491c..712c77ad 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.hpp @@ -15,19 +15,23 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_RESPONSE_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_RESPONSE_HPP +#include <functional> +#include <memory> #include <optional> #include <string> +#include <unordered_map> #include <utility> // std::move -#include <vector> + +#include <grpcpp/support/status.h> #include "gsl/gsl" -#include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/execution_api/common/execution_response.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp" #include "src/utils/cpp/expected.hpp" -class BazelAction; - /// \brief Bazel implementation of the abstract Execution Response. /// Access Bazel execution output data and obtain a Bazel Artifact. class BazelResponse final : public IExecutionResponse { diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp index dca8d59a..1e856119 100644 --- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp @@ -17,18 +17,21 @@ #include <algorithm> #include <cstddef> -#include <iomanip> +#include <cstdint> +#include <memory> #include <optional> #include <string> #include <utility> // std::move +#include <grpcpp/grpcpp.h> + #include "google/bytestream/bytestream.grpc.pb.h" +#include "google/bytestream/bytestream.pb.h" #include "gsl/gsl" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/common/bytestream_utils.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/remote/config.cpp b/src/buildtool/execution_api/remote/config.cpp index 7a73eaa1..67e79a7c 100644 --- a/src/buildtool/execution_api/remote/config.cpp +++ b/src/buildtool/execution_api/remote/config.cpp @@ -15,13 +15,10 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include <exception> -#include <fstream> #include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" -#include "src/buildtool/logging/log_level.hpp" -#include "src/buildtool/logging/logger.hpp" auto RemoteExecutionConfig::Builder::Build() const noexcept -> expected<RemoteExecutionConfig, std::string> { diff --git a/src/buildtool/execution_api/remote/config.hpp b/src/buildtool/execution_api/remote/config.hpp index 36e83fdd..86e94938 100644 --- a/src/buildtool/execution_api/remote/config.hpp +++ b/src/buildtool/execution_api/remote/config.hpp @@ -16,7 +16,6 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_CONFIG_HPP #include <filesystem> -#include <map> #include <optional> #include <string> #include <utility> |