diff options
Diffstat (limited to 'src/buildtool/execution_api')
4 files changed, 10 insertions, 5 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index a7cfd64c..cfe2c35f 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -55,6 +55,7 @@ [ ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/execution_api/remote", "bazel"] + , ["src/buildtool/crypto", "hash_function"] ] } , "message_limits": diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp index 38255f9a..2908fb47 100644 --- a/src/buildtool/execution_api/common/api_bundle.cpp +++ b/src/buildtool/execution_api/common/api_bundle.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/execution_api/common/api_bundle.hpp" #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/local/local_api.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" @@ -46,7 +47,8 @@ auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const address->port, &auth, &retry_config, - config); + config, + HashFunction::Instance()); } return local; } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index f4751df3..d3dc1b2f 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -28,7 +28,6 @@ #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/compatibility/compatibility.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/bazel_msg/bazel_msg_factory.hpp" @@ -194,14 +193,15 @@ BazelApi::BazelApi(std::string const& instance_name, Port port, gsl::not_null<Auth const*> const& auth, gsl::not_null<RetryConfig const*> const& retry_config, - ExecutionConfiguration const& exec_config) noexcept { + ExecutionConfiguration const& exec_config, + HashFunction hash_function) noexcept { network_ = std::make_shared<BazelNetwork>(instance_name, host, port, auth, retry_config, exec_config, - HashFunction::Instance()); + hash_function); } // implement move constructor in cpp, where all members are complete types diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index 5307ffd0..5946f0f7 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -29,6 +29,7 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/remote/port.hpp" #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/execution_api.hpp" @@ -46,7 +47,8 @@ class BazelApi final : public IExecutionApi { Port port, gsl::not_null<Auth const*> const& auth, gsl::not_null<RetryConfig const*> const& retry_config, - ExecutionConfiguration const& exec_config) noexcept; + ExecutionConfiguration const& exec_config, + HashFunction hash_function) noexcept; BazelApi(BazelApi const&) = delete; BazelApi(BazelApi&& other) noexcept; auto operator=(BazelApi const&) -> BazelApi& = delete; |