Remove the LocalExecutionConfig singleton

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

1 files changed, 16 insertions, 0 deletions

diff --git a/src/other_tools/just_mr/setup_utils.cpp b/src/other_tools/just_mr/setup_utils.cpp
index 2c219d95..ae6f5a28 100644
--- a/src/other_tools/just_mr/setup_utils.cpp
+++ b/src/other_tools/just_mr/setup_utils.cpp
@@ -217,6 +217,22 @@ auto CreateAuthConfig(MultiRepoRemoteAuthArguments const& authargs) noexcept
     return Auth{};
 }
 
+auto CreateLocalExecutionConfig(MultiRepoCommonArguments const& cargs) noexcept
+    -> std::optional<LocalExecutionConfig> {
+
+    LocalExecutionConfig::Builder builder;
+    if (cargs.local_launcher.has_value()) {
+        builder.SetLauncher(*cargs.local_launcher);
+    }
+
+    auto config = builder.Build();
+    if (config) {
+        return *std::move(config);
+    }
+    Logger::Log(LogLevel::Error, config.error());
+    return std::nullopt;
+}
+
 void SetupRemoteConfig(
     std::optional<std::string> const& remote_exec_addr,
     std::optional<std::string> const& remote_serve_addr) noexcept {