extensions: update straggler v2 extensions to v3.

* Add v3 equivalents of v2 configs that were included in v3 due to no
  transitive deprecation. This increases consistency and reduces user
  confusion. We will continue to support these straggler v2 configs
  beyond the v2 turndown due to the late addition of v3 counterparts,
  special case code is added to utility.cc to handle this.

* There were two extensions, //envoy/config/cluster/redis and
  //envoy/config/retry/previous_priorities, that for some reason were
  not upgraded to use v3 config. This is now fixed and I've grepped for
  other v2 in //source, none remain.

Risk level: Medium (changes to extension config types and deprecated
  config handling).
Testing: Additional unit test added for utility.cc handling, upgraded
  configs to v3 for other tests.

Fixes envoyproxy#14735
Fixes envoyproxy#12841

Signed-off-by: Harvey Tuch <htuch@google.com>
Co-authored-by: Abhay Narayan Katare <abhay.katare@india.nec.com>

api/BUILD

@@ -144,9 +144,7 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
-        "//envoy/config/retry/omit_canary_hosts/v3:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
-        "//envoy/config/retry/previous_hosts/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/config/trace/v3:pkg",
@@ -239,12 +237,17 @@ 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/rate_limit_descriptors/expr/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",
         "//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
         "//envoy/extensions/stat_sinks/wasm/v3:pkg",
         "//envoy/extensions/transport_sockets/alts/v3:pkg",

api/envoy/config/retry/omit_canary_hosts/v2/omit_canary_hosts.proto

@@ -2,11 +2,14 @@ syntax = "proto3";
 
 package envoy.config.retry.omit_canary_hosts.v2;
 
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 
 option java_package = "io.envoyproxy.envoy.config.retry.omit_canary_hosts.v2";
 option java_outer_classname = "OmitCanaryHostsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_migrate).move_to_package =
+    "envoy.extensions.retry.host.omit_canary_hosts.v3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Omit Canary Hosts Predicate]

api/envoy/config/retry/previous_hosts/v2/previous_hosts.proto

@@ -2,11 +2,14 @@ syntax = "proto3";
 
 package envoy.config.retry.previous_hosts.v2;
 
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 
 option java_package = "io.envoyproxy.envoy.config.retry.previous_hosts.v2";
 option java_outer_classname = "PreviousHostsProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_migrate).move_to_package =
+    "envoy.extensions.retry.host.previous_hosts.v3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Previous Hosts Predicate]

api/envoy/config/retry/previous_priorities/previous_priorities_config.proto

@@ -2,12 +2,15 @@ syntax = "proto3";
 
 package envoy.config.retry.previous_priorities;
 
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities";
 option java_outer_classname = "PreviousPrioritiesConfigProto";
 option java_multiple_files = true;
+option (udpa.annotations.file_migrate).move_to_package =
+    "envoy.extensions.retry.priority.previous_priorities.v3";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Previous priorities retry selector]

api/envoy/config/retry/omit_canary_hosts/v3/BUILD → 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",
+    ],
 )

api/envoy/extensions/health_checkers/redis/v3/redis.proto

@@ -0,0 +1,26 @@
+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 <config_health_checkers_redis>`.
+// [#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 <key>`` 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;
+}

api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD

@@ -0,0 +1,12 @@
+# 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 = [
+        "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
+)

api/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package envoy.extensions.resource_monitors.fixed_heap.v3;
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.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 {
+  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}];
+}

api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD

@@ -0,0 +1,12 @@
+# 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 = [
+        "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
+)

api/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.proto

@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package envoy.extensions.resource_monitors.injected_resource.v3;
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.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 {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.resource_monitor.injected_resource.v2alpha.InjectedResourceConfig";
+
+  string filename = 1 [(validate.rules).string = {min_len: 1}];
+}

api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD

@@ -0,0 +1,12 @@
+# 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 = [
+        "//envoy/config/retry/omit_canary_hosts/v2:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
+)

generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/omit_canary_hosts.proto → api/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
-package envoy.config.retry.omit_canary_hosts.v3;
+package envoy.extensions.retry.host.omit_canary_hosts.v3;
 
 import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
 
-option java_package = "io.envoyproxy.envoy.config.retry.omit_canary_hosts.v3";
+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;
@@ -13,4 +14,6 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // [#extension: envoy.retry_host_predicates.omit_canary_hosts]
 
 message OmitCanaryHostsPredicate {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.retry.omit_canary_hosts.v2.OmitCanaryHostsPredicate";
 }

generated_api_shadow/envoy/config/retry/omit_canary_hosts/v3/BUILD → api/envoy/extensions/retry/host/previous_hosts/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/retry/previous_hosts/v2:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
 )

generated_api_shadow/envoy/config/retry/previous_hosts/v3/previous_hosts.proto → api/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
-package envoy.config.retry.previous_hosts.v3;
+package envoy.extensions.retry.host.previous_hosts.v3;
 
 import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
 
-option java_package = "io.envoyproxy.envoy.config.retry.previous_hosts.v3";
+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;
@@ -13,4 +14,6 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // [#extension: envoy.retry_host_predicates.previous_hosts]
 
 message PreviousHostsPredicate {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.retry.previous_hosts.v2.PreviousHostsPredicate";
 }

api/versioning/BUILD

@@ -27,9 +27,7 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
-        "//envoy/config/retry/omit_canary_hosts/v3:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
-        "//envoy/config/retry/previous_hosts/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/config/trace/v3:pkg",
@@ -122,12 +120,17 @@ 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/rate_limit_descriptors/expr/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",
         "//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
         "//envoy/extensions/stat_sinks/wasm/v3:pkg",
         "//envoy/extensions/transport_sockets/alts/v3:pkg",

docs/root/api-v3/config/health_checker/health_checker.rst

@@ -5,4 +5,5 @@ Health checkers
   :glob:
   :maxdepth: 2
 
-  */v2/*
+  */v2/*
+  ../../extensions/health_checkers/*/v3/*

docs/root/api-v3/config/resource_monitor/resource_monitor.rst

@@ -7,4 +7,5 @@ Resource monitors
   :glob:
   :maxdepth: 2
 
+  ../../extensions/resource_monitors/*/v3/*
   */v2alpha/*

docs/root/api-v3/config/retry/retry.rst

@@ -7,5 +7,4 @@ Retry Predicates
 
   */empty/*
   */v2/*
-  */v3/*
   ../../extensions/retry/**/v3/*

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 <envoy_v3_api_field_config.health_checker.redis.v2.Redis.key>` to any value and waiting
+specified :ref:`key <envoy_v3_api_field_extensions.health_checkers.redis.v3.Redis.key>` to any value and waiting
 for traffic to drain.
 
 An example setting for :ref:`custom_health_check <envoy_v3_api_msg_config.core.v3.HealthCheck.CustomHealthCheck>` as a

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 <envoy_v3_api_msg_config.health_checker.redis.v2.Redis>`.
+  :ref:`redis_key <envoy_v3_api_msg_extensions.health_checkers.redis.v3.Redis>`.
 
 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

generated_api_shadow/BUILD

@@ -144,7 +144,6 @@ proto_library(
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
         "//envoy/config/retry/omit_canary_hosts/v2:pkg",
-        "//envoy/config/retry/omit_canary_hosts/v3:pkg",
         "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",
@@ -238,12 +237,17 @@ 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/rate_limit_descriptors/expr/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",
         "//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
         "//envoy/extensions/stat_sinks/wasm/v3:pkg",
         "//envoy/extensions/transport_sockets/alts/v3:pkg",