From 57b7ec186b740b94df030e2f064c28148dd30749 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Mon, 8 Jul 2024 15:24:57 +0200
Subject: Pass RemoteExecutionConfig instance to ApiBundle

...and store it as a const ref for subsequent use wherever the apis
are already passed.
---
 src/buildtool/main/main.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/buildtool/main/main.cpp')

diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index a82a6db8..5e296482 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -874,7 +874,7 @@ auto main(int argc, char* argv[]) -> int {
                                       &*local_exec_config,
                                       /*repo_config=*/nullptr,
                                       &*auth_config,
-                                      RemoteExecutionConfig::RemoteAddress()};
+                                      &RemoteExecutionConfig::Instance()};
             if (not ServerImpl::Instance().Run(
                     *storage_config, storage, exec_apis)) {
                 return kExitFailure;
@@ -901,13 +901,12 @@ auto main(int argc, char* argv[]) -> int {
                 auto const storage = Storage::Create(&*storage_config);
                 StoreTargetCacheShard(*storage_config, storage);
 
-                ApiBundle const serve_apis{
-                    &*storage_config,
-                    &storage,
-                    &*local_exec_config,
-                    /*repo_config=*/nullptr,
-                    &*auth_config,
-                    RemoteExecutionConfig::RemoteAddress()};
+                ApiBundle const serve_apis{&*storage_config,
+                                           &storage,
+                                           &*local_exec_config,
+                                           /*repo_config=*/nullptr,
+                                           &*auth_config,
+                                           &RemoteExecutionConfig::Instance()};
                 auto serve =
                     ServeApi::Create(*serve_config, &storage, &serve_apis);
                 bool with_execute = not RemoteExecutionConfig::RemoteAddress();
@@ -990,7 +989,7 @@ auto main(int argc, char* argv[]) -> int {
                                   &*local_exec_config,
                                   &repo_config,
                                   &*auth_config,
-                                  RemoteExecutionConfig::RemoteAddress()};
+                                  &RemoteExecutionConfig::Instance()};
         GraphTraverser const traverser{
             {jobs,
              std::move(arguments.build),
-- 
cgit v1.2.3