From d381b433ad1bde8b6dbdd57f848d24cdb6a951e9 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Mon, 18 Mar 2019 15:39:40 +0000 Subject: [PATCH] ratelimit: remove deprecated rate limit config from bootstrap (#6300) Signed-off-by: Rama Chavali Mirrored from https://github.com/envoyproxy/envoy @ 75d360834537bef27cdd8cc43e1f8873b9790b70 --- envoy/config/bootstrap/v2/bootstrap.proto | 5 +---- envoy/config/filter/http/rate_limit/v2/rate_limit.proto | 5 ++--- envoy/config/filter/network/rate_limit/v2/rate_limit.proto | 5 ++--- .../filter/thrift/rate_limit/v2alpha1/rate_limit.proto | 5 ++--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/envoy/config/bootstrap/v2/bootstrap.proto b/envoy/config/bootstrap/v2/bootstrap.proto index 5bf09feb..addcd972 100644 --- a/envoy/config/bootstrap/v2/bootstrap.proto +++ b/envoy/config/bootstrap/v2/bootstrap.proto @@ -108,10 +108,7 @@ message Bootstrap { // tracing will be performed. envoy.config.trace.v2.Tracing tracing = 9; - // Configuration for an external rate limit service provider. If not - // specified, any calls to the rate limit service will immediately return - // success. - envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 10 [deprecated = true]; + reserved 10; // Configuration for the runtime configuration provider. If not specified, a // “null” provider will be used which will result in all defaults being used. diff --git a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto index e9ea6fbb..9d93e4a2 100644 --- a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto @@ -55,7 +55,6 @@ message RateLimit { // Configuration for an external rate limit service provider. If not // specified, any calls to the rate limit service will immediately return // success. - // [#comment:TODO(ramaraochavali): Make this required as part of cleanup of deprecated ratelimit - // service config in bootstrap.] - envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 7; + envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 7 + [(validate.rules).message.required = true]; } diff --git a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto index 0ceab0eb..6a1b7955 100644 --- a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto @@ -42,7 +42,6 @@ message RateLimit { // Configuration for an external rate limit service provider. If not // specified, any calls to the rate limit service will immediately return // success. - // [#comment:TODO(ramaraochavali): Make this required as part of cleanup of deprecated ratelimit - // service config in bootstrap.] - envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 6; + envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 6 + [(validate.rules).message.required = true]; } diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto index 7b4db2ae..15a50d55 100644 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto @@ -46,7 +46,6 @@ message RateLimit { // Configuration for an external rate limit service provider. If not // specified, any calls to the rate limit service will immediately return // success. - // [#comment:TODO(ramaraochavali): Make this required as part of cleanup of deprecated ratelimit - // service config in bootstrap.] - envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 5; + envoy.config.ratelimit.v2.RateLimitServiceConfig rate_limit_service = 5 + [(validate.rules).message.required = true]; }