Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

move matchers

Browse Source
pull/36792/head
Mark D. Roth 6 months ago
parent 737649ede8
commit e7fb03d8aa
31 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      CMakeLists.txt
  2. 2
      Makefile
  3. 4
      Package.swift
  4. 8
      build_autogenerated.yaml
  5. 4
      config.m4
  6. 4
      gRPC-C++.podspec
  7. 6
      gRPC-Core.podspec
  8. 4
      grpc.gemspec
  9. 4
      grpc.gyp
  10. 4
      package.xml
  11. 4
      src/core/BUILD
  12. 2
      src/core/ext/filters/rbac/rbac_service_config_parser.cc
  13. 2
      src/core/lib/security/authorization/matchers.h
  14. 2
      src/core/lib/security/authorization/rbac_policy.h
  15. 2
      src/core/lib/security/authorization/rbac_translator.cc
  16. 2
      src/core/lib/security/credentials/xds/xds_credentials.h
  17. 2
      src/core/util/matchers.cc
  18. 6
      src/core/util/matchers.h
  19. 2
      src/core/xds/grpc/xds_certificate_provider.h
  20. 2
      src/core/xds/grpc/xds_cluster.cc
  21. 2
      src/core/xds/grpc/xds_common_types.h
  22. 2
      src/core/xds/grpc/xds_listener.cc
  23. 2
      src/core/xds/grpc/xds_route_config.cc
  24. 2
      src/core/xds/grpc/xds_route_config.h
  25. 2
      src/core/xds/grpc/xds_routing.cc
  26. 2
      src/python/grpcio/grpc_core_dependencies.py
  27. 2
      test/core/matchers/matchers_test.cc
  28. 2
      test/core/xds/xds_common_types_test.cc
  29. 2
      test/core/xds/xds_route_config_resource_type_test.cc
  30. 4
      tools/doxygen/Doxyfile.c++.internal
  31. 4
      tools/doxygen/Doxyfile.core.internal

4
CMakeLists.txt generated
Unescape View File

