From b716a901802314ad57588b4b75f9ea785219827a Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Tue, 10 Sep 2024 12:16:35 +0200 Subject: Return ArtifactDigest from RepositoryConfig::RepositoryKey ...to prevent additional conversions to ArtifactDigest from plain strings. --- src/buildtool/serve_api/remote/target_client.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/buildtool/serve_api/remote/target_client.cpp') 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 { // 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 -- cgit v1.2.3