From e4bbf59415e610fc090572aff29cd20cdb9c41f8 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Mon, 13 Jun 2022 13:30:13 +0200
Subject: RemoteExecutionConfig: Keep global platform properties

... and cache endpoint address for rebuilding.
---
 test/utils/remote_execution/bazel_action_creator.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/utils/remote_execution/bazel_action_creator.hpp')

diff --git a/test/utils/remote_execution/bazel_action_creator.hpp b/test/utils/remote_execution/bazel_action_creator.hpp
index 27864408..5589a1e1 100644
--- a/test/utils/remote_execution/bazel_action_creator.hpp
+++ b/test/utils/remote_execution/bazel_action_creator.hpp
@@ -16,7 +16,7 @@
     std::map<std::string, std::string> const& env_vars,
     std::map<std::string, std::string> const& properties) noexcept
     -> std::unique_ptr<bazel_re::Digest> {
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     auto platform = std::make_unique<bazel_re::Platform>();
     for (auto const& [name, value] : properties) {
@@ -63,7 +63,7 @@
     auto action_id = ArtifactDigest::Create(action_data);
     blobs.emplace_back(action_id, action_data);
 
-    BazelCasClient cas_client(info.Host(), info.Port());
+    BazelCasClient cas_client(info->host, info->port);
 
     if (cas_client.BatchUpdateBlobs(instance_name, blobs.begin(), blobs.end())
             .size() == blobs.size()) {
-- 
cgit v1.2.3