@ -2392,7 +2392,7 @@ add_library(grpc
src/core/lib/iomgr/wakeup_fd_nospecial.cc
src/core/lib/iomgr/wakeup_fd_pipe.cc
src/core/lib/iomgr/wakeup_fd_posix.cc
src/core/lib/matchers/matchers.cc
src/core/util/matchers.cc
src/core/lib/promise/activity.cc
src/core/lib/promise/party.cc
src/core/lib/promise/sleep.cc
@ -5304,7 +5304,7 @@ add_library(grpc_authorization_provider
src/core/lib/iomgr/wakeup_fd_nospecial.cc
src/core/lib/iomgr/wakeup_fd_pipe.cc
src/core/lib/iomgr/wakeup_fd_posix.cc
src/core/lib/matchers/matchers.cc
src/core/util/matchers.cc
src/core/lib/promise/activity.cc
src/core/lib/promise/party.cc
src/core/lib/promise/trace.cc

2
Makefile generated
Unescape View File

@ -1242,7 +1242,7 @@ LIBGRPC_SRC = \
src/core/lib/iomgr/wakeup_fd_nospecial.cc \
src/core/lib/iomgr/wakeup_fd_pipe.cc \
src/core/lib/iomgr/wakeup_fd_posix.cc \
src/core/lib/matchers/matchers.cc \
src/core/util/matchers.cc \
src/core/lib/promise/activity.cc \
src/core/lib/promise/party.cc \
src/core/lib/promise/sleep.cc \

4
Package.swift generated
Unescape View File

@ -1464,8 +1464,8 @@ let package = Package(
"src/core/lib/iomgr/wakeup_fd_pipe.h",
"src/core/lib/iomgr/wakeup_fd_posix.cc",
"src/core/lib/iomgr/wakeup_fd_posix.h",
"src/core/lib/matchers/matchers.cc",
"src/core/lib/matchers/matchers.h",
"src/core/util/matchers.cc",
"src/core/util/matchers.h",
"src/core/lib/promise/activity.cc",
"src/core/lib/promise/activity.h",
"src/core/lib/promise/all_ok.h",

8
build_autogenerated.yaml generated
Unescape View File

@ -974,7 +974,7 @@ libs:
- src/core/lib/iomgr/vsock.h
- src/core/lib/iomgr/wakeup_fd_pipe.h
- src/core/lib/iomgr/wakeup_fd_posix.h
- src/core/lib/matchers/matchers.h
- src/core/util/matchers.h
- src/core/lib/promise/activity.h
- src/core/lib/promise/all_ok.h
- src/core/lib/promise/arena_promise.h
@ -1808,7 +1808,7 @@ libs:
- src/core/lib/iomgr/wakeup_fd_nospecial.cc
- src/core/lib/iomgr/wakeup_fd_pipe.cc
- src/core/lib/iomgr/wakeup_fd_posix.cc
- src/core/lib/matchers/matchers.cc
- src/core/util/matchers.cc
- src/core/lib/promise/activity.cc
- src/core/lib/promise/party.cc
- src/core/lib/promise/sleep.cc
@ -4610,7 +4610,7 @@ libs:
- src/core/lib/iomgr/vsock.h
- src/core/lib/iomgr/wakeup_fd_pipe.h
- src/core/lib/iomgr/wakeup_fd_posix.h
- src/core/lib/matchers/matchers.h
- src/core/util/matchers.h
- src/core/lib/promise/activity.h
- src/core/lib/promise/all_ok.h
- src/core/lib/promise/arena_promise.h
@ -4935,7 +4935,7 @@ libs:
- src/core/lib/iomgr/wakeup_fd_nospecial.cc
- src/core/lib/iomgr/wakeup_fd_pipe.cc
- src/core/lib/iomgr/wakeup_fd_posix.cc
- src/core/lib/matchers/matchers.cc
- src/core/util/matchers.cc
- src/core/lib/promise/activity.cc
- src/core/lib/promise/party.cc
- src/core/lib/promise/trace.cc

4
config.m4 generated
Unescape View File

@ -617,7 +617,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/iomgr/wakeup_fd_nospecial.cc \
src/core/lib/iomgr/wakeup_fd_pipe.cc \
src/core/lib/iomgr/wakeup_fd_posix.cc \
src/core/lib/matchers/matchers.cc \
src/core/util/matchers.cc \
src/core/lib/promise/activity.cc \
src/core/lib/promise/party.cc \
src/core/lib/promise/sleep.cc \
@ -1536,7 +1536,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/util)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization)

4
gRPC-C++.podspec generated
Unescape View File

@ -1072,7 +1072,7 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/vsock.h',
'src/core/lib/iomgr/wakeup_fd_pipe.h',
'src/core/lib/iomgr/wakeup_fd_posix.h',
'src/core/lib/matchers/matchers.h',
'src/core/util/matchers.h',
'src/core/lib/promise/activity.h',
'src/core/lib/promise/all_ok.h',
'src/core/lib/promise/arena_promise.h',
@ -2347,7 +2347,7 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/vsock.h',
'src/core/lib/iomgr/wakeup_fd_pipe.h',
'src/core/lib/iomgr/wakeup_fd_posix.h',
'src/core/lib/matchers/matchers.h',
'src/core/util/matchers.h',
'src/core/lib/promise/activity.h',
'src/core/lib/promise/all_ok.h',
'src/core/lib/promise/arena_promise.h',

6
gRPC-Core.podspec generated
Unescape View File

@ -1583,8 +1583,8 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/wakeup_fd_pipe.h',
'src/core/lib/iomgr/wakeup_fd_posix.cc',
'src/core/lib/iomgr/wakeup_fd_posix.h',
'src/core/lib/matchers/matchers.cc',
'src/core/lib/matchers/matchers.h',
'src/core/util/matchers.cc',
'src/core/util/matchers.h',
'src/core/lib/promise/activity.cc',
'src/core/lib/promise/activity.h',
'src/core/lib/promise/all_ok.h',
@ -3130,7 +3130,7 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/vsock.h',
'src/core/lib/iomgr/wakeup_fd_pipe.h',
'src/core/lib/iomgr/wakeup_fd_posix.h',
'src/core/lib/matchers/matchers.h',
'src/core/util/matchers.h',
'src/core/lib/promise/activity.h',
'src/core/lib/promise/all_ok.h',
'src/core/lib/promise/arena_promise.h',

4
grpc.gemspec generated
Unescape View File

@ -1470,8 +1470,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h )
s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc )
s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h )
s.files += %w( src/core/lib/matchers/matchers.cc )
s.files += %w( src/core/lib/matchers/matchers.h )
s.files += %w( src/core/util/matchers.cc )
s.files += %w( src/core/util/matchers.h )
s.files += %w( src/core/lib/promise/activity.cc )
s.files += %w( src/core/lib/promise/activity.h )
s.files += %w( src/core/lib/promise/all_ok.h )

