From 5d63c2d05561d31b87b62cf3537b1bf1be6a1469 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 19 Jun 2024 16:36:16 +0200 Subject: Instantiate LocalApi and BazelApi at once ...to properly fallback to local api if needed. --- .../execution_api/common/create_execution_api.hpp | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/buildtool/execution_api/common/create_execution_api.hpp (limited to 'src/buildtool/execution_api/common/create_execution_api.hpp') diff --git a/src/buildtool/execution_api/common/create_execution_api.hpp b/src/buildtool/execution_api/common/create_execution_api.hpp deleted file mode 100644 index 5749a9c4..00000000 --- a/src/buildtool/execution_api/common/create_execution_api.hpp +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2023 Huawei Cloud Computing Technology Co., Ltd. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_CREATE_EXECUTION_API_HPP -#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_CREATE_EXECUTION_API_HPP - -#include -#include - -#include "gsl/gsl" -#include "src/buildtool/common/remote/remote_common.hpp" -#include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/execution_api/local/local_api.hpp" -#include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" - -/// \brief Utility function to instantiate either a Local or Bazel Execution -/// API. -/// \param address if provided, a BazelApi is instantiated -/// \param repo_config repository configuration to be used by GitApi calls -/// \param instance_name only used in the construction of the BazelApi object -[[nodiscard]] static inline auto CreateExecutionApi( - std::optional const& address, - std::optional> const& repo_config = - std::nullopt, - std::string const& instance_name = "remote-execution") - -> gsl::not_null { - if (address) { - ExecutionConfiguration config; - config.skip_cache_lookup = false; - - return std::make_unique( - instance_name, address->host, address->port, config); - } - return std::make_unique(repo_config); -} - -#endif -- cgit v1.2.3