Revert "udp_session_filters: add HTTP capsule filter (envoyproxy#29569)…

…" (envoyproxy#29714)

This reverts commit e953245.

This change broke the compile_time_options CI job.

Signed-off-by: Greg Greenway <[email protected]>

api/BUILD

@@ -236,7 +236,6 @@ proto_library(
         "//envoy/extensions/filters/network/wasm/v3:pkg",
         "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg",
         "//envoy/extensions/filters/udp/dns_filter/v3:pkg",
-        "//envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3:pkg",
         "//envoy/extensions/filters/udp/udp_proxy/v3:pkg",
         "//envoy/extensions/formatter/cel/v3:pkg",
         "//envoy/extensions/formatter/metadata/v3:pkg",

api/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.proto

@@ -127,6 +127,5 @@ message UdpProxyConfig {
 
   // Optional session filters that will run for each UDP session.
   // Only one of use_per_packet_load_balancing or session_filters can be used.
-  // [#extension-category: envoy.filters.udp.session]
   repeated SessionFilter session_filters = 11;
 }

api/versioning/BUILD

@@ -174,7 +174,6 @@ proto_library(
         "//envoy/extensions/filters/network/wasm/v3:pkg",
         "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg",
         "//envoy/extensions/filters/udp/dns_filter/v3:pkg",
-        "//envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3:pkg",
         "//envoy/extensions/filters/udp/udp_proxy/v3:pkg",
         "//envoy/extensions/formatter/cel/v3:pkg",
         "//envoy/extensions/formatter/metadata/v3:pkg",

changelogs/current.yaml

@@ -256,10 +256,6 @@ new_features:
   change: |
     added :ref:` stats prefix option<envoy_v3_api_field_extensions.stat_sinks.open_telemetry.v3.SinkConfig.stats_prefix>`
     to OTLP stats sink that enables adding a static prefix to all stats flushed by this sink.
-- area: udp_proxy
-  change: |
-    added :ref:`http_capsule <envoy_v3_api_msg_extensions.filters.udp.udp_proxy.session.http_capsule.v3.FilterConfig>` UDP session filter
-    that can be used to encapsule or decapsulate UDP datagrams in HTTP, when used for UDP tunneling.
 - area: tap
   change: |
     added :ref:`record_headers_received_time <envoy_v3_api_field_extensions.filters.http.tap.v3.Tap.record_headers_received_time>`

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

@@ -8,7 +8,6 @@ Filters
   listener/listener
   network/network
   udp/udp
-  udp/session
   http/http
   dubbo/dubbo
   thrift/thrift

docs/root/configuration/listeners/udp_filters/udp_proxy.rst

@@ -89,13 +89,6 @@ upstream, similar to network filters.
   Additionally, since :ref:`per packet load balancing <envoy_v3_api_field_extensions.filters.udp.udp_proxy.v3.UdpProxyConfig.use_per_packet_load_balancing>` require
   choosing the upstream host for each received datagram, session filters can't be used when this option is enabled.
 
-Envoy has the following builtin UDP session filters.
-
-.. toctree::
-  :maxdepth: 2
-
-  session_filters/http_capsule
-
 Example configuration
 ---------------------
 

source/extensions/extensions_build_config.bzl

@@ -213,12 +213,6 @@ 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",
-
     #
     # Resource monitors
     #

source/extensions/extensions_metadata.yaml

@@ -749,13 +749,6 @@ envoy.filters.udp_listener.udp_proxy:
   status: stable
   type_urls:
   - envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig
-envoy.filters.udp.session.http_capsule:
-  categories:
-  - envoy.filters.udp.session
-  security_posture: robust_to_untrusted_downstream
-  status: alpha
-  type_urls:
-  - envoy.extensions.filters.udp.udp_proxy.session.http_capsule.v3.FilterConfig
 envoy.formatter.cel:
   categories:
   - envoy.formatter

source/extensions/filters/udp/udp_proxy/session_filters/filter_config.h

@@ -33,7 +33,7 @@ class NamedUdpSessionFilterConfigFactory : public Envoy::Config::TypedFactory {
   createFilterFactoryFromProto(const Protobuf::Message& config,
                                Server::Configuration::FactoryContext& context) PURE;
 
-  std::string category() const override { return "envoy.filters.udp.session"; }
+  std::string category() const override { return "envoy.udp.session_filters"; }
 };
 
 } // namespace SessionFilters