Update Envoy (#2669)

* Update Envoy * Remove uses of c-ares * Register static cluster extension * Fix KV store APIs Co-authored-by: Alyssa Wilk <[email protected]> Signed-off-by: JP Simard <[email protected]>
envoyproxy · Nov 28, 2022 · bf327c0 · bf327c0
1 parent 6245dbf
commit bf327c0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/mobile/envoy b/mobile/envoy
diff --git a/mobile/envoy_build_config/BUILD b/mobile/envoy_build_config/BUILD
@@ -15,8 +15,9 @@ envoy_cc_library(
         "extension_registry_platform_additions",
         "@envoy//source/common/network:socket_lib",
         "@envoy//source/common/router:upstream_codec_filter_lib",
-        "@envoy//source/extensions/clusters/logical_dns:logical_dns_cluster_lib",
         "@envoy//source/extensions/clusters/dynamic_forward_proxy:cluster",
+        "@envoy//source/extensions/clusters/logical_dns:logical_dns_cluster_lib",
+        "@envoy//source/extensions/clusters/static:static_cluster_lib",
         "@envoy//source/extensions/compression/brotli/decompressor:config",
         "@envoy//source/extensions/compression/gzip/decompressor:config",
         "@envoy//source/extensions/filters/http/alternate_protocols_cache:config",

diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc
@@ -5,6 +5,7 @@
 #include "source/common/router/upstream_codec_filter.h"
 #include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
 #include "source/extensions/clusters/logical_dns/logical_dns_cluster.h"
+#include "source/extensions/clusters/static/static_cluster.h"
 #include "source/extensions/compression/brotli/decompressor/config.h"
 #include "source/extensions/compression/gzip/decompressor/config.h"
 #include "source/extensions/filters/http/alternate_protocols_cache/config.h"
@@ -35,6 +36,7 @@
 namespace Envoy {
 
 void ExtensionRegistry::registerFactories() {
+  Envoy::Upstream::forceRegisterStaticClusterFactory();
   Envoy::Extensions::Clusters::DynamicForwardProxy::forceRegisterClusterFactory();
   Envoy::Extensions::Compression::Brotli::Decompressor::
       forceRegisterBrotliDecompressorLibraryFactory();

diff --git a/mobile/envoy_build_config/extensions_build_config.bzl b/mobile/envoy_build_config/extensions_build_config.bzl
@@ -5,6 +5,7 @@ EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
 EXTENSIONS = {
     "envoy.clusters.dynamic_forward_proxy":                "//source/extensions/clusters/dynamic_forward_proxy:cluster",
     "envoy.clusters.logical_dns":                          "//source/extensions/clusters/logical_dns:logical_dns_cluster_lib",
+    "envoy.clusters.static":                               "//source/extensions/clusters/static:static_cluster_lib",
     "envoy.filters.connection_pools.http.generic":         "//source/extensions/upstreams/http/generic:config",
     "envoy.filters.http.alternate_protocols_cache":        "//source/extensions/filters/http/alternate_protocols_cache:config",
     "envoy.filters.http.assertion":                        "@envoy_mobile//library/common/extensions/filters/http/assertion:config",

diff --git a/mobile/library/common/extensions/key_value/platform/config.cc b/mobile/library/common/extensions/key_value/platform/config.cc
@@ -62,8 +62,8 @@ PlatformKeyValueStore::PlatformKeyValueStore(Event::Dispatcher& dispatcher,
 
 void PlatformKeyValueStore::flush() {
   std::string output;
-  for (const auto& [key, value] : store_) {
-    std::string string_value = value.first;
+  for (const auto& [key, value_with_ttl] : store()) {
+    std::string string_value = value_with_ttl.value_;
     absl::StrAppend(&output, key.length(), "\n", key, string_value.length(), "\n", string_value);
   }
   platform_interface_.save(key_, output);

diff --git a/mobile/library/common/jni/jni_interface.cc b/mobile/library/common/jni/jni_interface.cc
@@ -1,5 +1,3 @@
-#include <ares.h>
-
 #include "library/common/api/c_types.h"
 #include "library/common/data/utility.h"
 #include "library/common/extensions/filters/http/platform_bridge/c_types.h"