Skip to content

Commit 1498324

Browse files
committed
refactor grpc: move aip-161 field-mask implementation to a library
Tests: CI commit_hash:1b60e710acda670278997d4f172c4097c5e6a5bf
1 parent eadd6d5 commit 1498324

File tree

17 files changed

+3
-2005
lines changed

17 files changed

+3
-2005
lines changed

.mapping.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,6 @@
19401940
"grpc/include/userver/ugrpc/client/response_future.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/response_future.hpp",
19411941
"grpc/include/userver/ugrpc/client/rpc.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/rpc.hpp",
19421942
"grpc/include/userver/ugrpc/client/simple_client_component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/simple_client_component.hpp",
1943-
"grpc/include/userver/ugrpc/field_mask.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/field_mask.hpp",
19441943
"grpc/include/userver/ugrpc/impl/async_method_invocation.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/async_method_invocation.hpp",
19451944
"grpc/include/userver/ugrpc/impl/code_statistics.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/code_statistics.hpp",
19461945
"grpc/include/userver/ugrpc/impl/completion_queue_pool_base.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/completion_queue_pool_base.hpp",
@@ -1983,7 +1982,6 @@
19831982
"grpc/include/userver/ugrpc/server/middlewares/congestion_control/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/congestion_control/component.hpp",
19841983
"grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp",
19851984
"grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/middleware.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/middleware.hpp",
1986-
"grpc/include/userver/ugrpc/server/middlewares/field_mask/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/field_mask/component.hpp",
19871985
"grpc/include/userver/ugrpc/server/middlewares/fwd.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/fwd.hpp",
19881986
"grpc/include/userver/ugrpc/server/middlewares/groups.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/groups.hpp",
19891987
"grpc/include/userver/ugrpc/server/middlewares/headers_propagator/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/headers_propagator/component.hpp",
@@ -2044,7 +2042,6 @@
20442042
"grpc/src/ugrpc/client/rpc.cpp":"taxi/uservices/userver/grpc/src/ugrpc/client/rpc.cpp",
20452043
"grpc/src/ugrpc/client/secdist.hpp":"taxi/uservices/userver/grpc/src/ugrpc/client/secdist.hpp",
20462044
"grpc/src/ugrpc/client/simple_client_component.cpp":"taxi/uservices/userver/grpc/src/ugrpc/client/simple_client_component.cpp",
2047-
"grpc/src/ugrpc/field_mask.cpp":"taxi/uservices/userver/grpc/src/ugrpc/field_mask.cpp",
20482045
"grpc/src/ugrpc/impl/async_method_invocation.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/async_method_invocation.cpp",
20492046
"grpc/src/ugrpc/impl/code_statistics.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/code_statistics.cpp",
20502047
"grpc/src/ugrpc/impl/completion_queue_pool_base.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/completion_queue_pool_base.cpp",
@@ -2100,9 +2097,6 @@
21002097
"grpc/src/ugrpc/server/middlewares/congestion_control/middleware.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/congestion_control/middleware.cpp",
21012098
"grpc/src/ugrpc/server/middlewares/congestion_control/middleware.hpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/congestion_control/middleware.hpp",
21022099
"grpc/src/ugrpc/server/middlewares/deadline_propagation/middleware.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/deadline_propagation/middleware.cpp",
2103-
"grpc/src/ugrpc/server/middlewares/field_mask/component.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/field_mask/component.cpp",
2104-
"grpc/src/ugrpc/server/middlewares/field_mask/middleware.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/field_mask/middleware.cpp",
2105-
"grpc/src/ugrpc/server/middlewares/field_mask/middleware.hpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/field_mask/middleware.hpp",
21062100
"grpc/src/ugrpc/server/middlewares/headers_propagator/component.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/headers_propagator/component.cpp",
21072101
"grpc/src/ugrpc/server/middlewares/headers_propagator/middleware.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/headers_propagator/middleware.cpp",
21082102
"grpc/src/ugrpc/server/middlewares/headers_propagator/middleware.hpp":"taxi/uservices/userver/grpc/src/ugrpc/server/middlewares/headers_propagator/middleware.hpp",
@@ -2130,8 +2124,6 @@
21302124
"grpc/tests/deadline_test.cpp":"taxi/uservices/userver/grpc/tests/deadline_test.cpp",
21312125
"grpc/tests/dump_protobuf_test.cpp":"taxi/uservices/userver/grpc/tests/dump_protobuf_test.cpp",
21322126
"grpc/tests/error_test.cpp":"taxi/uservices/userver/grpc/tests/error_test.cpp",
2133-
"grpc/tests/field_mask_middleware_test.cpp":"taxi/uservices/userver/grpc/tests/field_mask_middleware_test.cpp",
2134-
"grpc/tests/field_mask_test.cpp":"taxi/uservices/userver/grpc/tests/field_mask_test.cpp",
21352127
"grpc/tests/generic_client_test.cpp":"taxi/uservices/userver/grpc/tests/generic_client_test.cpp",
21362128
"grpc/tests/generic_server_test.cpp":"taxi/uservices/userver/grpc/tests/generic_server_test.cpp",
21372129
"grpc/tests/logging_test.cpp":"taxi/uservices/userver/grpc/tests/logging_test.cpp",

grpc/functional_tests/basic_chaos/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <userver/ugrpc/client/middlewares/deadline_propagation/component.hpp>
1212
#include <userver/ugrpc/client/middlewares/log/component.hpp>
1313
#include <userver/ugrpc/server/component_list.hpp>
14-
#include <userver/ugrpc/server/middlewares/field_mask/component.hpp>
1514
#include <userver/utils/daemon_run.hpp>
1615

1716
#include "handler.hpp"
@@ -21,7 +20,6 @@ int main(int argc, char* argv[]) {
2120
const auto component_list = components::MinimalServerComponentList()
2221
.Append<components::TestsuiteSupport>()
2322
.AppendComponentList(ugrpc::server::DefaultComponentList())
24-
.Append<ugrpc::server::middlewares::field_mask::Component>()
2523
.Append<ugrpc::client::middlewares::baggage::Component>()
2624
.Append<ugrpc::client::middlewares::log::Component>()
2725
.Append<ugrpc::client::middlewares::deadline_propagation::Component>()

grpc/functional_tests/basic_chaos/static_config.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,10 @@ components_manager:
3737
# Nothing
3838
# /// [Sample grpc server congestion control middleware component config]
3939

40-
# /// [Sample grpc server field-mask middleware component config]
41-
grpc-server-field-mask:
42-
metadata-field-name: field-mask
43-
# /// [Sample grpc server field-mask middleware component config]
44-
4540
grpc-server-middlewares-pipeline:
4641
middlewares:
4742
grpc-server-headers-propagator:
4843
enabled: false
49-
grpc-server-field-mask:
50-
enabled: false
5144
grpc-server-deadline-propagation:
5245
enabled: false
5346

grpc/include/userver/ugrpc/field_mask.hpp

Lines changed: 0 additions & 135 deletions
This file was deleted.

grpc/include/userver/ugrpc/server/middlewares/field_mask/component.hpp

Lines changed: 0 additions & 76 deletions
This file was deleted.

grpc/include/userver/ugrpc/server/middlewares/groups.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ struct PostCore final {
5454
///
5555
/// @details There are:
5656
/// * ugrpc::server::middlewares::baggage::Component
57-
/// * ugrpc::server::middlewares::field_mask::Component
5857
/// * ugrpc::server::middlewares::headers_propagator::Component
5958
struct User final {
6059
static constexpr std::string_view kName = "user";

0 commit comments

Comments
 (0)