tracking envoy main 20260204

api/envoy/config/filter/http/transformation/v2/BUILD

@@ -16,7 +16,7 @@ api_proto_package(
         "@envoy_api//envoy/type:pkg",
         "@envoy_api//envoy/type/matcher/v3:pkg",
         "@envoy_api//envoy/type/matcher:pkg",
-        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
+        "@xds//xds/type/matcher/v3:pkg",
     ],
     visibility = ["//visibility:public"],
 )

bazel/extensions/extensions_build_config.bzl

@@ -595,7 +595,7 @@ EXTENSIONS = {
     "envoy.geoip_providers.maxmind":                         "//source/extensions/geoip_providers/maxmind:config",
 
     #
-    # cluster specifier plugin
+    # Cluster specifier plugin
     #
     "envoy.router.cluster_specifier_plugin.lua":     "//source/extensions/router/cluster_specifiers/lua:config",
     "envoy.router.cluster_specifier_plugin.matcher": "//source/extensions/router/cluster_specifiers/matcher:config",
@@ -614,8 +614,9 @@ EXTENSIONS = {
     "envoy.tls.certificate_selectors.on_demand_secret":                  "//source/extensions/transport_sockets/tls/cert_selectors/on_demand:config",
 
     # Certificate mappers
-    "envoy.tls.certificate_mappers.static_name":                  "//source/extensions/transport_sockets/tls/cert_mappers/static_name:config",
-    "envoy.tls.certificate_mappers.sni":                  "//source/extensions/transport_sockets/tls/cert_mappers/sni:config",
+    "envoy.tls.certificate_mappers.sni":                            "//source/extensions/transport_sockets/tls/cert_mappers/sni:config",
+    "envoy.tls.certificate_mappers.static_name":                    "//source/extensions/transport_sockets/tls/cert_mappers/static_name:config",
+    "envoy.tls.upstream_certificate_mappers.filter_state_override": "//source/extensions/transport_sockets/tls/cert_mappers/filter_state_override:config",
 
     # Local address selectors
     "envoy.upstream.local_address_selector.filter_state_override": "//source/extensions/local_address_selectors/filter_state_override:config",

bazel/repository_locations.bzl

@@ -2,8 +2,8 @@ REPOSITORY_LOCATIONS = dict(
     # can't have more than one comment between envoy line and commit line in
     # order to accommodate `check_extensions_build_config.sh`
     envoy = dict(
-        # envoy v1.37.0
-        commit = "6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3",
+        # envoy main_20260205
+        commit = "c2827dce46390aa88bffa84df3553239cfda0e66",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(

changelog/v1.38.0-beta1/track-envoy-main-20260204.yaml

@@ -0,0 +1,4 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >-
+      Experimental tracking Envoy main 20260204

test/extensions/filters/http/transformation/BUILD

@@ -50,10 +50,11 @@ envoy_cc_test_binary(
     repository = "@envoy",
     deps = [
         "//source/extensions/filters/http/transformation:inja_transformer_lib",
+        "@envoy//test/benchmark:main",
         "@envoy//test/mocks/http:http_mocks",
         "@envoy//test/mocks/server:server_mocks",
         "@envoy//test/mocks/upstream:upstream_mocks",
-        "@com_github_google_benchmark//:benchmark",
+        "@benchmark",
     ],
 )