diff options
author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-08-23 12:25:59 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-08-23 12:31:55 +0000 |
commit | 44980f2e321659a88fb394e7e83fcd2f6b8cb430 (patch) | |
tree | cf84ab917d634fa94c18c5321eef29c425c24769 /storage | |
parent | 04de88eab172f4d178a973c4b2303d46af6876ee (diff) |
Add factory functions for creating capability requirement filters
Refactor existing request access filter creation to use these.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp | 4 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp index bb69c0a8641..488c9dfa346 100644 --- a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp @@ -36,9 +36,7 @@ void ClusterControllerApiRpcService::close() { namespace { std::unique_ptr<FRT_RequireCapabilities> make_cc_api_capability_filter() { - return std::make_unique<FRT_RequireCapabilities>(vespalib::net::tls::CapabilitySet::of({ - vespalib::net::tls::Capability::content_cluster_controller_internal_state_api() - })); + return FRT_RequireCapabilities::of(vespalib::net::tls::Capability::content_cluster_controller_internal_state_api()); } } diff --git a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp index 41dcafc055a..bcb5dbab279 100644 --- a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp @@ -55,9 +55,7 @@ StorageApiRpcService::Params::~Params() = default; void StorageApiRpcService::register_server_methods(SharedRpcResources& rpc_resources) { FRT_ReflectionBuilder rb(&rpc_resources.supervisor()); rb.DefineMethod(rpc_v1_method_name(), "bixbix", "bixbix", FRT_METHOD(StorageApiRpcService::RPC_rpc_v1_send), this); - rb.RequestAccessFilter(std::make_unique<FRT_RequireCapabilities>(vespalib::net::tls::CapabilitySet::of({ - vespalib::net::tls::Capability::content_storage_api() - }))); + rb.RequestAccessFilter(FRT_RequireCapabilities::of(vespalib::net::tls::Capability::content_storage_api())); rb.MethodDesc("V1 of StorageAPI direct RPC protocol"); rb.ParamDesc("header_encoding", "0=raw, 6=lz4"); rb.ParamDesc("header_decoded_size", "Uncompressed header blob size"); |