comment

Signed-off-by: Matt Klein <mklein@lyft.com>
envoyproxy · Jun 5, 2019 · 0ee5e15 · 0ee5e15
1 parent b2222be
commit 0ee5e15
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/docs/root/intro/deprecated.rst b/docs/root/intro/deprecated.rst
@@ -24,6 +24,8 @@ Version 1.11.0 (Pending)
 * Specifying "deprecated_v1: true" in HTTP and network filter configuration to allow loading JSON
   configuration is now deprecated and will be removed in a following release. Update any custom
   filters to use protobuf configuration. A struct can be used for a mostly 1:1 conversion if needed.
+  The `envoy.deprecated_features.v1_filter_json_config` runtime key can be used to temporarily
+  enable this feature once the deprecation becomes fail by default.
 
 Version 1.10.0 (Apr 5, 2019)
 ============================

diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc
@@ -295,7 +295,9 @@ bool Utility::allowDeprecatedV1Config(Runtime::Loader& runtime, const Json::Obje
   constexpr char error[] =
       "Using deprecated v1 JSON config load via 'deprecated_v1: true'. This configuration will "
       "be removed from Envoy soon. Please see "
-      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details.";
+      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details. The "
+      "`envoy.deprecated_features.v1_filter_json_config` runtime key can be used to temporarily "
+      "enable this feature once the deprecation becomes fail by default.";
 
   if (!runtime.snapshot().deprecatedFeatureEnabled(
           "envoy.deprecated_features.v1_filter_json_config")) {

diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc
@@ -187,7 +187,9 @@ TEST(UtilityTest, AllowDeprecatedV1Config) {
       Utility::allowDeprecatedV1Config(runtime, *v1_config), EnvoyException,
       "Using deprecated v1 JSON config load via 'deprecated_v1: true'. This configuration will be "
       "removed from Envoy soon. Please see "
-      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details.");
+      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details. The "
+      "`envoy.deprecated_features.v1_filter_json_config` runtime key can be used to temporarily "
+      "enable this feature once the deprecation becomes fail by default.");
 
   // v1 config, runtime allowed.
   EXPECT_CALL(runtime.snapshot_,
@@ -197,7 +199,9 @@ TEST(UtilityTest, AllowDeprecatedV1Config) {
       "warning",
       "Using deprecated v1 JSON config load via 'deprecated_v1: true'. This configuration will be "
       "removed from Envoy soon. Please see "
-      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details.",
+      "https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated for details. The "
+      "`envoy.deprecated_features.v1_filter_json_config` runtime key can be used to temporarily "
+      "enable this feature once the deprecation becomes fail by default.",
       Utility::allowDeprecatedV1Config(runtime, *v1_config));
 }