Remove the LocalExecutionConfig singleton

...and replace it with passed instances created early via a builder
pattern.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 10c15312..6cf5eaa6 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -126,9 +126,16 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         return std::nullopt;
     }
 
+    // setup local execution
+    auto local_exec_config =
+        JustMR::Utils::CreateLocalExecutionConfig(common_args);
+    if (not local_exec_config) {
+        return std::nullopt;
+    }
+
     ApiBundle const apis{&storage_config,
                          &storage,
-                         &LocalExecutionConfig::Instance(),
+                         &*local_exec_config,
                          /*repo_config=*/nullptr,
                          &*auth_config,
                          RemoteExecutionConfig::RemoteAddress()};