From a7bdda7bd9520238ca3a588a33fc75beeef3c488 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Wed, 12 Jun 2024 10:00:06 +0200
Subject: Use RemoteServeConfig functionality via Instance()

...to track changes during refactoring easier.
---
 .../serve_api/serve_service/source_tree.cpp          | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/buildtool/serve_api/serve_service/source_tree.cpp')

diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index c152773f..493dd0eb 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -254,7 +254,7 @@ auto SourceTreeService::ServeCommitTree(
         return ::grpc::Status::OK;
     }
     // try given extra repositories, in order
-    for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+    for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) {
         auto res = GetSubtreeFromCommit(path, commit, subdir, logger_);
         if (std::holds_alternative<std::string>(res)) {
             auto tree_id = std::get<std::string>(res);
@@ -410,7 +410,7 @@ auto SourceTreeService::ResolveContentTree(
         ResolvedGitObject resolved_tree{};
         bool failed{false};
         {
-            TaskSystem ts{RemoteServeConfig::Jobs()};
+            TaskSystem ts{RemoteServeConfig::Instance().Jobs()};
             resolve_symlinks_map_.ConsumeAfterKeysReady(
                 &ts,
                 {GitObjectToResolve{tree_id,
@@ -745,7 +745,8 @@ auto SourceTreeService::ServeArchiveTree(
             return ::grpc::Status::OK;
         }
         // check known repositories
-        for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+        for (auto const& path :
+             RemoteServeConfig::Instance().KnownRepositories()) {
             auto res =
                 GetSubtreeFromTree(path, *archive_tree_id, subdir, logger_);
             if (std::holds_alternative<std::string>(res)) {
@@ -806,7 +807,8 @@ auto SourceTreeService::ServeArchiveTree(
     }
     if (not content_cas_path) {
         // check if content blob is in a known repository
-        for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+        for (auto const& path :
+             RemoteServeConfig::Instance().KnownRepositories()) {
             auto res = GetBlobFromRepo(path, content, logger_);
             if (std::holds_alternative<std::string>(res)) {
                 // add to CAS
@@ -1052,7 +1054,7 @@ auto SourceTreeService::ServeDistdirTree(
                 }
                 // check known repositories
                 for (auto const& path :
-                     RemoteServeConfig::KnownRepositories()) {
+                     RemoteServeConfig::Instance().KnownRepositories()) {
                     auto res = GetBlobFromRepo(path, content, logger_);
                     if (std::holds_alternative<std::string>(res)) {
                         // add content to local CAS
@@ -1215,7 +1217,7 @@ auto SourceTreeService::ServeDistdirTree(
         return ::grpc::Status::OK;
     }
     // check if tree is in a known repository
-    for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+    for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) {
         auto has_tree = IsTreeInRepo(tree_id, path, logger_);
         if (not has_tree) {
             logger_->Emit(LogLevel::Error,
@@ -1321,7 +1323,7 @@ auto SourceTreeService::ServeContent(
         return ::grpc::Status::OK;
     }
     // check if content blob is in a known repository
-    for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+    for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) {
         auto res = GetBlobFromRepo(path, content, logger_);
         if (std::holds_alternative<std::string>(res)) {
             // upload blob to remote CAS
@@ -1438,7 +1440,7 @@ auto SourceTreeService::ServeTree(
         return ::grpc::Status::OK;
     }
     // check if tree is in a known repository
-    for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+    for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) {
         auto has_tree = IsTreeInRepo(tree_id, path, logger_);
         if (not has_tree) {
             logger_->Emit(LogLevel::Error,
@@ -1542,7 +1544,7 @@ auto SourceTreeService::CheckRootTree(
         return ::grpc::Status::OK;
     }
     // check if tree is in a known repository
-    for (auto const& path : RemoteServeConfig::KnownRepositories()) {
+    for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) {
         auto has_tree = IsTreeInRepo(tree_id, path, logger_);
         if (not has_tree) {
             logger_->Emit(LogLevel::Error,
-- 
cgit v1.2.3