diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-23 15:33:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 15:33:27 +0100 |
commit | dde804c2ca2218b1abc7fd19f2e89724e63144d4 (patch) | |
tree | afae4751ecb889e652b95579bbda6b235add762b | |
parent | f66f816102ce0a7c3aaba72d1db61a83157259ed (diff) | |
parent | 49296da90eadf40fe60b74b83aa8f86daa5ac80a (diff) |
Merge pull request #26154 from vespa-engine/vekterli/consolidate-capability-set-naming
Consolidate capability set naming between C++ and Java
3 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp index 0bf04289a65..ed133f9ffe8 100644 --- a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp +++ b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp @@ -124,7 +124,7 @@ TEST("All known capability sets can be looked up by name") { check_capability_set_mapping("vespa.telemetry", CapabilitySet::telemetry()); check_capability_set_mapping("vespa.cluster_controller_node", CapabilitySet::cluster_controller_node()); check_capability_set_mapping("vespa.logserver_node", CapabilitySet::logserver_node()); - check_capability_set_mapping("vespa.config_server", CapabilitySet::config_server()); + check_capability_set_mapping("vespa.config_server_node", CapabilitySet::config_server_node()); } TEST("Unknown capability set name returns nullopt") { diff --git a/vespalib/src/vespa/vespalib/net/tls/capability_set.cpp b/vespalib/src/vespa/vespalib/net/tls/capability_set.cpp index 1b879f0c635..b17cf1ba851 100644 --- a/vespalib/src/vespa/vespalib/net/tls/capability_set.cpp +++ b/vespalib/src/vespa/vespalib/net/tls/capability_set.cpp @@ -32,7 +32,7 @@ std::optional<CapabilitySet> CapabilitySet::find_capability_set(const string& ca {"vespa.telemetry", telemetry()}, {"vespa.cluster_controller_node", cluster_controller_node()}, {"vespa.logserver_node", logserver_node()}, - {"vespa.config_server", config_server()} + {"vespa.config_server_node", config_server_node()} }); auto iter = name_to_cap_set.find(cap_set_name); return (iter != name_to_cap_set.end()) ? std::optional<CapabilitySet>(iter->second) : std::nullopt; @@ -89,7 +89,7 @@ CapabilitySet CapabilitySet::logserver_node() noexcept { return shared_app_node_capabilities(); } -CapabilitySet CapabilitySet::config_server() noexcept { +CapabilitySet CapabilitySet::config_server_node() noexcept { return CapabilitySet::of({Capability::client_filereceiver_api(), Capability::container_management_api(), Capability::slobrok_api(), diff --git a/vespalib/src/vespa/vespalib/net/tls/capability_set.h b/vespalib/src/vespa/vespalib/net/tls/capability_set.h index 8aad28a4162..0811739217e 100644 --- a/vespalib/src/vespa/vespalib/net/tls/capability_set.h +++ b/vespalib/src/vespa/vespalib/net/tls/capability_set.h @@ -111,7 +111,7 @@ public: [[nodiscard]] static CapabilitySet telemetry() noexcept; [[nodiscard]] static CapabilitySet cluster_controller_node() noexcept; [[nodiscard]] static CapabilitySet logserver_node() noexcept; - [[nodiscard]] static CapabilitySet config_server() noexcept; + [[nodiscard]] static CapabilitySet config_server_node() noexcept; [[nodiscard]] static CapabilitySet make_with_all_capabilities() noexcept; [[nodiscard]] static constexpr CapabilitySet make_empty() noexcept { return {}; }; |