Skip to content

Commit

Permalink
Revert "xDS: Add support for RBAC HTTP filter (grpc#28309)" (grpc#28441)
Browse files Browse the repository at this point in the history
This reverts commit 6ea8214.
  • Loading branch information
ctiller authored Dec 28, 2021
1 parent e8c790d commit 7aae5c6
Show file tree
Hide file tree
Showing 62 changed files with 148 additions and 5,647 deletions.
36 changes: 0 additions & 36 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2414,27 +2414,6 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "grpc_rbac_filter",
srcs = [
"src/core/ext/filters/rbac/rbac_filter.cc",
"src/core/ext/filters/rbac/rbac_service_config_parser.cc",
],
hdrs = [
"src/core/ext/filters/rbac/rbac_filter.h",
"src/core/ext/filters/rbac/rbac_service_config_parser.h",
],
external_deps = ["absl/strings:str_format"],
language = "c++",
deps = [
"gpr_base",
"grpc_base",
"grpc_rbac_engine",
"grpc_service_config",
"json_util",
],
)

grpc_cc_library(
name = "grpc_http_filters",
srcs = [
Expand Down Expand Up @@ -2637,7 +2616,6 @@ grpc_cc_library(
"src/core/ext/xds/xds_endpoint.cc",
"src/core/ext/xds/xds_http_fault_filter.cc",
"src/core/ext/xds/xds_http_filters.cc",
"src/core/ext/xds/xds_http_rbac_filter.cc",
"src/core/ext/xds/xds_listener.cc",
"src/core/ext/xds/xds_resource_type.cc",
"src/core/ext/xds/xds_route_config.cc",
Expand All @@ -2661,7 +2639,6 @@ grpc_cc_library(
"src/core/ext/xds/xds_endpoint.h",
"src/core/ext/xds/xds_http_fault_filter.h",
"src/core/ext/xds/xds_http_filters.h",
"src/core/ext/xds/xds_http_rbac_filter.h",
"src/core/ext/xds/xds_listener.h",
"src/core/ext/xds/xds_resource_type.h",
"src/core/ext/xds/xds_resource_type_impl.h",
Expand Down Expand Up @@ -2699,7 +2676,6 @@ grpc_cc_library(
"grpc_fault_injection_filter",
"grpc_lb_xds_channel_args",
"grpc_matchers",
"grpc_rbac_filter",
"grpc_secure",
"grpc_transport_chttp2_client_secure",
"json",
Expand Down Expand Up @@ -4454,7 +4430,6 @@ grpc_cc_library(
"src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c",
"src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c",
"src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c",
"src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c",
"src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c",
"src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c",
"src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c",
Expand Down Expand Up @@ -4500,7 +4475,6 @@ grpc_cc_library(
"src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h",
"src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h",
"src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h",
"src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h",
"src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h",
"src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h",
"src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h",
Expand Down Expand Up @@ -4564,15 +4538,13 @@ grpc_cc_library(
"src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c",
"src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c",
Expand Down Expand Up @@ -4610,15 +4582,13 @@ grpc_cc_library(
"src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h",
"src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h",
Expand Down Expand Up @@ -4650,7 +4620,6 @@ grpc_cc_library(
"envoy_core_upbdefs",
"envoy_type_upbdefs",
"google_api_annotations_upbdefs",
"google_api_expr_upbdefs",
"google_rpc_status_upbdefs",
"proto_gen_validate_upbdefs",
"protobuf_any_upbdefs",
Expand Down Expand Up @@ -5213,11 +5182,6 @@ grpc_upb_proto_library(
deps = ["@com_google_googleapis//google/api/expr/v1alpha1:expr_proto"],
)

grpc_upb_proto_reflection_library(
name = "google_api_expr_upbdefs",
deps = ["@com_google_googleapis//google/api/expr/v1alpha1:expr_proto"],
)

grpc_upb_proto_library(
name = "google_rpc_status_upb",
deps = ["@com_google_googleapis//google/rpc:status_proto"],
Expand Down
Loading

0 comments on commit 7aae5c6

Please sign in to comment.