From 1ec0559b341e8a55893afddead8a7c2d409b9701 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 11 Jan 2024 00:04:55 -0800 Subject: [PATCH] [call-v3] Move `GrpcServerAuthzFilter` to new style registration (#35502) Closes #35502 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35502 from ctiller:tpl3 17da58ad37ac99b511078746954bfc5912298caa PiperOrigin-RevId: 597467779 --- .../lib/security/authorization/grpc_server_authz_filter.cc | 2 +- src/core/lib/security/authorization/grpc_server_authz_filter.h | 2 +- src/core/lib/surface/init.cc | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc index 8e7f4fa3977..0834c43889f 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc @@ -118,7 +118,7 @@ absl::Status GrpcServerAuthzFilter::Call::OnClientInitialMetadata( return absl::OkStatus(); } -const grpc_channel_filter GrpcServerAuthzFilter::kFilterVtable = +const grpc_channel_filter GrpcServerAuthzFilter::kFilter = MakePromiseBasedFilter( "grpc-server-authz"); diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index e4727f1f789..c5d7a675659 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -37,7 +37,7 @@ namespace grpc_core { class GrpcServerAuthzFilter final : public ImplementChannelFilter { public: - static const grpc_channel_filter kFilterVtable; + static const grpc_channel_filter kFilter; static absl::StatusOr Create(const ChannelArgs& args, ChannelFilter::Args); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 2c2b566cd46..eb09119ee1d 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -82,8 +82,7 @@ void RegisterSecurityFilters(CoreConfiguration::Builder* builder) { .IfHasChannelArg(GRPC_SERVER_CREDENTIALS_ARG); } builder->channel_init() - ->RegisterFilter(GRPC_SERVER_CHANNEL, - &GrpcServerAuthzFilter::kFilterVtable) + ->RegisterFilter(GRPC_SERVER_CHANNEL) .IfHasChannelArg(GRPC_ARG_AUTHORIZATION_POLICY_PROVIDER) .After() .After();