Pass RemoteExecutionConfig instance to ApiBundle

...and store it as a const ref for subsequent use wherever the apis
are already passed.

2 files changed, 18 insertions, 18 deletions

diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp
index 18236837..5ec27e97 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -113,7 +113,7 @@ TEST_CASE("simple targets", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -564,7 +564,7 @@ TEST_CASE("configuration deduplication", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -660,7 +660,7 @@ TEST_CASE("generator functions in string arguments", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -768,7 +768,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -986,7 +986,7 @@ TEST_CASE("target reference", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -1137,7 +1137,7 @@ TEST_CASE("trees", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -1252,7 +1252,7 @@ TEST_CASE("RESULT error reporting", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
@@ -1426,7 +1426,7 @@ TEST_CASE("wrong arguments", "[target_map]") {
                          &local_exec_config,
                          /*repo_config=*/nullptr,
                          &auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     auto serve = ServeApi::Create(*serve_config, &storage, &apis);
     AnalyseContext ctx{.repo_config = &repo_config,
                        .storage = &storage,
diff --git a/test/buildtool/graph_traverser/graph_traverser.test.hpp b/test/buildtool/graph_traverser/graph_traverser.test.hpp
index 4d47ef39..b4695c34 100644
--- a/test/buildtool/graph_traverser/graph_traverser.test.hpp
+++ b/test/buildtool/graph_traverser/graph_traverser.test.hpp
@@ -173,7 +173,7 @@ class TestProject {
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser const gt{clargs.gtargs,
                             p.GetRepoConfig(),
                             RemoteExecutionConfig::PlatformProperties(),
@@ -205,7 +205,7 @@ class TestProject {
                              &local_exec_config,
                              p.GetRepoConfig(),
                              auth,
-                             RemoteExecutionConfig::RemoteAddress()};
+                             &RemoteExecutionConfig::Instance()};
         GraphTraverser const gt_get_exec{
             clargs_exec.gtargs,
             p.GetRepoConfig(),
@@ -249,7 +249,7 @@ class TestProject {
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser const gt{clargs.gtargs,
                             p.GetRepoConfig(),
                             RemoteExecutionConfig::PlatformProperties(),
@@ -287,7 +287,7 @@ class TestProject {
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser const gt{clargs.gtargs,
                             p.GetRepoConfig(),
                             RemoteExecutionConfig::PlatformProperties(),
@@ -346,7 +346,7 @@ class TestProject {
                          &local_exec_config,
                          full_hello_world.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser const gt_upload{clargs_update_cpp.gtargs,
                                    full_hello_world.GetRepoConfig(),
                                    RemoteExecutionConfig::PlatformProperties(),
@@ -409,7 +409,7 @@ static void TestBlobsUploadedAndUsed(StorageConfig const& storage_config,
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser gt{clargs.gtargs,
                       p.GetRepoConfig(),
                       RemoteExecutionConfig::PlatformProperties(),
@@ -455,7 +455,7 @@ static void TestEnvironmentVariablesSetAndUsed(
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser gt{clargs.gtargs,
                       p.GetRepoConfig(),
                       RemoteExecutionConfig::PlatformProperties(),
@@ -500,7 +500,7 @@ static void TestTreesUsed(StorageConfig const& storage_config,
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser gt{clargs.gtargs,
                       p.GetRepoConfig(),
                       RemoteExecutionConfig::PlatformProperties(),
@@ -545,7 +545,7 @@ static void TestNestedTreesUsed(StorageConfig const& storage_config,
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
     GraphTraverser gt{clargs.gtargs,
                       p.GetRepoConfig(),
                       RemoteExecutionConfig::PlatformProperties(),
@@ -589,7 +589,7 @@ static void TestFlakyHelloWorldDetected(StorageConfig const& storage_config,
                          &local_exec_config,
                          p.GetRepoConfig(),
                          auth,
-                         RemoteExecutionConfig::RemoteAddress()};
+                         &RemoteExecutionConfig::Instance()};
 
     {
         auto clargs = p.CmdLineArgs("_entry_points_ctimes");