From 3f7a31f868586cb5b815cf566e0fa59708c4c4ef Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Fri, 29 Oct 2021 10:12:38 -0700 Subject: [PATCH] rls: sync latest rls protos from grpc-proto (#8638) --- rls/src/main/proto/grpc/lookup/v1/rls.proto | 13 +++++-------- rls/src/main/proto/grpc/lookup/v1/rls_config.proto | 7 +++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rls/src/main/proto/grpc/lookup/v1/rls.proto b/rls/src/main/proto/grpc/lookup/v1/rls.proto index d9dd6c246f24..7d1735289d56 100644 --- a/rls/src/main/proto/grpc/lookup/v1/rls.proto +++ b/rls/src/main/proto/grpc/lookup/v1/rls.proto @@ -22,14 +22,6 @@ option java_package = "io.grpc.lookup.v1"; option java_outer_classname = "RlsProto"; message RouteLookupRequest { - // Full host name of the target server, e.g. firestore.googleapis.com. - // Only set for gRPC requests; HTTP requests must use key_map explicitly. - // Deprecated in favor of setting key_map keys with GrpcKeyBuilder.extra_keys. - string server = 1 [deprecated = true]; - // Full path of the request, i.e. "/service/method". - // Only set for gRPC requests; HTTP requests must use key_map explicitly. - // Deprecated in favor of setting key_map keys with GrpcKeyBuilder.extra_keys. - string path = 2 [deprecated = true]; // Target type allows the client to specify what kind of target format it // would like from RLS to allow it to find the regional server, e.g. "grpc". string target_type = 3; @@ -41,8 +33,13 @@ message RouteLookupRequest { } // Reason for making this request. Reason reason = 5; + // For REASON_STALE, the header_data from the stale response, if any. + string stale_header_data = 6; // Map of key values extracted via key builders for the gRPC or HTTP request. map key_map = 4; + + reserved 1, 2; + reserved "server", "path"; } message RouteLookupResponse { diff --git a/rls/src/main/proto/grpc/lookup/v1/rls_config.proto b/rls/src/main/proto/grpc/lookup/v1/rls_config.proto index db99a8949ea9..9d2b6c54cfb4 100644 --- a/rls/src/main/proto/grpc/lookup/v1/rls_config.proto +++ b/rls/src/main/proto/grpc/lookup/v1/rls_config.proto @@ -216,3 +216,10 @@ message RouteLookupConfig { reserved 10; reserved "request_processing_strategy"; } + +// RouteLookupClusterSpecifier is used in xDS to represent a cluster specifier +// plugin for RLS. +message RouteLookupClusterSpecifier { + // The RLS config for this cluster specifier plugin instance. + RouteLookupConfig route_lookup_config = 1; +}