From 8a577f9f9b52df390a8ef68ca27551bd503329cb Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 27 Oct 2020 01:31:13 +0530 Subject: [PATCH 01/32] v2 packages to v3 Signed-off-by: Abhay Narayan Katare --- .../filters/thrift/router/v3/router.proto | 17 ++++++++++++++ .../health_checker/redis/v3/redis.proto | 22 +++++++++++++++++++ .../fixed_heap/v3/fixed_heap.proto | 21 ++++++++++++++++++ .../v3/injected_resource.proto | 22 +++++++++++++++++++ .../v3/omit_canary_hosts.proto | 16 ++++++++++++++ .../previous_hosts/v3/previous_hosts.proto | 16 ++++++++++++++ 6 files changed, 114 insertions(+) create mode 100644 api/envoy/extensions/filters/thrift/router/v3/router.proto create mode 100644 api/envoy/extensions/health_checker/redis/v3/redis.proto create mode 100644 api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto create mode 100644 api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto create mode 100644 api/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto create mode 100644 api/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto diff --git a/api/envoy/extensions/filters/thrift/router/v3/router.proto b/api/envoy/extensions/filters/thrift/router/v3/router.proto new file mode 100644 index 0000000000000..33841a74d295e --- /dev/null +++ b/api/envoy/extensions/filters/thrift/router/v3/router.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +package envoy.extensions.filter.thrift.router.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; +option java_outer_classname = "RouterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Router] +// Thrift router :ref:`configuration overview `. +// [#extension: envoy.filters.thrift.router] + +message Router { +} diff --git a/api/envoy/extensions/health_checker/redis/v3/redis.proto b/api/envoy/extensions/health_checker/redis/v3/redis.proto new file mode 100644 index 0000000000000..44518e2e67f39 --- /dev/null +++ b/api/envoy/extensions/health_checker/redis/v3/redis.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.extensions.health_checker.redis.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.health_checker.redis.v3"; +option java_outer_classname = "RedisProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Redis] +// Redis health checker :ref:`configuration overview `. +// [#extension: envoy.health_checkers.redis] + +message Redis { + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value + // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other + // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance + // by setting the specified key to any value and waiting for traffic to drain. + string key = 1; +} diff --git a/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto b/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto new file mode 100644 index 0000000000000..214610550de39 --- /dev/null +++ b/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +package envoy.extensions.resource_monitor.fixed_heap.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; +option java_outer_classname = "FixedHeapProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Fixed heap] +// [#extension: envoy.resource_monitors.fixed_heap] + +// The fixed heap resource monitor reports the Envoy process memory pressure, computed as a +// fraction of currently reserved heap memory divided by a statically configured maximum +// specified in the FixedHeapConfig. +message FixedHeapConfig { + uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; +} diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto new file mode 100644 index 0000000000000..2a00cf8e0c822 --- /dev/null +++ b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.extensions.resource_monitor.injected_resource.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; +option java_outer_classname = "InjectedResourceProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Injected resource] +// [#extension: envoy.resource_monitors.injected_resource] + +// The injected resource monitor allows injecting a synthetic resource pressure into Envoy +// via a text file, which must contain a floating-point number in the range [0..1] representing +// the resource pressure and be updated atomically by a symbolic link swap. +// This is intended primarily for integration tests to force Envoy into an overloaded state. +message InjectedResourceConfig { + string filename = 1 [(validate.rules).string = {min_bytes: 1}]; +} diff --git a/api/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto new file mode 100644 index 0000000000000..b6cf1dee86fda --- /dev/null +++ b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.extensions.retry.host.omit_canary_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.retry.host.omit_canary_hosts.v3"; +option java_outer_classname = "OmitCanaryHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Omit Canary Hosts Predicate] +// [#extension: envoy.retry_host_predicates.omit_canary_hosts] + +message OmitCanaryHostsPredicate { +} diff --git a/api/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto b/api/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto new file mode 100644 index 0000000000000..fe31b9e305c6d --- /dev/null +++ b/api/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.extensions.retry.host.previous_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.retry.host.previous_hosts.v3"; +option java_outer_classname = "PreviousHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Previous Hosts Predicate] +// [#extension: envoy.retry_host_predicates.previous_hosts] + +message PreviousHostsPredicate { +} From 6f8f28962a9d4845ad1f905b8da622cabec5057b Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 29 Oct 2020 13:00:18 +0530 Subject: [PATCH 02/32] Fixing bug 12841 Signed-off-by: Abhay Narayan Katare --- api/BUILD | 6 ++++++ .../filters/thrift/router/v3/router.proto | 17 ----------------- .../extensions/health_checker/redis/v3/BUILD | 9 +++++++++ .../resource_monitor/fixed_heap/v3/BUILD | 9 +++++++++ .../fixed_heap/v3/fixed_heap.proto | 2 +- .../resource_monitor/injected_resource/v3/BUILD | 9 +++++++++ .../v3/injected_resource.proto | 2 +- .../retry/host/omit_canary_hosts/v3/BUILD | 9 +++++++++ .../retry/host/previous_hosts/v3/BUILD | 9 +++++++++ api/versioning/BUILD | 6 ++++++ 10 files changed, 59 insertions(+), 19 deletions(-) delete mode 100644 api/envoy/extensions/filters/thrift/router/v3/router.proto create mode 100644 api/envoy/extensions/health_checker/redis/v3/BUILD create mode 100644 api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD create mode 100644 api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD create mode 100644 api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD create mode 100644 api/envoy/extensions/retry/host/previous_hosts/v3/BUILD diff --git a/api/BUILD b/api/BUILD index 345732128a0d2..f296e53838077 100644 --- a/api/BUILD +++ b/api/BUILD @@ -164,6 +164,7 @@ proto_library( "//envoy/extensions/common/tap/v3:pkg", "//envoy/extensions/compression/gzip/compressor/v3:pkg", "//envoy/extensions/compression/gzip/decompressor/v3:pkg", + "//envoy/extensions/filter/thrift/router/v3:pkg", "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", @@ -231,11 +232,16 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", + "//envoy/extensions/health_checker/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", + "//envoy/extensions/resource_monitor/fixed_heap/v3:pkg", + "//envoy/extensions/resource_monitor/injected_resource/v3:pkg", + "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", + "//envoy/extensions/retry/host/previous_hosts/v3:pkg", "//envoy/extensions/retry/priority/previous_priorities/v3:pkg", "//envoy/extensions/stat_sinks/wasm/v3:pkg", "//envoy/extensions/transport_sockets/alts/v3:pkg", diff --git a/api/envoy/extensions/filters/thrift/router/v3/router.proto b/api/envoy/extensions/filters/thrift/router/v3/router.proto deleted file mode 100644 index 33841a74d295e..0000000000000 --- a/api/envoy/extensions/filters/thrift/router/v3/router.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.filter.thrift.router.v3; - -import "udpa/annotations/status.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; -option java_outer_classname = "RouterProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Router] -// Thrift router :ref:`configuration overview `. -// [#extension: envoy.filters.thrift.router] - -message Router { -} diff --git a/api/envoy/extensions/health_checker/redis/v3/BUILD b/api/envoy/extensions/health_checker/redis/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/health_checker/redis/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD b/api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto b/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto index 214610550de39..e4865d348b972 100644 --- a/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto +++ b/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -5,7 +5,7 @@ package envoy.extensions.resource_monitor.fixed_heap.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD b/api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto index 2a00cf8e0c822..13a7a2ab4edff 100644 --- a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto @@ -5,7 +5,7 @@ package envoy.extensions.resource_monitor.injected_resource.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.injected_resource.v3"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD b/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 2e0a1cd4997d7..c521064b4281e 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -47,6 +47,7 @@ proto_library( "//envoy/extensions/common/tap/v3:pkg", "//envoy/extensions/compression/gzip/compressor/v3:pkg", "//envoy/extensions/compression/gzip/decompressor/v3:pkg", + "//envoy/extensions/filter/thrift/router/v3:pkg", "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", @@ -114,11 +115,16 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", + "//envoy/extensions/health_checker/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", + "//envoy/extensions/resource_monitor/fixed_heap/v3:pkg", + "//envoy/extensions/resource_monitor/injected_resource/v3:pkg", + "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", + "//envoy/extensions/retry/host/previous_hosts/v3:pkg", "//envoy/extensions/retry/priority/previous_priorities/v3:pkg", "//envoy/extensions/stat_sinks/wasm/v3:pkg", "//envoy/extensions/transport_sockets/alts/v3:pkg", From 57df902610692c169ec69b306b75bdd35b125367 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 29 Oct 2020 23:27:06 +0530 Subject: [PATCH 03/32] fixing format issues in build Signed-off-by: Abhay Narayan Katare --- .../extensions/filter/thrift/router/v3/BUILD | 9 ++++++++ .../filter/thrift/router/v3/router.proto | 17 ++++++++++++++ .../v3/injected_resource.proto | 2 +- .../extensions/filter/thrift/router/v3/BUILD | 9 ++++++++ .../filter/thrift/router/v3/router.proto | 17 ++++++++++++++ .../extensions/health_checker/redis/v3/BUILD | 9 ++++++++ .../health_checker/redis/v3/redis.proto | 22 +++++++++++++++++++ .../resource_monitor/fixed_heap/v3/BUILD | 9 ++++++++ .../fixed_heap/v3/fixed_heap.proto | 21 ++++++++++++++++++ .../injected_resource/v3/BUILD | 9 ++++++++ .../v3/injected_resource.proto | 22 +++++++++++++++++++ .../retry/host/omit_canary_hosts/v3/BUILD | 9 ++++++++ .../v3/omit_canary_hosts.proto | 16 ++++++++++++++ .../retry/host/previous_hosts/v3/BUILD | 9 ++++++++ .../previous_hosts/v3/previous_hosts.proto | 16 ++++++++++++++ 15 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 api/envoy/extensions/filter/thrift/router/v3/BUILD create mode 100644 api/envoy/extensions/filter/thrift/router/v3/router.proto create mode 100644 generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto create mode 100644 generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto create mode 100644 generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto create mode 100644 generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto create mode 100644 generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto create mode 100644 generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/BUILD create mode 100644 generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto diff --git a/api/envoy/extensions/filter/thrift/router/v3/BUILD b/api/envoy/extensions/filter/thrift/router/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/filter/thrift/router/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/filter/thrift/router/v3/router.proto b/api/envoy/extensions/filter/thrift/router/v3/router.proto new file mode 100644 index 0000000000000..33841a74d295e --- /dev/null +++ b/api/envoy/extensions/filter/thrift/router/v3/router.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +package envoy.extensions.filter.thrift.router.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; +option java_outer_classname = "RouterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Router] +// Thrift router :ref:`configuration overview `. +// [#extension: envoy.filters.thrift.router] + +message Router { +} diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto index 13a7a2ab4edff..436948fbc2e03 100644 --- a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto @@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_bytes: 1}]; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto new file mode 100644 index 0000000000000..33841a74d295e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; + +package envoy.extensions.filter.thrift.router.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; +option java_outer_classname = "RouterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Router] +// Thrift router :ref:`configuration overview `. +// [#extension: envoy.filters.thrift.router] + +message Router { +} diff --git a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD b/generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto b/generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto new file mode 100644 index 0000000000000..44518e2e67f39 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.extensions.health_checker.redis.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.health_checker.redis.v3"; +option java_outer_classname = "RedisProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Redis] +// Redis health checker :ref:`configuration overview `. +// [#extension: envoy.health_checkers.redis] + +message Redis { + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value + // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other + // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance + // by setting the specified key to any value and waiting for traffic to drain. + string key = 1; +} diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto b/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto new file mode 100644 index 0000000000000..e4865d348b972 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +package envoy.extensions.resource_monitor.fixed_heap.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.fixed_heap.v3"; +option java_outer_classname = "FixedHeapProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Fixed heap] +// [#extension: envoy.resource_monitors.fixed_heap] + +// The fixed heap resource monitor reports the Envoy process memory pressure, computed as a +// fraction of currently reserved heap memory divided by a statically configured maximum +// specified in the FixedHeapConfig. +message FixedHeapConfig { + uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; +} diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto new file mode 100644 index 0000000000000..13a7a2ab4edff --- /dev/null +++ b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.extensions.resource_monitor.injected_resource.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.injected_resource.v3"; +option java_outer_classname = "InjectedResourceProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Injected resource] +// [#extension: envoy.resource_monitors.injected_resource] + +// The injected resource monitor allows injecting a synthetic resource pressure into Envoy +// via a text file, which must contain a floating-point number in the range [0..1] representing +// the resource pressure and be updated atomically by a symbolic link swap. +// This is intended primarily for integration tests to force Envoy into an overloaded state. +message InjectedResourceConfig { + string filename = 1 [(validate.rules).string = {min_bytes: 1}]; +} diff --git a/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD b/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto b/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto new file mode 100644 index 0000000000000..b6cf1dee86fda --- /dev/null +++ b/generated_api_shadow/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.extensions.retry.host.omit_canary_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.retry.host.omit_canary_hosts.v3"; +option java_outer_classname = "OmitCanaryHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Omit Canary Hosts Predicate] +// [#extension: envoy.retry_host_predicates.omit_canary_hosts] + +message OmitCanaryHostsPredicate { +} diff --git a/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/BUILD b/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto b/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto new file mode 100644 index 0000000000000..fe31b9e305c6d --- /dev/null +++ b/generated_api_shadow/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package envoy.extensions.retry.host.previous_hosts.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.retry.host.previous_hosts.v3"; +option java_outer_classname = "PreviousHostsProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Previous Hosts Predicate] +// [#extension: envoy.retry_host_predicates.previous_hosts] + +message PreviousHostsPredicate { +} From 2a5b3e0c5da6669df056fe3479c584c709e49283 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 10 Nov 2020 16:25:44 +0530 Subject: [PATCH 04/32] fixing proto issue in build Signed-off-by: Abhay Narayan Katare --- .../injected_resource/v3/injected_resource.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto index 13a7a2ab4edff..436948fbc2e03 100644 --- a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto @@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_bytes: 1}]; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } From 7b21edca3d4d721c7763957453f98fe20a897d67 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 11 Nov 2020 23:53:39 +0530 Subject: [PATCH 05/32] local changes for proto format fix Signed-off-by: Abhay Narayan Katare --- .../filter/thrift/router/v2alpha1/router.proto | 5 ++++- .../extensions/filter/thrift/router/v3/BUILD | 9 --------- .../filter/thrift/router/v3/router.proto | 17 ----------------- api/versioning/BUILD | 4 ++-- .../extensions/filter/thrift/router/v3/BUILD | 5 ++++- .../filter/thrift/router/v3/router.proto | 3 +++ 6 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 api/envoy/extensions/filter/thrift/router/v3/BUILD delete mode 100644 api/envoy/extensions/filter/thrift/router/v3/router.proto diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto index 5463ab6513bee..171a3c963d37c 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -3,11 +3,14 @@ syntax = "proto3"; package envoy.config.filter.thrift.router.v2alpha1; import "udpa/annotations/status.proto"; +import "udpa/annotations/migrate.proto"; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_migrate).move_to_package = + "envoy.extensions.filters.network.thrift_proxy.router.v3"; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. diff --git a/api/envoy/extensions/filter/thrift/router/v3/BUILD b/api/envoy/extensions/filter/thrift/router/v3/BUILD deleted file mode 100644 index ee92fb652582e..0000000000000 --- a/api/envoy/extensions/filter/thrift/router/v3/BUILD +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], -) diff --git a/api/envoy/extensions/filter/thrift/router/v3/router.proto b/api/envoy/extensions/filter/thrift/router/v3/router.proto deleted file mode 100644 index 33841a74d295e..0000000000000 --- a/api/envoy/extensions/filter/thrift/router/v3/router.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.filter.thrift.router.v3; - -import "udpa/annotations/status.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; -option java_outer_classname = "RouterProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Router] -// Thrift router :ref:`configuration overview `. -// [#extension: envoy.filters.thrift.router] - -message Router { -} diff --git a/api/versioning/BUILD b/api/versioning/BUILD index c521064b4281e..01dd73e3c9400 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -16,7 +16,6 @@ proto_library( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", @@ -47,7 +46,6 @@ proto_library( "//envoy/extensions/common/tap/v3:pkg", "//envoy/extensions/compression/gzip/compressor/v3:pkg", "//envoy/extensions/compression/gzip/decompressor/v3:pkg", - "//envoy/extensions/filter/thrift/router/v3:pkg", "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", @@ -110,6 +108,7 @@ proto_library( "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg", + "//envoy/extensions/filters/network/thrift_proxy/router/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/v3:pkg", "//envoy/extensions/filters/network/wasm/v3:pkg", "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", @@ -241,6 +240,7 @@ proto_library( "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", "//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg", "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", + "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", "//envoy/config/listener/v2:pkg", diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD index ee92fb652582e..c24f669b9bbde 100644 --- a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD +++ b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/filter/thrift/router/v2alpha1:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto index 33841a74d295e..600f86c5aed3d 100644 --- a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto +++ b/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.extensions.filter.thrift.router.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; option java_outer_classname = "RouterProto"; @@ -14,4 +15,6 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.filters.thrift.router] message Router { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.filter.thrift.router.v2alpha1.Router"; } From 33bcc2cc8b7cf2b4786b3b7fa38ef93ff0dfbead Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 00:17:17 +0530 Subject: [PATCH 06/32] proto format locally Signed-off-by: Abhay Narayan Katare --- .../network/thrift_proxy/router/v3/BUILD | 9 +++++++++ .../thrift_proxy/router/v3/router.proto | 20 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD create mode 100644 api/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto diff --git a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto new file mode 100644 index 0000000000000..860622cb61e42 --- /dev/null +++ b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; + +package envoy.extensions.filters.network.thrift_proxy.router.v3; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filters.network.thrift_proxy.router.v3"; +option java_outer_classname = "RouterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Router] +// Thrift router :ref:`configuration overview `. +// [#extension: envoy.filters.thrift.router] + +message Router { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.filter.thrift.router.v2alpha1.Router"; +} From a714e4b938a3b54f0aaabfdd5935680baffaf769 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 00:50:43 +0530 Subject: [PATCH 07/32] proto format fix for redis Signed-off-by: Abhay Narayan Katare --- api/envoy/extensions/health_checker/redis/v3/redis.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/envoy/extensions/health_checker/redis/v3/redis.proto b/api/envoy/extensions/health_checker/redis/v3/redis.proto index 44518e2e67f39..b16b7db3c882d 100644 --- a/api/envoy/extensions/health_checker/redis/v3/redis.proto +++ b/api/envoy/extensions/health_checker/redis/v3/redis.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.extensions.health_checker.redis.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; option java_package = "io.envoyproxy.envoy.extensions.health_checker.redis.v3"; option java_outer_classname = "RedisProto"; @@ -18,5 +19,7 @@ message Redis { // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance // by setting the specified key to any value and waiting for traffic to drain. + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.health_checker.redis.v2.Redis"; string key = 1; } From c0337cc3155fd82a8f783963708dad19065c7a5f Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 00:55:58 +0530 Subject: [PATCH 08/32] local changes Signed-off-by: Abhay Narayan Katare --- api/envoy/config/filter/thrift/router/v2alpha1/router.proto | 5 +---- api/envoy/config/health_checker/redis/v2/redis.proto | 2 +- .../extensions/filters/network/thrift_proxy/router/v3/BUILD | 5 ++++- api/versioning/BUILD | 4 ++-- .../thrift => filters/network/thrift_proxy}/router/v3/BUILD | 0 .../network/thrift_proxy}/router/v3/router.proto | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename generated_api_shadow/envoy/extensions/{filter/thrift => filters/network/thrift_proxy}/router/v3/BUILD (100%) rename generated_api_shadow/envoy/extensions/{filter/thrift => filters/network/thrift_proxy}/router/v3/router.proto (77%) diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto index 171a3c963d37c..5463ab6513bee 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -3,14 +3,11 @@ syntax = "proto3"; package envoy.config.filter.thrift.router.v2alpha1; import "udpa/annotations/status.proto"; -import "udpa/annotations/migrate.proto"; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; -option (udpa.annotations.file_migrate).move_to_package = - "envoy.extensions.filters.network.thrift_proxy.router.v3"; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..4e6d8e47d7be0 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD index ee92fb652582e..c24f669b9bbde 100644 --- a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD +++ b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/filter/thrift/router/v2alpha1:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 01dd73e3c9400..f7c1f651e40bd 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -16,8 +16,8 @@ proto_library( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", + "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -240,9 +240,9 @@ proto_library( "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", "//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg", "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", - "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD b/generated_api_shadow/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/filter/thrift/router/v3/BUILD rename to generated_api_shadow/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD diff --git a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto b/generated_api_shadow/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto similarity index 77% rename from generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto rename to generated_api_shadow/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto index 600f86c5aed3d..860622cb61e42 100644 --- a/generated_api_shadow/envoy/extensions/filter/thrift/router/v3/router.proto +++ b/generated_api_shadow/envoy/extensions/filters/network/thrift_proxy/router/v3/router.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.filter.thrift.router.v3; +package envoy.extensions.filters.network.thrift_proxy.router.v3; import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filter.thrift.router.v3"; +option java_package = "io.envoyproxy.envoy.extensions.filters.network.thrift_proxy.router.v3"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; From 9c494ff20a5d82082f5a72f632e0e45f41951e53 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 12:13:54 +0530 Subject: [PATCH 09/32] local proto path changes Signed-off-by: Abhay Narayan Katare --- api/BUILD | 2 +- api/envoy/config/health_checker/redis/v2/redis.proto | 2 +- .../redis}/v3/BUILD | 5 ++++- .../redis/v3/redis.proto | 11 ++++------- .../redis => resource_monitors/fixed_heap}/v3/BUILD | 0 .../fixed_heap/v3/fixed_heap.proto | 0 .../injected_resource}/v3/BUILD | 0 .../injected_resource/v3/injected_resource.proto | 0 8 files changed, 10 insertions(+), 10 deletions(-) rename api/envoy/extensions/{resource_monitor/injected_resource => health_checkers/redis}/v3/BUILD (60%) rename api/envoy/extensions/{health_checker => health_checkers}/redis/v3/redis.proto (53%) rename api/envoy/extensions/{health_checker/redis => resource_monitors/fixed_heap}/v3/BUILD (100%) rename api/envoy/extensions/{resource_monitor => resource_monitors}/fixed_heap/v3/fixed_heap.proto (100%) rename api/envoy/extensions/{resource_monitor/fixed_heap => resource_monitors/injected_resource}/v3/BUILD (100%) rename api/envoy/extensions/{resource_monitor => resource_monitors}/injected_resource/v3/injected_resource.proto (100%) diff --git a/api/BUILD b/api/BUILD index f296e53838077..8bb5bfe85106e 100644 --- a/api/BUILD +++ b/api/BUILD @@ -164,7 +164,6 @@ proto_library( "//envoy/extensions/common/tap/v3:pkg", "//envoy/extensions/compression/gzip/compressor/v3:pkg", "//envoy/extensions/compression/gzip/decompressor/v3:pkg", - "//envoy/extensions/filter/thrift/router/v3:pkg", "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", @@ -227,6 +226,7 @@ proto_library( "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg", + "//envoy/extensions/filters/network/thrift_proxy/router/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/v3:pkg", "//envoy/extensions/filters/network/wasm/v3:pkg", "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 4e6d8e47d7be0..0c569f5c75e8c 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD b/api/envoy/extensions/health_checkers/redis/v3/BUILD similarity index 60% rename from api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD rename to api/envoy/extensions/health_checkers/redis/v3/BUILD index ee92fb652582e..1cb4c6154f26e 100644 --- a/api/envoy/extensions/resource_monitor/injected_resource/v3/BUILD +++ b/api/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/health_checker/redis/v2:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/api/envoy/extensions/health_checker/redis/v3/redis.proto b/api/envoy/extensions/health_checkers/redis/v3/redis.proto similarity index 53% rename from api/envoy/extensions/health_checker/redis/v3/redis.proto rename to api/envoy/extensions/health_checkers/redis/v3/redis.proto index b16b7db3c882d..1115eabab3140 100644 --- a/api/envoy/extensions/health_checker/redis/v3/redis.proto +++ b/api/envoy/extensions/health_checkers/redis/v3/redis.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.health_checker.redis.v3; +package envoy.extensions.health_checkers.redis.v3; import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; -option java_package = "io.envoyproxy.envoy.extensions.health_checker.redis.v3"; +option java_package = "io.envoyproxy.envoy.extensions.health_checkers.redis.v3"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; @@ -15,11 +15,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { - // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value - // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other - // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance - // by setting the specified key to any value and waiting for traffic to drain. - option (udpa.annotations.versioning).previous_message_type = + option (udpa.annotations.versioning).previous_message_type = "envoy.config.health_checker.redis.v2.Redis"; + string key = 1; } diff --git a/api/envoy/extensions/health_checker/redis/v3/BUILD b/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD similarity index 100% rename from api/envoy/extensions/health_checker/redis/v3/BUILD rename to api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD diff --git a/api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto b/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto similarity index 100% rename from api/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto rename to api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto diff --git a/api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD b/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD similarity index 100% rename from api/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD rename to api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD diff --git a/api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto similarity index 100% rename from api/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto rename to api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto From 6bcc762293ea5580091511decafb39559cdf7d94 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 12:38:16 +0530 Subject: [PATCH 10/32] local changes for proto format Signed-off-by: Abhay Narayan Katare --- .../resource_monitors/fixed_heap/v3/fixed_heap.proto | 4 ++-- .../injected_resource/v3/injected_resource.proto | 4 ++-- api/versioning/BUILD | 8 ++++---- .../redis/v3/BUILD | 5 ++++- .../redis/v3/redis.proto | 12 ++++++------ 5 files changed, 18 insertions(+), 15 deletions(-) rename generated_api_shadow/envoy/extensions/{health_checker => health_checkers}/redis/v3/BUILD (60%) rename generated_api_shadow/envoy/extensions/{health_checker => health_checkers}/redis/v3/redis.proto (52%) diff --git a/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto b/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto index e4865d348b972..e74fb49c57f73 100644 --- a/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto +++ b/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitor.fixed_heap.v3; +package envoy.extensions.resource_monitors.fixed_heap.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.fixed_heap.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto b/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto index 436948fbc2e03..c46abf29232df 100644 --- a/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto +++ b/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitor.injected_resource.v3; +package envoy.extensions.resource_monitors.injected_resource.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.injected_resource.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.injected_resource.v3"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/versioning/BUILD b/api/versioning/BUILD index f7c1f651e40bd..82d6001d26db4 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,6 +18,7 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -114,13 +115,13 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", - "//envoy/extensions/health_checker/redis/v3:pkg", + "//envoy/extensions/health_checkers/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", - "//envoy/extensions/resource_monitor/fixed_heap/v3:pkg", - "//envoy/extensions/resource_monitor/injected_resource/v3:pkg", + "//envoy/extensions/resource_monitors/fixed_heap/v3:pkg", + "//envoy/extensions/resource_monitors/injected_resource/v3:pkg", "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/host/previous_hosts/v3:pkg", @@ -242,7 +243,6 @@ proto_library( "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", diff --git a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD similarity index 60% rename from generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD rename to generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD index ee92fb652582e..1cb4c6154f26e 100644 --- a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/BUILD +++ b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/health_checker/redis/v2:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto similarity index 52% rename from generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto rename to generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto index 44518e2e67f39..1115eabab3140 100644 --- a/generated_api_shadow/envoy/extensions/health_checker/redis/v3/redis.proto +++ b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; -package envoy.extensions.health_checker.redis.v3; +package envoy.extensions.health_checkers.redis.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; -option java_package = "io.envoyproxy.envoy.extensions.health_checker.redis.v3"; +option java_package = "io.envoyproxy.envoy.extensions.health_checkers.redis.v3"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; @@ -14,9 +15,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { - // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value - // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other - // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance - // by setting the specified key to any value and waiting for traffic to drain. + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.health_checker.redis.v2.Redis"; + string key = 1; } From 7da05838d07f4e0b8ebb87654852577be90fdf8e Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 12 Nov 2020 15:08:54 +0530 Subject: [PATCH 11/32] local proto tree changes Signed-off-by: Abhay Narayan Katare --- api/BUILD | 8 +++----- api/envoy/config/health_checker/redis/v2/redis.proto | 3 ++- .../resource_monitor/fixed_heap/v2alpha/fixed_heap.proto | 3 ++- .../injected_resource/v2alpha/injected_resource.proto | 3 ++- api/envoy/extensions/health_checkers/redis/v3/BUILD | 5 +---- api/envoy/extensions/health_checkers/redis/v3/redis.proto | 3 --- api/versioning/BUILD | 2 +- .../envoy/config/health_checker/redis/v2/redis.proto | 2 +- .../envoy/extensions/health_checkers/redis/v3/BUILD | 5 +---- .../envoy/extensions/health_checkers/redis/v3/redis.proto | 3 --- .../fixed_heap/v3/BUILD | 0 .../fixed_heap/v3/fixed_heap.proto | 4 ++-- .../injected_resource/v3/BUILD | 0 .../injected_resource/v3/injected_resource.proto | 4 ++-- 14 files changed, 17 insertions(+), 28 deletions(-) rename generated_api_shadow/envoy/extensions/{resource_monitor => resource_monitors}/fixed_heap/v3/BUILD (100%) rename generated_api_shadow/envoy/extensions/{resource_monitor => resource_monitors}/fixed_heap/v3/fixed_heap.proto (89%) rename generated_api_shadow/envoy/extensions/{resource_monitor => resource_monitors}/injected_resource/v3/BUILD (100%) rename generated_api_shadow/envoy/extensions/{resource_monitor => resource_monitors}/injected_resource/v3/injected_resource.proto (90%) diff --git a/api/BUILD b/api/BUILD index 8bb5bfe85106e..005442373c464 100644 --- a/api/BUILD +++ b/api/BUILD @@ -83,7 +83,6 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", @@ -135,7 +134,6 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -232,13 +230,13 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", - "//envoy/extensions/health_checker/redis/v3:pkg", + "//envoy/extensions/health_checkers/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", - "//envoy/extensions/resource_monitor/fixed_heap/v3:pkg", - "//envoy/extensions/resource_monitor/injected_resource/v3:pkg", + "//envoy/extensions/resource_monitors/fixed_heap/v3:pkg", + "//envoy/extensions/resource_monitors/injected_resource/v3:pkg", "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/host/previous_hosts/v3:pkg", diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..e72a8e70c7895 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,8 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.health_checkers.redis.v3"; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 529622a071e77..9dc44afcb5d0e 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -8,7 +8,8 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.resource_monitors.fixed_heap.v3"; // [#protodoc-title: Fixed heap] // [#extension: envoy.resource_monitors.fixed_heap] diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index a9f056d2d29aa..e80db6d21dd52 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -8,7 +8,8 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.resource_monitors.injected_resource.v3"; // [#protodoc-title: Injected resource] // [#extension: envoy.resource_monitors.injected_resource] diff --git a/api/envoy/extensions/health_checkers/redis/v3/BUILD b/api/envoy/extensions/health_checkers/redis/v3/BUILD index 1cb4c6154f26e..ee92fb652582e 100644 --- a/api/envoy/extensions/health_checkers/redis/v3/BUILD +++ b/api/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/health_checker/redis/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/health_checkers/redis/v3/redis.proto b/api/envoy/extensions/health_checkers/redis/v3/redis.proto index 1115eabab3140..d05f3ab5e31f8 100644 --- a/api/envoy/extensions/health_checkers/redis/v3/redis.proto +++ b/api/envoy/extensions/health_checkers/redis/v3/redis.proto @@ -15,8 +15,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { - option (udpa.annotations.versioning).previous_message_type = - "envoy.config.health_checker.redis.v2.Redis"; - string key = 1; } diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 82d6001d26db4..99c6614a81260 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,7 +18,6 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -243,6 +242,7 @@ proto_library( "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..4e6d8e47d7be0 100644 --- a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto +++ b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD index 1cb4c6154f26e..ee92fb652582e 100644 --- a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD +++ b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/health_checker/redis/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto index 1115eabab3140..d05f3ab5e31f8 100644 --- a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto +++ b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto @@ -15,8 +15,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { - option (udpa.annotations.versioning).previous_message_type = - "envoy.config.health_checker.redis.v2.Redis"; - string key = 1; } diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/BUILD rename to generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto b/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto similarity index 89% rename from generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto rename to generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto index e4865d348b972..e74fb49c57f73 100644 --- a/generated_api_shadow/envoy/extensions/resource_monitor/fixed_heap/v3/fixed_heap.proto +++ b/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitor.fixed_heap.v3; +package envoy.extensions.resource_monitors.fixed_heap.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.fixed_heap.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/BUILD rename to generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD diff --git a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto similarity index 90% rename from generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto rename to generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto index 436948fbc2e03..c46abf29232df 100644 --- a/generated_api_shadow/envoy/extensions/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitor.injected_resource.v3; +package envoy.extensions.resource_monitors.injected_resource.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitor.injected_resource.v3"; +option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.injected_resource.v3"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; From ee69ed80ec39759b97c93f21d4272c9afa3e9966 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 16:42:59 +0530 Subject: [PATCH 12/32] local changes for new protos Signed-off-by: Abhay Narayan Katare --- api/BUILD | 5 ++--- .../health_checker/redis/v2/redis.proto | 3 +-- .../health_checker}/redis/v3/BUILD | 0 .../health_checker/redis/v3/redis.proto | 22 +++++++++++++++++++ .../fixed_heap/v2alpha/fixed_heap.proto | 3 +-- .../resource_monitor}/fixed_heap/v3/BUILD | 0 .../fixed_heap/v3/fixed_heap.proto | 4 ++-- .../v2alpha/injected_resource.proto | 3 +-- .../injected_resource/v3/BUILD | 0 .../v3/injected_resource.proto | 6 ++--- .../health_checkers/redis/v3/redis.proto | 19 ---------------- api/versioning/BUILD | 5 +---- .../health_checker/redis/v2/redis.proto | 2 +- 13 files changed, 34 insertions(+), 38 deletions(-) rename api/envoy/{extensions/health_checkers => config/health_checker}/redis/v3/BUILD (100%) create mode 100644 api/envoy/config/health_checker/redis/v3/redis.proto rename api/envoy/{extensions/resource_monitors => config/resource_monitor}/fixed_heap/v3/BUILD (100%) rename api/envoy/{extensions/resource_monitors => config/resource_monitor}/fixed_heap/v3/fixed_heap.proto (81%) rename api/envoy/{extensions/resource_monitors => config/resource_monitor}/injected_resource/v3/BUILD (100%) rename api/envoy/{extensions/resource_monitors => config/resource_monitor}/injected_resource/v3/injected_resource.proto (76%) delete mode 100644 api/envoy/extensions/health_checkers/redis/v3/redis.proto diff --git a/api/BUILD b/api/BUILD index 005442373c464..25fad386fda7b 100644 --- a/api/BUILD +++ b/api/BUILD @@ -83,6 +83,7 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", @@ -134,6 +135,7 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -230,13 +232,10 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", - "//envoy/extensions/health_checkers/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", - "//envoy/extensions/resource_monitors/fixed_heap/v3:pkg", - "//envoy/extensions/resource_monitors/injected_resource/v3:pkg", "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/host/previous_hosts/v3:pkg", diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index e72a8e70c7895..0c569f5c75e8c 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,8 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; -option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.health_checkers.redis.v3"; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/extensions/health_checkers/redis/v3/BUILD b/api/envoy/config/health_checker/redis/v3/BUILD similarity index 100% rename from api/envoy/extensions/health_checkers/redis/v3/BUILD rename to api/envoy/config/health_checker/redis/v3/BUILD diff --git a/api/envoy/config/health_checker/redis/v3/redis.proto b/api/envoy/config/health_checker/redis/v3/redis.proto new file mode 100644 index 0000000000000..d6edd44f7f321 --- /dev/null +++ b/api/envoy/config/health_checker/redis/v3/redis.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.config.health_checker.redis.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v3"; +option java_outer_classname = "RedisProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Redis] +// Redis health checker :ref:`configuration overview `. +// [#extension: envoy.health_checkers.redis] + +message Redis { + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value + // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other + // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance + // by setting the specified key to any value and waiting for traffic to drain. + string key = 1; +} diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 9dc44afcb5d0e..529622a071e77 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -8,8 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; -option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.resource_monitors.fixed_heap.v3"; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Fixed heap] // [#extension: envoy.resource_monitors.fixed_heap] diff --git a/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v3/BUILD similarity index 100% rename from api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD rename to api/envoy/config/resource_monitor/fixed_heap/v3/BUILD diff --git a/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto similarity index 81% rename from api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto rename to api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto index e74fb49c57f73..4c6093177d3b7 100644 --- a/api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitors.fixed_heap.v3; +package envoy.config.resource_monitor.fixed_heap.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.fixed_heap.v3"; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index e80db6d21dd52..a9f056d2d29aa 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -8,8 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; -option (udpa.annotations.file_migrate).move_to_package = "envoy.extensions.resource_monitors.injected_resource.v3"; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Injected resource] // [#extension: envoy.resource_monitors.injected_resource] diff --git a/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD b/api/envoy/config/resource_monitor/injected_resource/v3/BUILD similarity index 100% rename from api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD rename to api/envoy/config/resource_monitor/injected_resource/v3/BUILD diff --git a/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto similarity index 76% rename from api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto rename to api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index c46abf29232df..a9f056d2d29aa 100644 --- a/api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.extensions.resource_monitors.injected_resource.v3; +package envoy.config.resource_monitor.injected_resource.v2alpha; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.injected_resource.v3"; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; @@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_len: 1}]; + string filename = 1 [(validate.rules).string = {min_bytes: 1}]; } diff --git a/api/envoy/extensions/health_checkers/redis/v3/redis.proto b/api/envoy/extensions/health_checkers/redis/v3/redis.proto deleted file mode 100644 index d05f3ab5e31f8..0000000000000 --- a/api/envoy/extensions/health_checkers/redis/v3/redis.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.health_checkers.redis.v3; - -import "udpa/annotations/status.proto"; -import "udpa/annotations/versioning.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.health_checkers.redis.v3"; -option java_outer_classname = "RedisProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Redis] -// Redis health checker :ref:`configuration overview `. -// [#extension: envoy.health_checkers.redis] - -message Redis { - string key = 1; -} diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 99c6614a81260..e510a8056105d 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,6 +18,7 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", @@ -114,13 +115,10 @@ proto_library( "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", - "//envoy/extensions/health_checkers/redis/v3:pkg", "//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg", "//envoy/extensions/internal_redirect/previous_routes/v3:pkg", "//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg", "//envoy/extensions/network/socket_interface/v3:pkg", - "//envoy/extensions/resource_monitors/fixed_heap/v3:pkg", - "//envoy/extensions/resource_monitors/injected_resource/v3:pkg", "//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/host/previous_hosts/v3:pkg", @@ -242,7 +240,6 @@ proto_library( "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto index 4e6d8e47d7be0..0c569f5c75e8c 100644 --- a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto +++ b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. From 4172bf5b6faa8b06ce1db4a2b41af25bd02c765c Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 16:52:35 +0530 Subject: [PATCH 13/32] local changes for new proto Signed-off-by: Abhay Narayan Katare --- .../v3/injected_resource.proto | 4 ++-- api/versioning/BUILD | 3 +++ .../extensions/health_checkers/redis/v3/BUILD | 9 -------- .../health_checkers/redis/v3/redis.proto | 19 ---------------- .../resource_monitors/fixed_heap/v3/BUILD | 9 -------- .../fixed_heap/v3/fixed_heap.proto | 21 ------------------ .../injected_resource/v3/BUILD | 9 -------- .../v3/injected_resource.proto | 22 ------------------- 8 files changed, 5 insertions(+), 91 deletions(-) delete mode 100644 generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD delete mode 100644 generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto delete mode 100644 generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD delete mode 100644 generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto delete mode 100644 generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD delete mode 100644 generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto diff --git a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index a9f056d2d29aa..ebd53515a8b23 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package envoy.config.resource_monitor.injected_resource.v2alpha; +package envoy.config.resource_monitor.injected_resource.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/api/versioning/BUILD b/api/versioning/BUILD index e510a8056105d..fe922de9e7b67 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -19,13 +19,16 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", "//envoy/config/health_checker/redis/v2:pkg", + "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "//envoy/config/resource_monitor/fixed_heap/v3:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", + "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", "//envoy/config/route/v3:pkg", diff --git a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD deleted file mode 100644 index ee92fb652582e..0000000000000 --- a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/BUILD +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], -) diff --git a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto b/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto deleted file mode 100644 index d05f3ab5e31f8..0000000000000 --- a/generated_api_shadow/envoy/extensions/health_checkers/redis/v3/redis.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.health_checkers.redis.v3; - -import "udpa/annotations/status.proto"; -import "udpa/annotations/versioning.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.health_checkers.redis.v3"; -option java_outer_classname = "RedisProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Redis] -// Redis health checker :ref:`configuration overview `. -// [#extension: envoy.health_checkers.redis] - -message Redis { - string key = 1; -} diff --git a/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD deleted file mode 100644 index ee92fb652582e..0000000000000 --- a/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], -) diff --git a/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto b/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto deleted file mode 100644 index e74fb49c57f73..0000000000000 --- a/generated_api_shadow/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.resource_monitors.fixed_heap.v3; - -import "udpa/annotations/status.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.fixed_heap.v3"; -option java_outer_classname = "FixedHeapProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Fixed heap] -// [#extension: envoy.resource_monitors.fixed_heap] - -// The fixed heap resource monitor reports the Envoy process memory pressure, computed as a -// fraction of currently reserved heap memory divided by a statically configured maximum -// specified in the FixedHeapConfig. -message FixedHeapConfig { - uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; -} diff --git a/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD b/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD deleted file mode 100644 index ee92fb652582e..0000000000000 --- a/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/BUILD +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], -) diff --git a/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto deleted file mode 100644 index c46abf29232df..0000000000000 --- a/generated_api_shadow/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto +++ /dev/null @@ -1,22 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.resource_monitors.injected_resource.v3; - -import "udpa/annotations/status.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.resource_monitors.injected_resource.v3"; -option java_outer_classname = "InjectedResourceProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Injected resource] -// [#extension: envoy.resource_monitors.injected_resource] - -// The injected resource monitor allows injecting a synthetic resource pressure into Envoy -// via a text file, which must contain a floating-point number in the range [0..1] representing -// the resource pressure and be updated atomically by a symbolic link swap. -// This is intended primarily for integration tests to force Envoy into an overloaded state. -message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_len: 1}]; -} From db4700dfc591a81a82a659b04cd593ac1ce7d451 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 17:25:49 +0530 Subject: [PATCH 14/32] format changes Signed-off-by: Abhay Narayan Katare --- api/BUILD | 3 +++ api/envoy/config/health_checker/redis/v2/redis.proto | 2 +- docs/root/api-v3/config/health_checker/health_checker.rst | 2 +- docs/root/api-v3/config/resource_monitor/resource_monitor.rst | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/BUILD b/api/BUILD index 25fad386fda7b..0b74a23facb44 100644 --- a/api/BUILD +++ b/api/BUILD @@ -136,13 +136,16 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", "//envoy/config/health_checker/redis/v2:pkg", + "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "//envoy/config/resource_monitor/fixed_heap/v3:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", + "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", "//envoy/config/route/v3:pkg", diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..4e6d8e47d7be0 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/docs/root/api-v3/config/health_checker/health_checker.rst b/docs/root/api-v3/config/health_checker/health_checker.rst index 3e5d283725056..a52b1d07c5069 100644 --- a/docs/root/api-v3/config/health_checker/health_checker.rst +++ b/docs/root/api-v3/config/health_checker/health_checker.rst @@ -5,4 +5,4 @@ Health checkers :glob: :maxdepth: 2 - */v2/* \ No newline at end of file + */v3/* diff --git a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst index ef47ad7dca3e7..3adb5f364e0b5 100644 --- a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst +++ b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst @@ -7,4 +7,4 @@ Resource monitors :glob: :maxdepth: 2 - */v2alpha/* + */v3/* From 54052048c751a20e47b80a86c918878fa0cbfe17 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 17:36:31 +0530 Subject: [PATCH 15/32] local changes for new proto Signed-off-by: Abhay Narayan Katare --- api/BUILD | 3 --- api/versioning/BUILD | 2 -- 2 files changed, 5 deletions(-) diff --git a/api/BUILD b/api/BUILD index 0b74a23facb44..c047afe203100 100644 --- a/api/BUILD +++ b/api/BUILD @@ -135,16 +135,13 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", diff --git a/api/versioning/BUILD b/api/versioning/BUILD index fe922de9e7b67..d4ea8dff62a44 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -25,9 +25,7 @@ proto_library( "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", From c0469c3b3171e81ac0610611d0a9648e524fd10d Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 18:03:06 +0530 Subject: [PATCH 16/32] proto changes Signed-off-by: Abhay Narayan Katare --- api/envoy/config/health_checker/redis/v2/redis.proto | 2 +- api/versioning/BUILD | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 4e6d8e47d7be0..0c569f5c75e8c 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = FROZEN; +option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/versioning/BUILD b/api/versioning/BUILD index d4ea8dff62a44..c763f124982c7 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,7 +18,6 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", From 86ebbb347a286494a318e186bfcb8d47928d8e0c Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 18:03:48 +0530 Subject: [PATCH 17/32] proto changes Signed-off-by: Abhay Narayan Katare --- .../config/health_checker/redis/v3/BUILD | 9 ++++++++ .../health_checker/redis/v3/redis.proto | 22 +++++++++++++++++++ .../resource_monitor/fixed_heap/v3/BUILD | 9 ++++++++ .../fixed_heap/v3/fixed_heap.proto | 21 ++++++++++++++++++ .../injected_resource/v3/BUILD | 9 ++++++++ .../v3/injected_resource.proto | 22 +++++++++++++++++++ 6 files changed, 92 insertions(+) create mode 100644 generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD create mode 100644 generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto create mode 100644 generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD create mode 100644 generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto create mode 100644 generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD create mode 100644 generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD b/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto b/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto new file mode 100644 index 0000000000000..d6edd44f7f321 --- /dev/null +++ b/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.config.health_checker.redis.v3; + +import "udpa/annotations/status.proto"; + +option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v3"; +option java_outer_classname = "RedisProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Redis] +// Redis health checker :ref:`configuration overview `. +// [#extension: envoy.health_checkers.redis] + +message Redis { + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value + // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other + // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance + // by setting the specified key to any value and waiting for traffic to drain. + string key = 1; +} diff --git a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto new file mode 100644 index 0000000000000..4c6093177d3b7 --- /dev/null +++ b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +package envoy.config.resource_monitor.fixed_heap.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; +option java_outer_classname = "FixedHeapProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Fixed heap] +// [#extension: envoy.resource_monitors.fixed_heap] + +// The fixed heap resource monitor reports the Envoy process memory pressure, computed as a +// fraction of currently reserved heap memory divided by a statically configured maximum +// specified in the FixedHeapConfig. +message FixedHeapConfig { + uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; +} diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD new file mode 100644 index 0000000000000..ee92fb652582e --- /dev/null +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD @@ -0,0 +1,9 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], +) diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto new file mode 100644 index 0000000000000..ebd53515a8b23 --- /dev/null +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -0,0 +1,22 @@ +syntax = "proto3"; + +package envoy.config.resource_monitor.injected_resource.v3; + +import "udpa/annotations/status.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; +option java_outer_classname = "InjectedResourceProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Injected resource] +// [#extension: envoy.resource_monitors.injected_resource] + +// The injected resource monitor allows injecting a synthetic resource pressure into Envoy +// via a text file, which must contain a floating-point number in the range [0..1] representing +// the resource pressure and be updated atomically by a symbolic link swap. +// This is intended primarily for integration tests to force Envoy into an overloaded state. +message InjectedResourceConfig { + string filename = 1 [(validate.rules).string = {min_bytes: 1}]; +} From 8c0ecc4bccc0373bb957f9b288811767b874ac33 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 17 Nov 2020 22:24:12 +0530 Subject: [PATCH 18/32] changes for new protos docs changes Signed-off-by: Abhay Narayan Katare --- .../injected_resource/v3/injected_resource.proto | 2 +- .../injected_resource/v3/injected_resource.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index ebd53515a8b23..2115da7e85cbc 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_bytes: 1}]; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index ebd53515a8b23..2115da7e85cbc 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { - string filename = 1 [(validate.rules).string = {min_bytes: 1}]; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } From facb65a13721c00ce1633bc93ff1e18276017726 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 19 Nov 2020 15:10:24 +0530 Subject: [PATCH 19/32] fixing build issues due to overload.proto etc Signed-off-by: Abhay Narayan Katare --- api/envoy/config/overload/v3/overload.proto | 4 ++-- docs/root/configuration/upstream/health_checkers/redis.rst | 2 +- docs/root/intro/arch_overview/upstream/health_checking.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/envoy/config/overload/v3/overload.proto b/api/envoy/config/overload/v3/overload.proto index ac1d444b629ad..24c42238b6f55 100644 --- a/api/envoy/config/overload/v3/overload.proto +++ b/api/envoy/config/overload/v3/overload.proto @@ -34,9 +34,9 @@ message ResourceMonitor { // resource monitor type. The built-in resource monitors are: // // * :ref:`envoy.resource_monitors.fixed_heap - // ` + // ` // * :ref:`envoy.resource_monitors.injected_resource - // ` + // ` string name = 1 [(validate.rules).string = {min_len: 1}]; // Configuration for the resource monitor being instantiated. diff --git a/docs/root/configuration/upstream/health_checkers/redis.rst b/docs/root/configuration/upstream/health_checkers/redis.rst index 03ad07741e673..6469c1a0af6df 100644 --- a/docs/root/configuration/upstream/health_checkers/redis.rst +++ b/docs/root/configuration/upstream/health_checkers/redis.rst @@ -8,7 +8,7 @@ which checks Redis upstream hosts. It sends a Redis PING command and expect a PO Redis server can respond with anything other than PONG to cause an immediate active health check failure. Optionally, Envoy can perform EXISTS on a user-specified key. If the key does not exist it is considered a passing health check. This allows the user to mark a Redis instance for maintenance by setting the -specified :ref:`key ` to any value and waiting +specified :ref:`key ` to any value and waiting for traffic to drain. An example setting for :ref:`custom_health_check ` as a diff --git a/docs/root/intro/arch_overview/upstream/health_checking.rst b/docs/root/intro/arch_overview/upstream/health_checking.rst index d6b7bf9cc6187..a0a77f1df32bc 100644 --- a/docs/root/intro/arch_overview/upstream/health_checking.rst +++ b/docs/root/intro/arch_overview/upstream/health_checking.rst @@ -24,7 +24,7 @@ unhealthy, successes required before marking a host healthy, etc.): failure. Optionally, Envoy can perform EXISTS on a user-specified key. If the key does not exist it is considered a passing healthcheck. This allows the user to mark a Redis instance for maintenance by setting the specified key to any value and waiting for traffic to drain. See - :ref:`redis_key `. + :ref:`redis_key `. Health checks occur over the transport socket specified for the cluster. This implies that if a cluster is using a TLS-enabled transport socket, the health check will also occur over TLS. The From 270bfb261c85f84f690bb16d25e1bc4f96cd3a02 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 19 Nov 2020 21:21:17 +0530 Subject: [PATCH 20/32] fixing BUILD files issues in ci build Signed-off-by: Abhay Narayan Katare --- api/BUILD | 3 +++ api/versioning/BUILD | 3 +++ 2 files changed, 6 insertions(+) diff --git a/api/BUILD b/api/BUILD index c047afe203100..21924dfa7b391 100644 --- a/api/BUILD +++ b/api/BUILD @@ -135,13 +135,16 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", diff --git a/api/versioning/BUILD b/api/versioning/BUILD index c763f124982c7..b65b5f0916ad9 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,13 +18,16 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", From ec1a23a4f21dc2ef9945fca1829124343d76dd11 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 12:24:54 +0530 Subject: [PATCH 21/32] changes wrt v2 protos Signed-off-by: Abhay Narayan Katare --- api/BUILD | 4 ---- api/versioning/BUILD | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/api/BUILD b/api/BUILD index 21924dfa7b391..e2346c2384888 100644 --- a/api/BUILD +++ b/api/BUILD @@ -133,18 +133,14 @@ proto_library( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", diff --git a/api/versioning/BUILD b/api/versioning/BUILD index b65b5f0916ad9..fe922de9e7b67 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -18,16 +18,16 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", From 633864d0b5ba835bbcb267d736cf3ffdcfdd6bc3 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Fri, 20 Nov 2020 12:56:10 +0530 Subject: [PATCH 22/32] fix proto issues and fix for PR 13885 Signed-off-by: Abhay Narayan Katare --- api/BUILD | 4 ++++ docs/root/api-v3/config/health_checker/health_checker.rst | 1 + docs/root/api-v3/config/resource_monitor/resource_monitor.rst | 1 + .../other_protocols/thrift_filters/router_filter.rst | 2 +- generated_api_shadow/envoy/config/overload/v3/overload.proto | 4 ++-- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/api/BUILD b/api/BUILD index e2346c2384888..0b74a23facb44 100644 --- a/api/BUILD +++ b/api/BUILD @@ -133,14 +133,18 @@ proto_library( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", + "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", diff --git a/docs/root/api-v3/config/health_checker/health_checker.rst b/docs/root/api-v3/config/health_checker/health_checker.rst index a52b1d07c5069..e661e8f1a4af8 100644 --- a/docs/root/api-v3/config/health_checker/health_checker.rst +++ b/docs/root/api-v3/config/health_checker/health_checker.rst @@ -5,4 +5,5 @@ Health checkers :glob: :maxdepth: 2 + */v2/* */v3/* diff --git a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst index 3adb5f364e0b5..7a2ce19f78af1 100644 --- a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst +++ b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst @@ -8,3 +8,4 @@ Resource monitors :maxdepth: 2 */v3/* + */v2alpha/* diff --git a/docs/root/configuration/other_protocols/thrift_filters/router_filter.rst b/docs/root/configuration/other_protocols/thrift_filters/router_filter.rst index 22ce7bcbf1376..c08a02f80630c 100644 --- a/docs/root/configuration/other_protocols/thrift_filters/router_filter.rst +++ b/docs/root/configuration/other_protocols/thrift_filters/router_filter.rst @@ -7,7 +7,7 @@ The router filter implements Thrift forwarding. It will be used in almost all Th scenarios. The filter's main job is to follow the instructions specified in the configured :ref:`route table `. -* :ref:`v3 API reference ` +* :ref:`v3 API reference ` * This filter should be configured with the name *envoy.filters.thrift.router*. Statistics diff --git a/generated_api_shadow/envoy/config/overload/v3/overload.proto b/generated_api_shadow/envoy/config/overload/v3/overload.proto index 2be633f0ad1b1..be3754c60ae86 100644 --- a/generated_api_shadow/envoy/config/overload/v3/overload.proto +++ b/generated_api_shadow/envoy/config/overload/v3/overload.proto @@ -30,9 +30,9 @@ message ResourceMonitor { // resource monitor type. The built-in resource monitors are: // // * :ref:`envoy.resource_monitors.fixed_heap - // ` + // ` // * :ref:`envoy.resource_monitors.injected_resource - // ` + // ` string name = 1 [(validate.rules).string = {min_len: 1}]; // Configuration for the resource monitor being instantiated. From 470259df61d00267ed2fdb8b8d776017563a973c Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Tue, 24 Nov 2020 23:29:02 +0530 Subject: [PATCH 23/32] v2 protos frozen for redis Signed-off-by: Abhay Narayan Katare --- api/BUILD | 2 -- api/envoy/config/filter/thrift/router/v2alpha1/router.proto | 2 +- api/envoy/config/health_checker/redis/v2/redis.proto | 2 +- api/envoy/config/health_checker/redis/v3/redis.proto | 2 ++ api/versioning/BUILD | 4 ++-- .../envoy/config/filter/thrift/router/v2alpha1/router.proto | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/BUILD b/api/BUILD index 0b74a23facb44..e47276c0c09da 100644 --- a/api/BUILD +++ b/api/BUILD @@ -83,7 +83,6 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", @@ -135,7 +134,6 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto index 5463ab6513bee..8640277f414cd 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..4e6d8e47d7be0 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/config/health_checker/redis/v3/redis.proto b/api/envoy/config/health_checker/redis/v3/redis.proto index d6edd44f7f321..27a5efbde34d0 100644 --- a/api/envoy/config/health_checker/redis/v3/redis.proto +++ b/api/envoy/config/health_checker/redis/v3/redis.proto @@ -14,6 +14,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.health_checker.redis.v2.Redis"; // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance diff --git a/api/versioning/BUILD b/api/versioning/BUILD index fe922de9e7b67..df49e4a400b48 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -16,9 +16,7 @@ proto_library( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", - "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", @@ -241,8 +239,10 @@ proto_library( "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", "//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg", "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", + "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", diff --git a/generated_api_shadow/envoy/config/filter/thrift/router/v2alpha1/router.proto b/generated_api_shadow/envoy/config/filter/thrift/router/v2alpha1/router.proto index 5463ab6513bee..8640277f414cd 100644 --- a/generated_api_shadow/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/generated_api_shadow/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. From 029b2218426cc3b8775af5f879ab4b9b20bb80c1 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 25 Nov 2020 11:29:48 +0530 Subject: [PATCH 24/32] v2 proto changes for redis Signed-off-by: Abhay Narayan Katare --- api/envoy/config/health_checker/redis/v3/BUILD | 5 ++++- api/envoy/config/health_checker/redis/v3/redis.proto | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/api/envoy/config/health_checker/redis/v3/BUILD b/api/envoy/config/health_checker/redis/v3/BUILD index ee92fb652582e..1cb4c6154f26e 100644 --- a/api/envoy/config/health_checker/redis/v3/BUILD +++ b/api/envoy/config/health_checker/redis/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/health_checker/redis/v2:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/api/envoy/config/health_checker/redis/v3/redis.proto b/api/envoy/config/health_checker/redis/v3/redis.proto index 27a5efbde34d0..0cf9a11170afb 100644 --- a/api/envoy/config/health_checker/redis/v3/redis.proto +++ b/api/envoy/config/health_checker/redis/v3/redis.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.config.health_checker.redis.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v3"; option java_outer_classname = "RedisProto"; @@ -15,7 +16,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; message Redis { option (udpa.annotations.versioning).previous_message_type = - "envoy.config.health_checker.redis.v2.Redis"; + "envoy.config.health_checker.redis.v2.Redis"; + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance From 4997e401f9194130aba9d98ee999f20a086fe3b7 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 25 Nov 2020 11:53:48 +0530 Subject: [PATCH 25/32] v2 proto changes to FROZEN for fixed_heap Signed-off-by: Abhay Narayan Katare --- .../resource_monitor/fixed_heap/v2alpha/fixed_heap.proto | 2 +- .../config/resource_monitor/fixed_heap/v3/fixed_heap.proto | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 529622a071e77..65612a40f1391 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -8,7 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Fixed heap] // [#extension: envoy.resource_monitors.fixed_heap] diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto index 4c6093177d3b7..08b85534966ff 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -4,6 +4,7 @@ package envoy.config.resource_monitor.fixed_heap.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; +import "udpa/annotations/versioning.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; @@ -17,5 +18,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // fraction of currently reserved heap memory divided by a statically configured maximum // specified in the FixedHeapConfig. message FixedHeapConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.resource_monitor.fixed_heap.v2alpha.FixedHeapConfig"; uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; } From a480befe585bab011d37b1c3f915280f055cfbcf Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 25 Nov 2020 12:16:53 +0530 Subject: [PATCH 26/32] v2 proto changes to FROZEN Signed-off-by: Abhay Narayan Katare --- api/BUILD | 2 ++ api/envoy/config/resource_monitor/fixed_heap/v3/BUILD | 5 ++++- .../config/resource_monitor/fixed_heap/v3/fixed_heap.proto | 5 +++-- .../injected_resource/v2alpha/injected_resource.proto | 2 +- api/envoy/config/resource_monitor/injected_resource/v3/BUILD | 5 ++++- .../injected_resource/v3/injected_resource.proto | 4 ++++ api/versioning/BUILD | 4 ++-- 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/api/BUILD b/api/BUILD index e47276c0c09da..0b74a23facb44 100644 --- a/api/BUILD +++ b/api/BUILD @@ -83,6 +83,7 @@ proto_library( "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/filter/udp/udp_proxy/v2alpha:pkg", "//envoy/config/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", @@ -134,6 +135,7 @@ proto_library( "//envoy/config/endpoint/v3:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/grpc_credential/v3:pkg", + "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/health_checker/redis/v3:pkg", "//envoy/config/listener/v3:pkg", "//envoy/config/metrics/v3:pkg", diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v3/BUILD index ee92fb652582e..3fb51ff1ccaa9 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto index 08b85534966ff..138ed1a76a935 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package envoy.config.resource_monitor.fixed_heap.v3; import "udpa/annotations/status.proto"; -import "validate/validate.proto"; import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; option java_outer_classname = "FixedHeapProto"; @@ -19,6 +19,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // specified in the FixedHeapConfig. message FixedHeapConfig { option (udpa.annotations.versioning).previous_message_type = - "envoy.config.resource_monitor.fixed_heap.v2alpha.FixedHeapConfig"; + "envoy.config.resource_monitor.fixed_heap.v2alpha.FixedHeapConfig"; + uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; } diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index a9f056d2d29aa..b8d48b60f98e1 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -8,7 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Injected resource] // [#extension: envoy.resource_monitors.injected_resource] diff --git a/api/envoy/config/resource_monitor/injected_resource/v3/BUILD b/api/envoy/config/resource_monitor/injected_resource/v3/BUILD index ee92fb652582e..975b8fcbd5a32 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index 2115da7e85cbc..c903ef266906b 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.config.resource_monitor.injected_resource.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; @@ -18,5 +19,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.resource_monitor.injected_resource.v2alpha.InjectedResourceConfig"; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } diff --git a/api/versioning/BUILD b/api/versioning/BUILD index df49e4a400b48..f56331b5b4fd5 100644 --- a/api/versioning/BUILD +++ b/api/versioning/BUILD @@ -23,9 +23,7 @@ proto_library( "//envoy/config/overload/v3:pkg", "//envoy/config/ratelimit/v3:pkg", "//envoy/config/rbac/v3:pkg", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/fixed_heap/v3:pkg", - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v3:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", "//envoy/config/retry/previous_hosts/v2:pkg", @@ -248,6 +246,8 @@ proto_library( "//envoy/config/overload/v2alpha:pkg", "//envoy/config/ratelimit/v2:pkg", "//envoy/config/rbac/v2:pkg", + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_host_metadata/v2:pkg", "//envoy/config/retry/previous_priorities:pkg", "//envoy/config/trace/v2:pkg", From 8b678a2927f5d69c025a165ee60648c341544bfb Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 25 Nov 2020 14:46:14 +0530 Subject: [PATCH 27/32] v2 protos marked as FROZEN for redis,fixed_heap and injected resources Signed-off-by: Abhay Narayan Katare --- .../envoy/config/health_checker/redis/v2/redis.proto | 2 +- .../envoy/config/health_checker/redis/v3/BUILD | 5 ++++- .../envoy/config/health_checker/redis/v3/redis.proto | 4 ++++ .../resource_monitor/fixed_heap/v2alpha/fixed_heap.proto | 2 +- .../envoy/config/resource_monitor/fixed_heap/v3/BUILD | 5 ++++- .../config/resource_monitor/fixed_heap/v3/fixed_heap.proto | 4 ++++ .../injected_resource/v2alpha/injected_resource.proto | 2 +- .../envoy/config/resource_monitor/injected_resource/v3/BUILD | 5 ++++- .../injected_resource/v3/injected_resource.proto | 4 ++++ 9 files changed, 27 insertions(+), 6 deletions(-) diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto index 0c569f5c75e8c..4e6d8e47d7be0 100644 --- a/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto +++ b/generated_api_shadow/envoy/config/health_checker/redis/v2/redis.proto @@ -7,7 +7,7 @@ import "udpa/annotations/status.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD b/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD index ee92fb652582e..1cb4c6154f26e 100644 --- a/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD +++ b/generated_api_shadow/envoy/config/health_checker/redis/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/health_checker/redis/v2:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto b/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto index d6edd44f7f321..0cf9a11170afb 100644 --- a/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto +++ b/generated_api_shadow/envoy/config/health_checker/redis/v3/redis.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.config.health_checker.redis.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v3"; option java_outer_classname = "RedisProto"; @@ -14,6 +15,9 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.health_checkers.redis] message Redis { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.health_checker.redis.v2.Redis"; + // If set, optionally perform ``EXISTS `` instead of ``PING``. A return value // from Redis of 0 (does not exist) is considered a passing healthcheck. A return value other // than 0 is considered a failure. This allows the user to mark a Redis instance for maintenance diff --git a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 529622a071e77..65612a40f1391 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -8,7 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Fixed heap] // [#extension: envoy.resource_monitors.fixed_heap] diff --git a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD index ee92fb652582e..3fb51ff1ccaa9 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD +++ b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto index 4c6093177d3b7..138ed1a76a935 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto +++ b/generated_api_shadow/envoy/config/resource_monitor/fixed_heap/v3/fixed_heap.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.config.resource_monitor.fixed_heap.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3"; @@ -17,5 +18,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // fraction of currently reserved heap memory divided by a statically configured maximum // specified in the FixedHeapConfig. message FixedHeapConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.resource_monitor.fixed_heap.v2alpha.FixedHeapConfig"; + uint64 max_heap_size_bytes = 1 [(validate.rules).uint64 = {gt: 0}]; } diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index a9f056d2d29aa..b8d48b60f98e1 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -8,7 +8,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (udpa.annotations.file_status).package_version_status = FROZEN; // [#protodoc-title: Injected resource] // [#extension: envoy.resource_monitors.injected_resource] diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD index ee92fb652582e..975b8fcbd5a32 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/BUILD @@ -5,5 +5,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], + deps = [ + "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], ) diff --git a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto index 2115da7e85cbc..c903ef266906b 100644 --- a/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto +++ b/generated_api_shadow/envoy/config/resource_monitor/injected_resource/v3/injected_resource.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package envoy.config.resource_monitor.injected_resource.v3; import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3"; @@ -18,5 +19,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // the resource pressure and be updated atomically by a symbolic link swap. // This is intended primarily for integration tests to force Envoy into an overloaded state. message InjectedResourceConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.resource_monitor.injected_resource.v2alpha.InjectedResourceConfig"; + string filename = 1 [(validate.rules).string = {min_len: 1}]; } From a9e100cab191f47ef63f041692219fc5b66563cd Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Wed, 16 Dec 2020 00:40:09 +0530 Subject: [PATCH 28/32] fixing build issues, incorporated review comments of harvey to exclude v2 protos from source code also tracking issue #14197 Signed-off-by: Abhay Narayan Katare --- source/common/protobuf/utility.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index f945a458d5ded..2a444bc5d14a3 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -647,8 +647,19 @@ void MessageUtil::unpackTo(const ProtobufWkt::Any& any_message, Protobuf::Messag any_message_with_fixup.DebugString())); } Config::VersionConverter::annotateWithOriginalType(*earlier_version_desc, message); - MessageUtil::onVersionUpgradeWarn(any_full_name); - return; + // To exclude rejecting below v2 protos. + std::set exclude_v2_protos{ + "envoy.config.health_checker.redis.v2", + "envoy.config.filter.thrift.router.v2alpha1", + "envoy.config.resource_monitor.fixed_heap.v2alpha", + "envoy.config.resource_monitor.injected_resource.v2alpha", + "envoy.config.retry.omit_canary_hosts.v2", + "envoy.config.retry.previous_hosts.v2"}; + auto itr = exclude_v2_protos.find(any_full_name); + if (itr == exclude_v2_protos.end()) { + MessageUtil::onVersionUpgradeWarn(any_full_name); + return; + } } } // Otherwise, just unpack to the message. Type URL mismatches will be signaled From 044180cd3cc9debd1c982bd0cf77fb0e0d646301 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Mon, 21 Dec 2020 23:01:30 +0530 Subject: [PATCH 29/32] incorporate review comments by harvey to put exclude_v2_protos variable inside api_type_oracle.cc Signed-off-by: Abhay Narayan Katare --- source/common/config/api_type_oracle.cc | 9 +++++++++ source/common/config/api_type_oracle.h | 1 + source/common/protobuf/utility.cc | 9 +-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc index f6feba09828a1..de12aa65b9d26 100644 --- a/source/common/config/api_type_oracle.cc +++ b/source/common/config/api_type_oracle.cc @@ -5,6 +5,15 @@ namespace Envoy { namespace Config { +// To exclude rejecting below v2 protos. +std::set exclude_v2_protos = { + "envoy.config.health_checker.redis.v2", + "envoy.config.filter.thrift.router.v2alpha1", + "envoy.config.resource_monitor.fixed_heap.v2alpha", + "envoy.config.resource_monitor.injected_resource.v2alpha", + "envoy.config.retry.omit_canary_hosts.v2", + "envoy.config.retry.previous_hosts.v2"}; + const Protobuf::Descriptor* ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) { const auto previous_message_string = getEarlierVersionMessageTypeName(message_type); diff --git a/source/common/config/api_type_oracle.h b/source/common/config/api_type_oracle.h index ab5e75b113d78..be1c80911e796 100644 --- a/source/common/config/api_type_oracle.h +++ b/source/common/config/api_type_oracle.h @@ -8,6 +8,7 @@ namespace Envoy { namespace Config { +extern std::set exclude_v2_protos; class ApiTypeOracle { public: diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index 2a444bc5d14a3..ec02ca629e63b 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -22,6 +22,7 @@ #include "yaml-cpp/yaml.h" using namespace std::chrono_literals; +using namespace Envoy::Config; namespace Envoy { namespace { @@ -647,14 +648,6 @@ void MessageUtil::unpackTo(const ProtobufWkt::Any& any_message, Protobuf::Messag any_message_with_fixup.DebugString())); } Config::VersionConverter::annotateWithOriginalType(*earlier_version_desc, message); - // To exclude rejecting below v2 protos. - std::set exclude_v2_protos{ - "envoy.config.health_checker.redis.v2", - "envoy.config.filter.thrift.router.v2alpha1", - "envoy.config.resource_monitor.fixed_heap.v2alpha", - "envoy.config.resource_monitor.injected_resource.v2alpha", - "envoy.config.retry.omit_canary_hosts.v2", - "envoy.config.retry.previous_hosts.v2"}; auto itr = exclude_v2_protos.find(any_full_name); if (itr == exclude_v2_protos.end()) { MessageUtil::onVersionUpgradeWarn(any_full_name); From af59960a974d5df07fa134812960759a168a51a0 Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 7 Jan 2021 23:00:17 +0530 Subject: [PATCH 30/32] incorporated review commnets of putting logic inside api_type_oracle.cc Signed-off-by: Abhay Narayan Katare --- source/common/config/BUILD | 1 + source/common/config/api_type_oracle.cc | 23 +++++++++++++++-------- source/common/config/api_type_oracle.h | 2 +- source/common/protobuf/utility.cc | 7 ++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/source/common/config/BUILD b/source/common/config/BUILD index 067f1d9ada0f0..9ebdb02053407 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -13,6 +13,7 @@ envoy_cc_library( srcs = ["api_type_oracle.cc"], hdrs = ["api_type_oracle.h"], deps = [ + "//source/common/common:macros", "//source/common/protobuf", "//source/common/protobuf:type_util_lib", "@com_github_cncf_udpa//udpa/annotations:pkg_cc_proto", diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc index de12aa65b9d26..29fb97d8898af 100644 --- a/source/common/config/api_type_oracle.cc +++ b/source/common/config/api_type_oracle.cc @@ -6,13 +6,15 @@ namespace Envoy { namespace Config { // To exclude rejecting below v2 protos. -std::set exclude_v2_protos = { - "envoy.config.health_checker.redis.v2", - "envoy.config.filter.thrift.router.v2alpha1", - "envoy.config.resource_monitor.fixed_heap.v2alpha", - "envoy.config.resource_monitor.injected_resource.v2alpha", - "envoy.config.retry.omit_canary_hosts.v2", - "envoy.config.retry.previous_hosts.v2"}; +using Exclude_v2_protosSet = std::set; +static const Exclude_v2_protosSet& exclude_v2_protosSet() { + CONSTRUCT_ON_FIRST_USE( + Exclude_v2_protosSet, + {"envoy.config.health_checker.redis.v2", "envoy.config.filter.thrift.router.v2alpha1", + "envoy.config.resource_monitor.fixed_heap.v2alpha", + "envoy.config.resource_monitor.injected_resource.v2alpha", + "envoy.config.retry.omit_canary_hosts.v2", "envoy.config.retry.previous_hosts.v2"}); +} const Protobuf::Descriptor* ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) { @@ -21,7 +23,12 @@ ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) { const Protobuf::Descriptor* earlier_desc = Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName( previous_message_string.value()); - return earlier_desc; + auto itr = exclude_v2_protosSet().find(earlier_desc->full_name()); + const Protobuf::Descriptor* earlier_desc_exclude_v2_protos; + if (itr == exclude_v2_protosSet().end()) { + earlier_desc_exclude_v2_protos = earlier_desc; + } + return earlier_desc_exclude_v2_protos; } else { return nullptr; } diff --git a/source/common/config/api_type_oracle.h b/source/common/config/api_type_oracle.h index be1c80911e796..2f356ee0009f6 100644 --- a/source/common/config/api_type_oracle.h +++ b/source/common/config/api_type_oracle.h @@ -1,5 +1,6 @@ #pragma once +#include "common/common/macros.h" #include "common/protobuf/protobuf.h" #include "common/protobuf/type_util.h" @@ -8,7 +9,6 @@ namespace Envoy { namespace Config { -extern std::set exclude_v2_protos; class ApiTypeOracle { public: diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index 527ce024992af..6a4dbc6a2ca61 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -657,11 +657,8 @@ void MessageUtil::unpackTo(const ProtobufWkt::Any& any_message, Protobuf::Messag any_message_with_fixup.DebugString())); } Config::VersionConverter::annotateWithOriginalType(*earlier_version_desc, message); - auto itr = exclude_v2_protos.find(any_full_name); - if (itr == exclude_v2_protos.end()) { - MessageUtil::onVersionUpgradeDeprecation(any_full_name); - return; - } + MessageUtil::onVersionUpgradeDeprecation(any_full_name); + return; } } // Otherwise, just unpack to the message. Type URL mismatches will be signaled From 8cec235d1d20086f20bbe01845adab88efd4f1ae Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Thu, 7 Jan 2021 23:00:17 +0530 Subject: [PATCH 31/32] incorporated review commnets of putting logic inside api_type_oracle.cc Signed-off-by: Abhay Narayan Katare --- source/common/config/BUILD | 1 + source/common/config/api_type_oracle.cc | 20 +++++++++++++------- source/common/config/api_type_oracle.h | 2 +- source/common/protobuf/utility.cc | 7 ++----- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/source/common/config/BUILD b/source/common/config/BUILD index 067f1d9ada0f0..9ebdb02053407 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -13,6 +13,7 @@ envoy_cc_library( srcs = ["api_type_oracle.cc"], hdrs = ["api_type_oracle.h"], deps = [ + "//source/common/common:macros", "//source/common/protobuf", "//source/common/protobuf:type_util_lib", "@com_github_cncf_udpa//udpa/annotations:pkg_cc_proto", diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc index de12aa65b9d26..0e9788a9b33c5 100644 --- a/source/common/config/api_type_oracle.cc +++ b/source/common/config/api_type_oracle.cc @@ -6,13 +6,15 @@ namespace Envoy { namespace Config { // To exclude rejecting below v2 protos. -std::set exclude_v2_protos = { - "envoy.config.health_checker.redis.v2", - "envoy.config.filter.thrift.router.v2alpha1", - "envoy.config.resource_monitor.fixed_heap.v2alpha", - "envoy.config.resource_monitor.injected_resource.v2alpha", - "envoy.config.retry.omit_canary_hosts.v2", - "envoy.config.retry.previous_hosts.v2"}; +using Exclude_v2_protosSet = std::set; +static const Exclude_v2_protosSet& exclude_v2_protosSet() { + CONSTRUCT_ON_FIRST_USE( + Exclude_v2_protosSet, + {"envoy.config.health_checker.redis.v2", "envoy.config.filter.thrift.router.v2alpha1", + "envoy.config.resource_monitor.fixed_heap.v2alpha", + "envoy.config.resource_monitor.injected_resource.v2alpha", + "envoy.config.retry.omit_canary_hosts.v2", "envoy.config.retry.previous_hosts.v2"}); +} const Protobuf::Descriptor* ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) { @@ -21,6 +23,10 @@ ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) { const Protobuf::Descriptor* earlier_desc = Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName( previous_message_string.value()); + auto itr = exclude_v2_protosSet().find(earlier_desc->full_name()); + if (itr != exclude_v2_protosSet().end()) { + return nullptr; + } return earlier_desc; } else { return nullptr; diff --git a/source/common/config/api_type_oracle.h b/source/common/config/api_type_oracle.h index be1c80911e796..2f356ee0009f6 100644 --- a/source/common/config/api_type_oracle.h +++ b/source/common/config/api_type_oracle.h @@ -1,5 +1,6 @@ #pragma once +#include "common/common/macros.h" #include "common/protobuf/protobuf.h" #include "common/protobuf/type_util.h" @@ -8,7 +9,6 @@ namespace Envoy { namespace Config { -extern std::set exclude_v2_protos; class ApiTypeOracle { public: diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index 527ce024992af..6a4dbc6a2ca61 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -657,11 +657,8 @@ void MessageUtil::unpackTo(const ProtobufWkt::Any& any_message, Protobuf::Messag any_message_with_fixup.DebugString())); } Config::VersionConverter::annotateWithOriginalType(*earlier_version_desc, message); - auto itr = exclude_v2_protos.find(any_full_name); - if (itr == exclude_v2_protos.end()) { - MessageUtil::onVersionUpgradeDeprecation(any_full_name); - return; - } + MessageUtil::onVersionUpgradeDeprecation(any_full_name); + return; } } // Otherwise, just unpack to the message. Type URL mismatches will be signaled From b448eb1e4642b84e4cb43b3e886724d183eb8f2f Mon Sep 17 00:00:00 2001 From: Abhay Narayan Katare Date: Sun, 17 Jan 2021 21:42:31 +0530 Subject: [PATCH 32/32] putting debug log to trace the issue Signed-off-by: Abhay Narayan Katare --- ci/windows_ci_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/windows_ci_steps.sh b/ci/windows_ci_steps.sh index fd3497e8474d3..7b3cc370ff193 100755 --- a/ci/windows_ci_steps.sh +++ b/ci/windows_ci_steps.sh @@ -46,7 +46,7 @@ export TEST_TMPDIR=${BUILD_DIR}/tmp BAZEL_STARTUP_OPTIONS+=("--output_base=${TEST_TMPDIR/\/c/c:}") BAZEL_BUILD_OPTIONS=( - -c opt + -c dbg --show_task_finish --verbose_failures "--test_output=errors"