diff options
Diffstat (limited to 'src')
13 files changed, 79 insertions, 38 deletions
diff --git a/src/buildtool/common/remote/TARGETS b/src/buildtool/common/remote/TARGETS index 83b3872f..daf7afc2 100644 --- a/src/buildtool/common/remote/TARGETS +++ b/src/buildtool/common/remote/TARGETS @@ -6,9 +6,20 @@ [ ["@", "grpc", "", "grpc++"] , ["src/buildtool/auth", "auth"] , ["src/buildtool/common", "common"] - , ["src/buildtool/execution_api/common", "common"] + , "port" , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "common", "remote"] } +, "port": + { "type": ["@", "rules", "CC", "library"] + , "name": ["port"] + , "hdrs": ["port.hpp"] + , "deps": + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "logging"] + , ["src/utils/cpp", "type_safe_arithmetic"] + ] + , "stage": ["src", "buildtool", "common", "remote"] + } } diff --git a/src/buildtool/common/remote/client_common.hpp b/src/buildtool/common/remote/client_common.hpp index c0b3fcd5..cf06831d 100644 --- a/src/buildtool/common/remote/client_common.hpp +++ b/src/buildtool/common/remote/client_common.hpp @@ -24,7 +24,7 @@ #include "grpcpp/grpcpp.h" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/logging/logger.hpp" [[maybe_unused]] [[nodiscard]] static inline auto CreateChannelWithCredentials( diff --git a/src/buildtool/common/remote/port.hpp b/src/buildtool/common/remote/port.hpp new file mode 100644 index 00000000..bc850f3a --- /dev/null +++ b/src/buildtool/common/remote/port.hpp @@ -0,0 +1,53 @@ +// 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_COMMON_PORT_HPP +#define INCLUDED_SRC_BUILDTOOL_COMMON_PORT_HPP + +#include <optional> + +#include "gsl/gsl" +#include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/type_safe_arithmetic.hpp" + +// Port +struct PortTag : type_safe_arithmetic_tag<std::uint16_t> {}; +using Port = type_safe_arithmetic<PortTag>; + +[[nodiscard]] static auto ParsePort(int const port_num) noexcept + -> std::optional<Port> { + try { + static constexpr int kMaxPortNumber{ + std::numeric_limits<uint16_t>::max()}; + if (port_num >= 0 and port_num <= kMaxPortNumber) { + return gsl::narrow_cast<Port::value_t>(port_num); + } + } catch (std::out_of_range const& e) { + Logger::Log(LogLevel::Error, "Port raised out_of_range exception."); + } + return std::nullopt; +} + +[[nodiscard]] static auto ParsePort(std::string const& port) noexcept + -> std::optional<Port> { + try { + auto port_num = std::stoi(port); + return ParsePort(port_num); + } catch (std::invalid_argument const& e) { + Logger::Log(LogLevel::Error, "Port raised invalid_argument exception."); + } + return std::nullopt; +} + +#endif // INCLUDED_SRC_BUILDTOOL_COMMON_PORT_HPP diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index 1d2abb02..cc0fad3a 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -77,6 +77,7 @@ , ["src/buildtool/execution_api/remote", "config"] , ["@", "fmt", "", "fmt"] , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common/remote", "port"] ] } , "bytestream_server": diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp index 62164599..9804c53e 100644 --- a/src/buildtool/execution_api/execution_service/server_implementation.cpp +++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp @@ -23,6 +23,7 @@ #include "grpcpp/grpcpp.h" #include "nlohmann/json.hpp" #include "src/buildtool/auth/authentication.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/execution_service/ac_server.hpp" #include "src/buildtool/execution_api/execution_service/bytestream_server.hpp" diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index 7782a505..234050ce 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -29,6 +29,7 @@ , ["src/buildtool/execution_api/common", "bytestream-common"] , ["src/utils/cpp", "gsl"] , ["src/buildtool/common/remote", "client_common"] + , ["src/buildtool/common/remote", "port"] ] , "proto": [ ["@", "bazel_remote_apis", "", "remote_execution_proto"] @@ -57,6 +58,7 @@ , ["src/buildtool/execution_api/bazel_msg", "blob_tree"] , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] + , ["src/buildtool/common/remote", "port"] ] , "stage": ["src", "buildtool", "execution_api", "remote"] , "private-deps": @@ -71,11 +73,9 @@ , "hdrs": ["config.hpp"] , "srcs": ["config.cpp"] , "deps": - [ ["src/buildtool/logging", "logging"] - , ["src/utils/cpp", "type_safe_arithmetic"] - , ["@", "fmt", "", "fmt"] - , ["@", "gsl", "", "gsl"] + [ ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] + , ["src/buildtool/common/remote", "port"] ] , "stage": ["src", "buildtool", "execution_api", "remote"] } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp index 6d4a1713..b3a62af6 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp @@ -22,6 +22,7 @@ #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index 310fb347..2e2befba 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -22,6 +22,7 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp index 23a7b4d8..6750f054 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp @@ -23,6 +23,7 @@ #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bytestream_client.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp index 7f683132..227757a9 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp @@ -22,6 +22,7 @@ #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" #include "google/longrunning/operations.pb.h" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp index e513b23e..9bd411da 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp @@ -20,6 +20,7 @@ #include <unordered_map> #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp index 087c5667..dd1aa773 100644 --- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp @@ -24,6 +24,7 @@ #include "google/bytestream/bytestream.grpc.pb.h" #include "src/buildtool/common/remote/client_common.hpp" +#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/common/bytestream_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/remote/config.hpp b/src/buildtool/execution_api/remote/config.hpp index 449e9506..e7ad3a57 100644 --- a/src/buildtool/execution_api/remote/config.hpp +++ b/src/buildtool/execution_api/remote/config.hpp @@ -28,38 +28,7 @@ #include <fmt/core.h> #include <nlohmann/json.hpp> -#include "gsl/gsl" -#include "src/buildtool/logging/logger.hpp" -#include "src/utils/cpp/type_safe_arithmetic.hpp" - -// Port -struct PortTag : type_safe_arithmetic_tag<std::uint16_t> {}; -using Port = type_safe_arithmetic<PortTag>; - -[[nodiscard]] static auto ParsePort(int const port_num) noexcept - -> std::optional<Port> { - try { - static constexpr int kMaxPortNumber{ - std::numeric_limits<uint16_t>::max()}; - if (port_num >= 0 and port_num <= kMaxPortNumber) { - return gsl::narrow_cast<Port::value_t>(port_num); - } - } catch (std::out_of_range const& e) { - Logger::Log(LogLevel::Error, "Port raised out_of_range exception."); - } - return std::nullopt; -} - -[[nodiscard]] static auto ParsePort(std::string const& port) noexcept - -> std::optional<Port> { - try { - auto port_num = std::stoi(port); - return ParsePort(port_num); - } catch (std::invalid_argument const& e) { - Logger::Log(LogLevel::Error, "Port raised invalid_argument exception."); - } - return std::nullopt; -} +#include "src/buildtool/common/remote/port.hpp" class RemoteExecutionConfig { public: |