1 files changed, 7 insertions, 2 deletions
diff --git a/src/buildtool/serve_api/remote/configuration_client.hpp b/src/buildtool/serve_api/remote/configuration_client.hpp
index 3d0eb7ff..3ae6d1e6 100644
--- a/src/buildtool/serve_api/remote/configuration_client.hpp
+++ b/src/buildtool/serve_api/remote/configuration_client.hpp
@@ -27,6 +27,7 @@
 #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/execution_api/remote/config.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
 /// Implements client side for Configuration service defined in:
@@ -35,12 +36,15 @@ class ConfigurationClient {
   public:
     explicit ConfigurationClient(
         ServerAddress address,
-        gsl::not_null<Auth const*> const& auth) noexcept
+        gsl::not_null<Auth const*> const& auth,
+        gsl::not_null<RemoteExecutionConfig const*> const&
+            remote_config) noexcept
         : client_serve_address_{std::move(address)},
           stub_{justbuild::just_serve::Configuration::NewStub(
               CreateChannelWithCredentials(client_serve_address_.host,
                                            client_serve_address_.port,
-                                           auth))} {}
+                                           auth))},
+          remote_config_{*remote_config} {}
 
     [[nodiscard]] auto CheckServeRemoteExecution() const noexcept -> bool;
 
@@ -49,6 +53,7 @@ class ConfigurationClient {
   private:
     ServerAddress const client_serve_address_;
     std::unique_ptr<justbuild::just_serve::Configuration::Stub> stub_;
+    RemoteExecutionConfig const& remote_config_;
     Logger logger_{"RemoteConfigurationClient"};
 };