Pass Auth::TLS instance to BazelApi and ServeApi

15 files changed, 125 insertions, 78 deletions

diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index a2063a70..b355641b 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -40,6 +40,7 @@
   , "stage": ["src", "buildtool", "execution_api", "common"]
   , "deps":
     [ "common"
+    , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common/remote", "remote_common"]
     ]
diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp
index 488fc25d..17e3d3af 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -19,8 +19,10 @@
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
 
 ApiBundle::ApiBundle(RepositoryConfig const* repo_config,
+                     Auth::TLS const* authentication,
                      std::optional<ServerAddress> const& remote_address)
-    : local{std::make_shared<LocalApi>(repo_config)},
+    : local{std::make_shared<LocalApi>(repo_config)},  // needed by remote
+      auth{authentication},                            // needed by remote
       remote{CreateRemote(remote_address)} {}
 
 auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const
@@ -29,7 +31,7 @@ auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const
         ExecutionConfiguration config;
         config.skip_cache_lookup = false;
         return std::make_shared<BazelApi>(
-            "remote-execution", address->host, address->port, config);
+            "remote-execution", address->host, address->port, auth, config);
     }
     return local;
 }
diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp
index 53e59de2..72fdb687 100644
--- a/src/buildtool/execution_api/common/api_bundle.hpp
+++ b/src/buildtool/execution_api/common/api_bundle.hpp
@@ -19,6 +19,7 @@
 #include <optional>
 
 #include "gsl/gsl"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