4
grpc.gyp
Unescape View File

@ -864,7 +864,7 @@
'src/core/lib/json/json_reader.cc',
'src/core/lib/json/json_util.cc',
'src/core/lib/json/json_writer.cc',
'src/core/lib/matchers/matchers.cc',
'src/core/util/matchers.cc',
'src/core/lib/promise/activity.cc',
'src/core/lib/promise/party.cc',
'src/core/lib/promise/sleep.cc',
@ -2208,7 +2208,7 @@
'src/core/lib/iomgr/wakeup_fd_posix.cc',
'src/core/lib/json/json_reader.cc',
'src/core/lib/json/json_writer.cc',
'src/core/lib/matchers/matchers.cc',
'src/core/util/matchers.cc',
'src/core/lib/promise/activity.cc',
'src/core/lib/promise/party.cc',
'src/core/lib/promise/trace.cc',

4
package.xml generated
Unescape View File

@ -1452,8 +1452,8 @@
<file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/matchers/matchers.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/matchers/matchers.h" role="src" />
<file baseinstalldir="/" name="src/core/util/matchers.cc" role="src" />
<file baseinstalldir="/" name="src/core/util/matchers.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/promise/activity.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/promise/activity.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/promise/all_ok.h" role="src" />

4
src/core/BUILD
Unescape View File

