Update envoy to 90fb3c8 (2022-04-11) (#828)

- Updated .bazelversion - Reacted to changes in envoyproxy/envoy#20397. Proto extensions are now looked up by @type rather than name in envoy. Getting onto this standard is too much work for this nighthawk update, so instead: - Added a runtime override for all integration test yaml files - Added a runtime override for fake stats sink in the proccess_test unit test Signed-off-by: Nathan Perry <nbperry@google.com>
envoyproxy · Apr 13, 2022 · 46387e5 · 46387e5
1 parent 5f72e3d
commit 46387e5
Showing 9 changed files with 35 additions and 3 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-5.0.0
+5.1.1
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "8cf3a2b9f619f5ca5650a40fb325d6d552ceb8ec"  # Apr 4, 2022
-ENVOY_SHA = "0423ea507c6bc65d266657c96a97a4c8950f3136130332717e4c600379fd5234"
+ENVOY_COMMIT = "90fb3c8baa81651e0af865c298b1934df818a4dd"  # Apr 11, 2022
+ENVOY_SHA = "ed86a0f9e62fdb415cc7587419796a2afb99b0245592867c6cae2f55c84872f2"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"

diff --git a/test/BUILD b/test/BUILD
@@ -155,6 +155,7 @@ envoy_cc_test(
         "@envoy//test/test_common:network_utility_lib",
         "@envoy//test/test_common:registry_lib",
         "@envoy//test/test_common:simulated_time_system_lib",
+        "@envoy//test/test_common:test_runtime_lib",
     ],
 )
 

diff --git a/test/integration/configurations/nighthawk_http_origin.yaml b/test/integration/configurations/nighthawk_http_origin.yaml
@@ -40,3 +40,8 @@ static_resources:
             typed_config:
               "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
               dynamic_stats: false
+layered_runtime:
+  layers:
+  - name: static_layer
+    static_layer:
+      envoy.reloadable_features.no_extension_lookup_by_name: false
diff --git a/test/integration/configurations/nighthawk_https_origin.yaml b/test/integration/configurations/nighthawk_https_origin.yaml
@@ -51,3 +51,8 @@ static_resources:
                     private_key:
                       inline_string: |
                         @inject-runfile:nighthawk/external/envoy/test/config/integration/certs/serverkey.pem
+layered_runtime:
+  layers:
+  - name: static_layer
+    static_layer:
+      envoy.reloadable_features.no_extension_lookup_by_name: false
diff --git a/test/integration/configurations/nighthawk_https_origin_quic.yaml b/test/integration/configurations/nighthawk_https_origin_quic.yaml
@@ -56,3 +56,9 @@ static_resources:
                       private_key:
                           inline_string: |
                             @inject-runfile:nighthawk/external/envoy/test/config/integration/certs/serverkey.pem
+layered_runtime:
+  layers:
+  - name: static_layer
+    static_layer:
+      envoy.reloadable_features.no_extension_lookup_by_name: false
+
diff --git a/test/integration/configurations/nighthawk_track_timings.yaml b/test/integration/configurations/nighthawk_track_timings.yaml
@@ -44,3 +44,8 @@ static_resources:
             typed_config:
               "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
               dynamic_stats: false
+layered_runtime:
+  layers:
+  - name: static_layer
+    static_layer:
+      envoy.reloadable_features.no_extension_lookup_by_name: false
diff --git a/test/integration/configurations/sni_origin.yaml b/test/integration/configurations/sni_origin.yaml
@@ -97,3 +97,8 @@ static_resources:
             typed_config:
               "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
               dynamic_stats: false
+layered_runtime:
+  layers:
+  - name: static_layer
+    static_layer:
+      envoy.reloadable_features.no_extension_lookup_by_name: false
diff --git a/test/process_test.cc b/test/process_test.cc
@@ -9,6 +9,7 @@
 #include "external/envoy/test/test_common/network_utility.h"
 #include "external/envoy/test/test_common/registry.h"
 #include "external/envoy/test/test_common/simulated_time_system.h"
+#include "external/envoy/test/test_common/test_runtime.h"
 #include "external/envoy/test/test_common/utility.h"
 
 #include "source/client/options_impl.h"
@@ -173,6 +174,10 @@ TEST_P(ProcessTest, CancelExecutionBeforeBeginLoadTest) {
 }
 
 TEST_P(ProcessTest, RunProcessWithStatsSinkConfigured) {
+  // TODO(Dubious90): Instead of applying this flag, move the factory into its own file, register
+  // it, and call it by its type
+  Envoy::TestScopedRuntime scoped_runtime;
+  scoped_runtime.mergeValues({{"envoy.reloadable_features.no_extension_lookup_by_name", "false"}});
   FakeStatsSinkFactory factory;
   Envoy::Registry::InjectFactory<NighthawkStatsSinkFactory> registered(factory);
   options_ = TestUtility::createOptionsImpl(