@@ -28,12 +29,14 @@
 /// exactly the same instance that local api is (&*remote == & *local).
 struct ApiBundle final {
     explicit ApiBundle(RepositoryConfig const* repo_config,
+                       Auth::TLS const* authentication,
                        std::optional<ServerAddress> const& remote_address);
 
     [[nodiscard]] auto CreateRemote(std::optional<ServerAddress> const& address)
         const -> gsl::not_null<IExecutionApi::Ptr>;
 
-    gsl::not_null<IExecutionApi::Ptr> const local;
+    gsl::not_null<IExecutionApi::Ptr> const local;  // needed by remote
+    Auth::TLS const* auth;                          // needed by remote
     gsl::not_null<IExecutionApi::Ptr> const remote;
 };
 
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index f38990ac..466975ec 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -65,6 +65,7 @@
   , "srcs": ["bazel/bazel_api.cpp"]
   , "deps":
     [ "config"
+    , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["@", "gsl", "", "gsl"]
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index aea38ab4..dfd5dd6e 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -189,6 +189,7 @@ namespace {
 BazelApi::BazelApi(std::string const& instance_name,
                    std::string const& host,
                    Port port,
+                   [[maybe_unused]] Auth::TLS const* auth,
                    ExecutionConfiguration const& exec_config) noexcept {
     network_ =
         std::make_shared<BazelNetwork>(instance_name, host, port, exec_config);
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
index 289cb19c..e87e6159 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "gsl/gsl"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/remote/port.hpp"
@@ -42,6 +43,7 @@ class BazelApi final : public IExecutionApi {
     BazelApi(std::string const& instance_name,
              std::string const& host,
              Port port,
+             Auth::TLS const* auth,
              ExecutionConfiguration const& exec_config) noexcept;
     BazelApi(BazelApi const&) = delete;
     BazelApi(BazelApi&& other) noexcept;
diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp
index c42a68cd..89a384b8 100644
--- a/src/buildtool/execution_engine/executor/executor.hpp
+++ b/src/buildtool/execution_engine/executor/executor.hpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "gsl/gsl"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/repository_config.hpp"
@@ -60,6 +61,7 @@ class ExecutorImpl {
         std::map<std::string, std::string> const& properties,
         std::vector<std::pair<std::map<std::string, std::string>,
                               ServerAddress>> const& dispatch_list,
+        Auth::TLS const* auth,
         std::chrono::milliseconds const& timeout,
         IExecutionAction::CacheFlag cache_flag,
         gsl::not_null<Statistics*> const& stats,
@@ -108,7 +110,7 @@ class ExecutorImpl {
         }
 
         auto alternative_api =
-            GetAlternativeEndpoint(properties, dispatch_list);
+            GetAlternativeEndpoint(properties, dispatch_list, auth);
         if (alternative_api) {
             if (not api.ParallelRetrieveToCas(
                     std::vector<Artifact::ObjectInfo>{Artifact::ObjectInfo{
@@ -665,8 +667,8 @@ class ExecutorImpl {
     [[nodiscard]] static inline auto GetAlternativeEndpoint(
         const std::map<std::string, std::string>& properties,
         const std::vector<std::pair<std::map<std::string, std::string>,
-                                    ServerAddress>>& dispatch_list)
-        -> std::unique_ptr<BazelApi> {
+                                    ServerAddress>>& dispatch_list,
+        const Auth::TLS* auth) -> std::unique_ptr<BazelApi> {
         for (auto const& [pred, endpoint] : dispatch_list) {
             bool match = true;
             for (auto const& [k, v] : pred) {
@@ -685,6 +687,7 @@ class ExecutorImpl {
                     "alternative remote execution",
                     endpoint.host,
                     endpoint.port,
+                    auth,
                     config);
             }
         }
@@ -705,6 +708,7 @@ class Executor {
         std::map<std::string, std::string> properties,
         std::vector<std::pair<std::map<std::string, std::string>,
                               ServerAddress>> dispatch_list,
+        Auth::TLS const* auth,
         gsl::not_null<Statistics*> const& stats,
         gsl::not_null<Progress*> const& progress,
         Logger const* logger = nullptr,  // log in caller logger, if given
@@ -714,6 +718,7 @@ class Executor {
           remote_api_{*remote_api},
           properties_{std::move(properties)},
           dispatch_list_{std::move(dispatch_list)},
+          auth_{auth},
           stats_{stats},
           progress_{progress},
           logger_{logger},
@@ -736,6 +741,7 @@ class Executor {
                 Impl::MergeProperties(properties_,
                                       action->ExecutionProperties()),
                 dispatch_list_,
+                auth_,
                 Impl::ScaleTime(timeout_, action->TimeoutScale()),
                 action->NoCache() ? CF::DoNotCacheOutput : CF::CacheOutput,
                 stats_,
@@ -754,6 +760,7 @@ class Executor {
             remote_api_,
             Impl::MergeProperties(properties_, action->ExecutionProperties()),
             dispatch_list_,
+            auth_,
             Impl::ScaleTime(timeout_, action->TimeoutScale()),
             action->NoCache() ? CF::DoNotCacheOutput : CF::CacheOutput,
             stats_,
@@ -791,6 +798,7 @@ class Executor {
     std::map<std::string, std::string> properties_;
     std::vector<std::pair<std::map<std::string, std::string>, ServerAddress>>
         dispatch_list_;
+    Auth::TLS const* auth_;
     gsl::not_null<Statistics*> stats_;
     gsl::not_null<Progress*> progress_;
     Logger const* logger_;
@@ -816,6 +824,7 @@ class Rebuilder {
         std::map<std::string, std::string> properties,
         std::vector<std::pair<std::map<std::string, std::string>,
                               ServerAddress>> dispatch_list,
+        Auth::TLS const* auth,
         gsl::not_null<Statistics*> const& stats,
         gsl::not_null<Progress*> const& progress,
         std::chrono::milliseconds timeout = IExecutionAction::kDefaultTimeout)
@@ -825,6 +834,7 @@ class Rebuilder {
           api_cached_{*api_cached},
           properties_{std::move(properties)},
           dispatch_list_{std::move(dispatch_list)},
+          auth_{auth},
           stats_{stats},
           progress_{progress},
           timeout_{timeout} {}
@@ -840,6 +850,7 @@ class Rebuilder {
             remote_api_,
             Impl::MergeProperties(properties_, action->ExecutionProperties()),
             dispatch_list_,
+            auth_,
             Impl::ScaleTime(timeout_, action->TimeoutScale()),
             CF::PretendCached,
             stats_,
@@ -856,6 +867,7 @@ class Rebuilder {
             api_cached_,
             Impl::MergeProperties(properties_, action->ExecutionProperties()),
             dispatch_list_,
+            auth_,
             Impl::ScaleTime(timeout_, action->TimeoutScale()),
             CF::FromCacheOnly,
             stats_,
@@ -904,6 +916,7 @@ class Rebuilder {
     std::map<std::string, std::string> properties_;
     std::vector<std::pair<std::map<std::string, std::string>, ServerAddress>>
         dispatch_list_;
+    Auth::TLS const* auth_;
     gsl::not_null<Statistics*> stats_;
     gsl::not_null<Progress*> progress_;
     std::chrono::milliseconds timeout_;
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp
index ef5316a6..40ca1ec3 100644
--- a/src/buildtool/graph_traverser/graph_traverser.hpp
+++ b/src/buildtool/graph_traverser/graph_traverser.hpp
@@ -364,6 +364,7 @@ class GraphTraverser {
                           &*apis_.remote,
                           platform_properties_,
                           dispatch_list_,
+                          apis_.auth,
                           stats_,
                           progress_,
                           logger_,
@@ -397,6 +398,7 @@ class GraphTraverser {
                            &*api_cached,
                            platform_properties_,
                            dispatch_list_,
+                           apis_.auth,
                            stats_,
                            progress_,
                            clargs_.build.timeout};
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 1ae9c0ce..cd073847 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -813,6 +813,10 @@ auto main(int argc, char* argv[]) -> int {
         }
 
         SetupAuthConfig(arguments.auth, arguments.cauth, arguments.sauth);
+        std::optional<Auth::TLS> auth = {};
+        if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) {
+            auth = Auth::TLS::Instance();
+        }
 
         if (arguments.cmd == SubCommand::kGc) {
             if (GarbageCollector::TriggerGarbageCollection(
@@ -824,7 +828,8 @@ auto main(int argc, char* argv[]) -> int {
 
         if (arguments.cmd == SubCommand::kExecute) {
             SetupExecutionServiceConfig(arguments.service);
-            ApiBundle const exec_apis{nullptr,
+            ApiBundle const exec_apis{/*repo_config=*/nullptr,
+                                      auth ? &*auth : nullptr,
                                       RemoteExecutionConfig::RemoteAddress()};
             if (!ServerImpl::Instance().Run(exec_apis)) {
                 return kExitFailure;
@@ -840,7 +845,9 @@ auto main(int argc, char* argv[]) -> int {
                                         arguments.service.pid_file);
             if (serve_server) {
                 ApiBundle const serve_apis{
-                    nullptr, RemoteExecutionConfig::RemoteAddress()};
+                    /*repo_config=*/nullptr,
+                    auth ? &*auth : nullptr,
+                    RemoteExecutionConfig::RemoteAddress()};
                 auto serve = ServeApi::Create(*serve_config, &serve_apis);
                 bool with_execute = not RemoteExecutionConfig::RemoteAddress();
                 return serve_server->Run(
@@ -892,6 +899,7 @@ auto main(int argc, char* argv[]) -> int {
             std::exit(kExitFailure);
         }
         ApiBundle const main_apis{&repo_config,
+                                  auth ? &*auth : nullptr,
                                   RemoteExecutionConfig::RemoteAddress()};
         GraphTraverser const traverser{
             {jobs,
diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp
index 0f980f86..fc09ee8c 100644
--- a/src/buildtool/serve_api/serve_service/target.cpp
+++ b/src/buildtool/serve_api/serve_service/target.cpp
@@ -499,7 +499,7 @@ auto TargetService::ServeTarget(
 
         // Use a new ApiBundle that knows about local repository config for
         // traversing.
-        ApiBundle const local_apis{&repository_config, address};
+        ApiBundle const local_apis{&repository_config, apis_.auth, address};
         GraphTraverser const traverser{
             std::move(traverser_args),
             &repository_config,
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index df99e7ef..b8afc631 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -107,6 +107,7 @@
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "json", "", "json"]
+    , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , "exit_codes"
@@ -155,6 +156,7 @@
   , "stage": ["src", "other_tools", "just_mr"]
   , "private-deps":
     [ ["@", "json", "", "json"]
+    , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/storage", "fs_utils"]
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index d0018ba4..11ae3a01 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -20,6 +20,7 @@
 
 #include "fmt/core.h"
 #include "nlohmann/json.hpp"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/logging/log_level.hpp"
@@ -394,16 +395,25 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
 
     // setup the APIs for archive fetches; only happens if in native mode
     JustMR::Utils::SetupRemoteConfig(common_args.remote_execution_address,
-                                     common_args.remote_serve_address,
-                                     auth_args);
+                                     common_args.remote_serve_address);
+
+    // setup authentication
+    JustMR::Utils::SetupAuthConfig(auth_args);
+    std::optional<Auth::TLS> auth = {};
+    if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) {
+        auth = Auth::TLS::Instance();
+    }
+
+    ApiBundle const apis{/*repo_config=*/nullptr,
+                         auth ? &*auth : nullptr,
+                         RemoteExecutionConfig::RemoteAddress()};
 
-    ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()};
     bool const has_remote_api =
         apis.local != apis.remote and not common_args.compatible;
 
     // setup the API for serving roots
-    auto serve_config = JustMR::Utils::CreateServeConfig(
-        common_args.remote_serve_address, auth_args);
+    auto serve_config =
+        JustMR::Utils::CreateServeConfig(common_args.remote_serve_address);
     if (not serve_config) {
         return kExitConfigError;
     }
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index dacbfec6..70c74eb0 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -18,9 +18,11 @@
 #include <condition_variable>
 #include <cstddef>
 #include <exception>
+#include <optional>
 #include <thread>
 
 #include "nlohmann/json.hpp"
+#include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp"
@@ -111,24 +113,31 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
     }
 
     // setup the APIs for archive fetches; only happens if in native mode
-    // setup the APIs for archive fetches; only happens if in native mode
     JustMR::Utils::SetupRemoteConfig(common_args.remote_execution_address,
-                                     common_args.remote_serve_address,
-                                     auth_args);
+                                     common_args.remote_serve_address);
+
+    // setup authentication
+    JustMR::Utils::SetupAuthConfig(auth_args);
+    std::optional<Auth::TLS> auth = {};
+    if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) {
+        auth = Auth::TLS::Instance();
+    }
+
+    ApiBundle const apis{/*repo_config=*/nullptr,
+                         auth ? &*auth : nullptr,
+                         RemoteExecutionConfig::RemoteAddress()};
 
-    ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()};
     bool const has_remote_api =
         apis.local != apis.remote and not common_args.compatible;
 
     // setup the API for serving roots
-    auto serve_config = JustMR::Utils::CreateServeConfig(
-        common_args.remote_serve_address, auth_args);
+    auto serve_config =
+        JustMR::Utils::CreateServeConfig(common_args.remote_serve_address);
     if (not serve_config) {
         return std::nullopt;
     }
 
     auto serve = ServeApi::Create(*serve_config, &apis);
-
     // check configuration of the serve endpoint provided
     if (serve) {
         // if we have a remote endpoint explicitly given by the user, it must
diff --git a/src/other_tools/just_mr/setup_utils.cpp b/src/other_tools/just_mr/setup_utils.cpp
index 86e0615c..7ed61897 100644
--- a/src/other_tools/just_mr/setup_utils.cpp
+++ b/src/other_tools/just_mr/setup_utils.cpp
@@ -26,48 +26,6 @@
 #include "src/buildtool/logging/logger.hpp"
 #include "src/other_tools/just_mr/exit_codes.hpp"
 
-namespace {
-
-void SetupAuthConfig(MultiRepoRemoteAuthArguments const& authargs) noexcept {
-    bool use_tls{false};
-    if (authargs.tls_ca_cert) {
-        use_tls = true;
-        if (not Auth::TLS::Instance().SetCACertificate(*authargs.tls_ca_cert)) {
-            Logger::Log(LogLevel::Error,
-                        "Could not read '{}' certificate.",
-                        authargs.tls_ca_cert->string());
-            std::exit(kExitConfigError);
-        }
-    }
-    if (authargs.tls_client_cert) {
-        use_tls = true;
-        if (not Auth::TLS::Instance().SetClientCertificate(
-                *authargs.tls_client_cert)) {
-            Logger::Log(LogLevel::Error,
-                        "Could not read '{}' certificate.",
-                        authargs.tls_client_cert->string());
-            std::exit(kExitConfigError);
-        }
-    }
-    if (authargs.tls_client_key) {
-        use_tls = true;
-        if (not Auth::TLS::Instance().SetClientKey(*authargs.tls_client_key)) {
-            Logger::Log(LogLevel::Error,
-                        "Could not read '{}' key.",
-                        authargs.tls_client_key->string());
-            std::exit(kExitConfigError);
-        }
-    }
-
-    if (use_tls) {
-        if (not Auth::TLS::Instance().Validate()) {
-            std::exit(kExitConfigError);
-        }
-    }
-}
-
-}  // namespace
-
 namespace JustMR::Utils {
 
 void ReachableRepositories(
@@ -235,9 +193,47 @@ auto ReadConfiguration(
     }
 }
 
-void SetupRemoteConfig(std::optional<std::string> const& remote_exec_addr,
-                       std::optional<std::string> const& remote_serve_addr,
-                       MultiRepoRemoteAuthArguments const& auth) noexcept {
+void SetupAuthConfig(MultiRepoRemoteAuthArguments const& authargs) noexcept {
+    bool use_tls{false};
+    if (authargs.tls_ca_cert) {
+        use_tls = true;
+        if (not Auth::TLS::Instance().SetCACertificate(*authargs.tls_ca_cert)) {
+            Logger::Log(LogLevel::Error,
+                        "Could not read '{}' certificate.",
+                        authargs.tls_ca_cert->string());
+            std::exit(kExitConfigError);
+        }
+    }
+    if (authargs.tls_client_cert) {
+        use_tls = true;
+        if (not Auth::TLS::Instance().SetClientCertificate(
+                *authargs.tls_client_cert)) {
+            Logger::Log(LogLevel::Error,
+                        "Could not read '{}' certificate.",
+                        authargs.tls_client_cert->string());
+            std::exit(kExitConfigError);
+        }
+    }
+    if (authargs.tls_client_key) {
+        use_tls = true;
+        if (not Auth::TLS::Instance().SetClientKey(*authargs.tls_client_key)) {
+            Logger::Log(LogLevel::Error,
+                        "Could not read '{}' key.",
+                        authargs.tls_client_key->string());
+            std::exit(kExitConfigError);
+        }
+    }
+
+    if (use_tls) {
+        if (not Auth::TLS::Instance().Validate()) {
+            std::exit(kExitConfigError);
+        }
+    }
+}
+
+void SetupRemoteConfig(
+    std::optional<std::string> const& remote_exec_addr,
+    std::optional<std::string> const& remote_serve_addr) noexcept {
     // if only a serve endpoint address is given, we assume it is one that acts
     // also as remote-execution
     auto remote_addr = remote_exec_addr ? remote_exec_addr : remote_serve_addr;
@@ -245,8 +241,6 @@ void SetupRemoteConfig(std::optional<std::string> const& remote_exec_addr,
         return;
     }
 
-    // setup authentication
-    SetupAuthConfig(auth);
     // setup remote
     if (not RemoteExecutionConfig::SetRemoteAddress(*remote_addr)) {
         Logger::Log(LogLevel::Error,
@@ -256,15 +250,13 @@ void SetupRemoteConfig(std::optional<std::string> const& remote_exec_addr,
     }
 }
 
-auto CreateServeConfig(std::optional<std::string> const& remote_serve_addr,
-                       MultiRepoRemoteAuthArguments const& auth) noexcept
+auto CreateServeConfig(
+    std::optional<std::string> const& remote_serve_addr) noexcept
     -> std::optional<RemoteServeConfig> {
     RemoteServeConfig::Builder builder;
     auto config = builder.SetRemoteAddress(remote_serve_addr).Build();
 
     if (config) {
-        // setup authentication
-        SetupAuthConfig(auth);
         return *std::move(config);
     }
 
diff --git a/src/other_tools/just_mr/setup_utils.hpp b/src/other_tools/just_mr/setup_utils.hpp
index f29dbef1..2ae08d41 100644
--- a/src/other_tools/just_mr/setup_utils.hpp
+++ b/src/other_tools/just_mr/setup_utils.hpp
@@ -60,16 +60,17 @@ void DefaultReachableRepositories(
     std::optional<std::filesystem::path> const& absent_file_opt) noexcept
     -> std::shared_ptr<Configuration>;
 
-void SetupRemoteConfig(std::optional<std::string> const& remote_exec_addr,
-                       std::optional<std::string> const& remote_serve_addr,
-                       MultiRepoRemoteAuthArguments const& auth) noexcept;
+void SetupAuthConfig(MultiRepoRemoteAuthArguments const& authargs) noexcept;
+
+void SetupRemoteConfig(
+    std::optional<std::string> const& remote_exec_addr,
+    std::optional<std::string> const& remote_serve_addr) noexcept;
 
 /// \brief Setup of a 'just serve' remote API based on just-mr arguments.
-/// \returns RemoteServeConfig if initialization was successfull or std::nullopt
+/// \returns RemoteServeConfig if initialization was successful or std::nullopt
 /// if failed.
 [[nodiscard]] auto CreateServeConfig(
-    std::optional<std::string> const& remote_serve_addr,
-    MultiRepoRemoteAuthArguments const& auth) noexcept
+    std::optional<std::string> const& remote_serve_addr) noexcept
     -> std::optional<RemoteServeConfig>;
 
 }  // namespace Utils