@ -4471,10 +4471,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_matchers",
srcs = [
"lib/matchers/matchers.cc",
"util/matchers.cc",
],
hdrs = [
"lib/matchers/matchers.h",
"util/matchers.h",
],
external_deps = [
"absl/status",

2
src/core/ext/filters/rbac/rbac_service_config_parser.cc
Unescape View File

@ -31,7 +31,7 @@
#include <grpc/grpc_audit_logging.h>
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/lib/security/authorization/audit_logging.h"
#include "src/core/util/json/json_args.h"
#include "src/core/util/json/json_object_loader.h"

2
src/core/lib/security/authorization/matchers.h
Unescape View File

@ -26,7 +26,7 @@
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/lib/security/authorization/evaluate_args.h"
#include "src/core/lib/security/authorization/rbac_policy.h"

2
src/core/lib/security/authorization/rbac_policy.h
Unescape View File

@ -27,7 +27,7 @@
#include <grpc/grpc_audit_logging.h>
#include <grpc/support/port_platform.h>
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
namespace grpc_core {

2
src/core/lib/security/authorization/rbac_translator.cc
Unescape View File

@ -37,7 +37,7 @@
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/lib/security/authorization/audit_logging.h"
#include "src/core/util/json/json.h"
#include "src/core/util/json/json_reader.h"

2
src/core/lib/security/credentials/xds/xds_credentials.h
Unescape View File

@ -36,7 +36,7 @@
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/unique_type_name.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/lib/security/credentials/credentials.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
#include "src/core/lib/security/security_connector/security_connector.h"

2
src/core/lib/matchers/matchers.cc → src/core/util/matchers.cc
Unescape View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include <utility>

6
src/core/lib/matchers/matchers.h → src/core/util/matchers.h
Unescape View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
#define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
#ifndef GRPC_SRC_CORE_UTIL_MATCHERS_H
#define GRPC_SRC_CORE_UTIL_MATCHERS_H
#include <stdint.h>
@ -160,4 +160,4 @@ class HeaderMatcher {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H
#endif // GRPC_SRC_CORE_UTIL_MATCHERS_H

2
src/core/xds/grpc/xds_certificate_provider.h
Unescape View File

@ -34,7 +34,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/gprpp/unique_type_name.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
#include "src/core/util/useful.h"

2
src/core/xds/grpc/xds_cluster.cc
Unescape View File

@ -63,7 +63,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/util/json/json_writer.h"
#include "src/core/xds/grpc/upb_utils.h"

2
src/core/xds/grpc/xds_common_types.h
Unescape View File

@ -31,7 +31,7 @@
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/util/json/json.h"
#include "src/core/xds/xds_client/xds_resource_type.h"

2
src/core/xds/grpc/xds_listener.cc
Unescape View File

@ -54,7 +54,7 @@
#include "src/core/lib/gprpp/match.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_common_types.h"
#include "src/core/xds/xds_client/xds_resource_type.h"

2
src/core/xds/grpc/xds_route_config.cc
Unescape View File

@ -65,7 +65,7 @@
#include "src/core/lib/gprpp/match.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/load_balancing/lb_policy_registry.h"
#include "src/core/util/json/json.h"
#include "src/core/util/json/json_writer.h"

2
src/core/xds/grpc/xds_route_config.h
Unescape View File

@ -38,7 +38,7 @@
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
#include "src/core/xds/grpc/xds_http_filters.h"

2
src/core/xds/grpc/xds_routing.cc
Unescape View File

@ -35,7 +35,7 @@
#include <grpc/support/port_platform.h>
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/xds/grpc/xds_http_filters.h"
namespace grpc_core {

2
src/python/grpcio/grpc_core_dependencies.py generated
Unescape View File

@ -591,7 +591,7 @@ CORE_SOURCE_FILES = [
'src/core/lib/iomgr/wakeup_fd_nospecial.cc',
'src/core/lib/iomgr/wakeup_fd_pipe.cc',
'src/core/lib/iomgr/wakeup_fd_posix.cc',
'src/core/lib/matchers/matchers.cc',
'src/core/util/matchers.cc',
'src/core/lib/promise/activity.cc',
'src/core/lib/promise/party.cc',
'src/core/lib/promise/sleep.cc',

2
test/core/matchers/matchers_test.cc
Unescape View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "absl/status/status.h"
#include "gtest/gtest.h"

2
test/core/xds/xds_common_types_test.cc
Unescape View File

@ -43,7 +43,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/gprpp/validation_errors.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/util/json/json_writer.h"
#include "src/core/xds/grpc/upb_utils.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"

2
test/core/xds/xds_route_config_resource_type_test.cc
Unescape View File

@ -49,7 +49,7 @@
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/matchers/matchers.h"
#include "src/core/util/matchers.h"
#include "src/core/util/json/json_writer.h"
#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
#include "src/core/xds/grpc/xds_route_config.h"

4
tools/doxygen/Doxyfile.c++.internal generated
Unescape View File

@ -2469,8 +2469,8 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \
src/core/lib/iomgr/wakeup_fd_pipe.h \
src/core/lib/iomgr/wakeup_fd_posix.cc \
src/core/lib/iomgr/wakeup_fd_posix.h \
src/core/lib/matchers/matchers.cc \
src/core/lib/matchers/matchers.h \
src/core/util/matchers.cc \
src/core/util/matchers.h \
src/core/lib/promise/activity.cc \
src/core/lib/promise/activity.h \
src/core/lib/promise/all_ok.h \

4
tools/doxygen/Doxyfile.core.internal generated
Unescape View File

@ -2243,8 +2243,8 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \
src/core/lib/iomgr/wakeup_fd_pipe.h \
src/core/lib/iomgr/wakeup_fd_posix.cc \
src/core/lib/iomgr/wakeup_fd_posix.h \
src/core/lib/matchers/matchers.cc \
src/core/lib/matchers/matchers.h \
src/core/util/matchers.cc \
src/core/util/matchers.h \
src/core/lib/promise/activity.cc \
src/core/lib/promise/activity.h \
src/core/lib/promise/all_ok.h \

Write Preview
Loading…
Cancel
Save