Merge branch 'main' into regex_extractor_revision

solo-io · Feb 29, 2024 · 3b19e65 · 3b19e65
2 parents 5fcb545 + 83cc901
commit 3b19e65
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,4 @@ bazel.output.txt
 bazel/setup_clang.sh
 ci/WORKSPACE.filter.example
 test.bazelrc
-tools/shell_utils.sh
 upstream.bazelrc
diff --git a/bazel/extensions/extensions_build_config.bzl b/bazel/extensions/extensions_build_config.bzl
@@ -150,6 +150,7 @@ EXTENSIONS = {
     "envoy.filters.http.header_to_metadata":            "//source/extensions/filters/http/header_to_metadata:config",
     "envoy.filters.http.health_check":                  "//source/extensions/filters/http/health_check:config",
     "envoy.filters.http.ip_tagging":                    "//source/extensions/filters/http/ip_tagging:config",
+    "envoy.filters.http.json_to_metadata":              "//source/extensions/filters/http/json_to_metadata:config",
     "envoy.filters.http.jwt_authn":                     "//source/extensions/filters/http/jwt_authn:config",
     # "envoy.filters.http.rate_limit_quota":              "//source/extensions/filters/http/rate_limit_quota:config",
     # Disabled by default
@@ -162,6 +163,7 @@ EXTENSIONS = {
     "envoy.filters.http.ratelimit":                     "//source/extensions/filters/http/ratelimit:config",
     "envoy.filters.http.rbac":                          "//source/extensions/filters/http/rbac:config",
     "envoy.filters.http.router":                        "//source/extensions/filters/http/router:config",
+    "envoy.filters.http.set_filter_state":              "//source/extensions/filters/http/set_filter_state:config",
     "envoy.filters.http.set_metadata":                  "//source/extensions/filters/http/set_metadata:config",
     "envoy.filters.http.tap":                           "//source/extensions/filters/http/tap:config",
     "envoy.filters.http.wasm":                          "//source/extensions/filters/http/wasm:config",
@@ -200,6 +202,7 @@ EXTENSIONS = {
     "envoy.filters.network.redis_proxy":                          "//source/extensions/filters/network/redis_proxy:config",
     "envoy.filters.network.tcp_proxy":                            "//source/extensions/filters/network/tcp_proxy:config",
     "envoy.filters.network.thrift_proxy":                         "//source/extensions/filters/network/thrift_proxy:config",
+    "envoy.filters.network.set_filter_state":                     "//source/extensions/filters/network/set_filter_state:config",
     "envoy.filters.network.sni_cluster":                          "//source/extensions/filters/network/sni_cluster:config",
     "envoy.filters.network.sni_dynamic_forward_proxy":            "//source/extensions/filters/network/sni_dynamic_forward_proxy:config",
     "envoy.filters.network.wasm":                                 "//source/extensions/filters/network/wasm:config",
@@ -212,6 +215,13 @@ EXTENSIONS = {
     "envoy.filters.udp.dns_filter":                     "//source/extensions/filters/udp/dns_filter:config",
     "envoy.filters.udp_listener.udp_proxy":             "//source/extensions/filters/udp/udp_proxy:config",
 
+    #
+    # UDP Session filters
+    #
+
+    "envoy.filters.udp.session.http_capsule":           "//source/extensions/filters/udp/udp_proxy/session_filters/http_capsule:config",
+    "envoy.filters.udp.session.dynamic_forward_proxy":  "//source/extensions/filters/udp/udp_proxy/session_filters/dynamic_forward_proxy:config",
+
     #
     # Resource monitors
     #
@@ -238,7 +248,7 @@ EXTENSIONS = {
 
     "envoy.filters.thrift.router":                      "//source/extensions/filters/network/thrift_proxy/router:config",
     "envoy.filters.thrift.header_to_metadata":          "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:config",
-    # "envoy.filters.thrift.payload_to_metadata":         "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:config",    
+    # "envoy.filters.thrift.payload_to_metadata":         "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:config",
     "envoy.filters.thrift.rate_limit":                  "//source/extensions/filters/network/thrift_proxy/filters/ratelimit:config",
 
     #
@@ -467,6 +477,11 @@ EXTENSIONS = {
     "envoy.config_subscription.ads_collection": "//source/extensions/config_subscription/grpc:grpc_collection_subscription_lib",
     "envoy.config_mux.delta_grpc_mux_factory": "//source/extensions/config_subscription/grpc/xds_mux:grpc_mux_lib",
     "envoy.config_mux.sotw_grpc_mux_factory": "//source/extensions/config_subscription/grpc/xds_mux:grpc_mux_lib",
+
+    #
+    # Geolocation Provider
+    #
+    # "envoy.geoip_providers.maxmind":                         "//source/extensions/geoip_providers/maxmind:config",
 }
 
 # These can be changed to ["//visibility:public"], for  downstream builds which

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1,7 +1,7 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        # envoy 1.27.3 from release v1.27.3-fork1
-        commit = "ebfb8ff1944e55756318f89bea189e0470daaed0",
+        # envoy 1.28.1 with backported ext_proc updates
+        commit = "47d4c36d399b9daae47cd7f6c4d41cf75e7e3ff8",
         remote = "https://github.com/solo-io/envoy-fork",
     ),
     inja = dict(

diff --git a/changelog/v1.28.1-patch1/bump-envoy.yaml b/changelog/v1.28.1-patch1/bump-envoy.yaml
@@ -0,0 +1,8 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: envoy-fork
+  dependencyTag: v1.28.1
+  resolvesIssue: false
+  description: >-
+    Update Envoy to latest from forked 1.28.1
diff --git a/ci/cleanup_do_ci.sh b/ci/cleanup_do_ci.sh
@@ -5,6 +5,5 @@ rm -rf \
     VERSION.txt \
     bazel/setup_clang.sh \
     ci/WORKSPACE.filter.example \
-    tools/shell_utils.sh \
     test.bazelrc \
     bazel.output.txt
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -19,7 +19,6 @@ cp -f "$UPSTREAM_ENVOY_SRCDIR/.bazelrc"                    "$SOURCE_DIR/upstream
 cp -f "$UPSTREAM_ENVOY_SRCDIR/.bazelversion"               "$SOURCE_DIR/.bazelversion"
 cp -f "$UPSTREAM_ENVOY_SRCDIR/ci/WORKSPACE.filter.example" "$SOURCE_DIR/ci/"
 cp -f "$UPSTREAM_ENVOY_SRCDIR/VERSION.txt"                 "$SOURCE_DIR/VERSION.txt"
-cp -f "$UPSTREAM_ENVOY_SRCDIR/tools/shell_utils.sh"        "$SOURCE_DIR/tools"
 
 
 if [ -f "$UPSTREAM_ENVOY_SRCDIR/bazel/setup_clang.sh" ]; then

diff --git a/source/common/matcher/solo_matcher.cc b/source/common/matcher/solo_matcher.cc
@@ -38,8 +38,8 @@ class BaseMatcherImpl : public Matcher,
 
     matches &= Http::HeaderUtility::matchHeaders(headers, config_headers_);
     if (!config_query_parameters_.empty()) {
-      Http::Utility::QueryParams query_parameters =
-          Http::Utility::parseQueryString(
+      auto query_parameters =
+          Http::Utility::QueryParamsMulti::parseQueryString(
               headers.Path()->value().getStringView());
       matches &= ConfigUtility::matchQueryParams(query_parameters,
                                                  config_query_parameters_);

diff --git a/source/common/nats/streaming/BUILD b/source/common/nats/streaming/BUILD
@@ -49,6 +49,7 @@ envoy_cc_library(
     hdrs = ["connect_response_handler.h"],
     repository = "@envoy",
     deps = [
+        "@envoy//envoy/common:pure_lib",
         "//include/envoy/nats/streaming:inbox_handler_interface",
         "//source/common/nats/streaming:message_utility_lib",
     ],

diff --git a/source/extensions/filters/http/aws_lambda/config.cc b/source/extensions/filters/http/aws_lambda/config.cc
@@ -126,7 +126,7 @@ void AWSLambdaConfigImpl::loadSTSData() {
         fmt::format("Web token file {} does not exist", token_file_));
   }
 
-  web_token_ = api_.fileSystem().fileReadToEnd(token_file_);
+  web_token_ = api_.fileSystem().fileReadToEnd(token_file_).value();
   // File should not be empty
   if (web_token_ == "") {
     throw EnvoyException(
@@ -157,7 +157,7 @@ void AWSLambdaConfigImpl::AWSLambdaStsRefresher::init(Event::Dispatcher &dispatc
         try {
 
             const auto web_token = shared_this->parent_->api_.fileSystem().fileReadToEnd(
-                shared_this->parent_->token_file_);
+                shared_this->parent_->token_file_).value();
              shared_this->parent_->stats_.webtoken_rotated_.inc();
              // We enforce that it should not be empty at start up
              // but are more lenient at this point.

diff --git a/source/extensions/filters/http/transformation/transformation_logger.h b/source/extensions/filters/http/transformation/transformation_logger.h
@@ -21,4 +21,4 @@
                                        (!(TRANSFORMATION)->logRequestResponseInfo().IsInitialized() &&  \
                                        (FILTER_CONFIG)->logRequestResponseInfo())),             \
                               FORMAT, STREAM, ##__VA_ARGS__);                                         \
-    } while (0)
+    } while (0)