From 4ebb3bf82551c334d16f4935c751fb554224e19c Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Thu, 27 Jun 2024 16:16:09 +0200
Subject: Pass Storage to RepositoryConfig

...and adjust AnalyseContext.
---
 src/buildtool/common/repository_config.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/buildtool/common/repository_config.cpp')

diff --git a/src/buildtool/common/repository_config.cpp b/src/buildtool/common/repository_config.cpp
index a3b81de1..d26ba55b 100644
--- a/src/buildtool/common/repository_config.cpp
+++ b/src/buildtool/common/repository_config.cpp
@@ -14,7 +14,6 @@
 
 #include "src/buildtool/common/repository_config.hpp"
 
-#include "src/buildtool/storage/storage.hpp"
 #include "src/utils/automata/dfa_minimizer.hpp"
 
 auto RepositoryConfig::RepositoryInfo::BaseContentDescription() const
@@ -35,15 +34,16 @@ auto RepositoryConfig::RepositoryInfo::BaseContentDescription() const
     return std::nullopt;
 }
 
-auto RepositoryConfig::RepositoryKey(std::string const& repo) const noexcept
+auto RepositoryConfig::RepositoryKey(Storage const& storage,
+                                     std::string const& repo) const noexcept
     -> std::optional<std::string> {
     auto const& unique = DeduplicateRepo(repo);
     if (auto const* data = Data(unique)) {
         // compute key only once (thread-safe)
         return data->key.SetOnceAndGet(
-            [this, &unique]() -> std::optional<std::string> {
+            [this, &storage, &unique]() -> std::optional<std::string> {
                 if (auto graph = BuildGraphForRepository(unique)) {
-                    auto const& cas = Storage::Instance().CAS();
+                    auto const& cas = storage.CAS();
                     if (auto digest = cas.StoreBlob(graph->dump(2))) {
                         return ArtifactDigest{*digest}.hash();
                     }
-- 
cgit v1.2.3