Pass RemoteAddress to ConfigurationClient by value

...instead of using singleton calls.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/buildtool/serve_api/remote/configuration_client.hpp b/src/buildtool/serve_api/remote/configuration_client.hpp
index eab0cbca..aeebc303 100644
--- a/src/buildtool/serve_api/remote/configuration_client.hpp
+++ b/src/buildtool/serve_api/remote/configuration_client.hpp
@@ -24,21 +24,25 @@
 #include "justbuild/just_serve/just_serve.grpc.pb.h"
 #include "src/buildtool/common/remote/client_common.hpp"
 #include "src/buildtool/common/remote/port.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
 /// Implements client side for Configuration service defined in:
 /// src/buildtool/serve_api/serve_service/just_serve.proto
 class ConfigurationClient {
   public:
-    ConfigurationClient(std::string const& server, Port port) noexcept
-        : stub_{justbuild::just_serve::Configuration::NewStub(
-              CreateChannelWithCredentials(server, port))} {}
+    explicit ConfigurationClient(ServerAddress address) noexcept
+        : client_serve_address_{std::move(address)},
+          stub_{justbuild::just_serve::Configuration::NewStub(
+              CreateChannelWithCredentials(client_serve_address_.host,
+                                           client_serve_address_.port))} {}
 
     [[nodiscard]] auto CheckServeRemoteExecution() const noexcept -> bool;
 
     [[nodiscard]] auto IsCompatible() const noexcept -> std::optional<bool>;
 
   private:
+    ServerAddress const client_serve_address_;
     std::unique_ptr<justbuild::just_serve::Configuration::Stub> stub_;
     Logger logger_{"RemoteConfigurationClient"};
 };