summaryrefslogtreecommitdiff
path: root/src/buildtool/serve_api/remote/target_client.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-09-10 12:16:35 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-09-11 14:52:07 +0200
commitb716a901802314ad57588b4b75f9ea785219827a (patch)
treef704079ca50740ac6e4e07d2ce90ec992250f489 /src/buildtool/serve_api/remote/target_client.cpp
parent60be90f22c17ff113339bae5915c372ac26348ba (diff)
downloadjustbuild-b716a901802314ad57588b4b75f9ea785219827a.tar.gz
Return ArtifactDigest from RepositoryConfig::RepositoryKey
...to prevent additional conversions to ArtifactDigest from plain strings.
Diffstat (limited to 'src/buildtool/serve_api/remote/target_client.cpp')
-rw-r--r--src/buildtool/serve_api/remote/target_client.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp
index 1404fe6e..32d7377f 100644
--- a/src/buildtool/serve_api/remote/target_client.cpp
+++ b/src/buildtool/serve_api/remote/target_client.cpp
@@ -56,7 +56,7 @@ TargetClient::TargetClient(
}
auto TargetClient::ServeTarget(const TargetCacheKey& key,
- const std::string& repo_key) const noexcept
+ const ArtifactDigest& repo_key) const noexcept
-> std::optional<serve_target_result_t> {
// make sure the blob containing the key is in the remote cas
if (not apis_.local->RetrieveToCas({key.Id()}, *apis_.remote)) {
@@ -67,12 +67,13 @@ auto TargetClient::ServeTarget(const TargetCacheKey& key,
}
// make sure the repository configuration blob is in the remote cas
if (not apis_.local->RetrieveToCas(
- {Artifact::ObjectInfo{.digest = ArtifactDigest{repo_key, 0, false},
+ {Artifact::ObjectInfo{.digest = repo_key,
.type = ObjectType::File}},
*apis_.remote)) {
return serve_target_result_t{
std::in_place_index<1>,
- fmt::format("Failed to retrieve to remote cas blob {}", repo_key)};
+ fmt::format("Failed to retrieve to remote cas blob {}",
+ repo_key.hash())};
}
// add target cache key to request