From c93f916f1d6598611f2832946c66c1389f9bc9c1 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 22 Dec 2023 09:50:26 -0700 Subject: [PATCH] NET-6946 - Replace usage of deprecated Envoy field envoy.config.route.v3.HeaderMatcher.safe_regex_match --- .changelog/20013.txt | 3 +++ .github/workflows/nightly-test-integrations.yml | 2 +- .github/workflows/test-integrations.yml | 2 +- Makefile | 2 +- agent/xds/rbac.go | 11 ++++++----- agent/xds/response/response.go | 6 ++---- agent/xds/routes.go | 8 ++++++-- ...t-authz-http-local-grpc-service.latest.golden | 5 ----- ...t-authz-http-local-http-service.latest.golden | 5 ----- ...uthz-http-upstream-grpc-service.latest.golden | 5 ----- ...uthz-http-upstream-http-service.latest.golden | 5 ----- .../lambda-and-lua-connect-proxy.latest.golden | 5 ----- .../lua-inbound-applies-to-inbound.latest.golden | 5 ----- ...doesnt-apply-to-local-upstreams.latest.golden | 5 ----- ...plies-to-local-upstreams-tproxy.latest.golden | 5 ----- ...ound-applies-to-local-upstreams.latest.golden | 5 ----- ...utbound-doesnt-apply-to-inbound.latest.golden | 5 ----- ...ith-consul-constraint-violation.latest.golden | 5 ----- ...with-envoy-constraint-violation.latest.golden | 5 ----- .../otel-access-logging-http.latest.golden | 5 ----- .../propertyoverride-add-keepalive.latest.golden | 5 ----- ...-add-outlier-detection-multiple.latest.golden | 5 ----- ...yoverride-add-outlier-detection.latest.golden | 5 ----- ...rride-add-round-robin-lb-config.latest.golden | 5 ----- ...ter-load-assignment-inbound-add.latest.golden | 5 ----- ...er-load-assignment-outbound-add.latest.golden | 5 ----- ...nbound-doesnt-apply-to-outbound.latest.golden | 5 ----- ...tyoverride-listener-inbound-add.latest.golden | 5 ----- ...yoverride-listener-outbound-add.latest.golden | 5 ----- ...utbound-doesnt-apply-to-inbound.latest.golden | 5 ----- ...cific-upstream-service-failover.latest.golden | 5 ----- ...cific-upstream-service-splitter.latest.golden | 5 ----- ...erride-remove-outlier-detection.latest.golden | 5 ----- .../listeners/wasm-http-local-file.latest.golden | 5 ----- .../wasm-http-remote-file.latest.golden | 5 ----- .../custom-trace-listener.latest.golden | 5 ----- .../http-listener-with-timeouts.latest.golden | 5 ----- .../listeners/http-public-listener.latest.golden | 5 ----- .../http2-public-listener.latest.golden | 5 ----- ...on-with-kitchen-sink-perms--httpfilter.golden | 16 ++++++++++------ ...on-with-kitchen-sink-perms--httpfilter.golden | 16 ++++++++++------ ...ect-proxy-with-chain-and-router.latest.golden | 16 ++++++++++------ ...h-chain-and-router-header-manip.latest.golden | 16 ++++++++++------ .../ingress-with-chain-and-router.latest.golden | 16 ++++++++++------ ...-timeout-ms-ingress-with-router.latest.golden | 16 ++++++++++------ .../xds-fetch-timeout-ms-sidecar.latest.golden | 16 ++++++++++------ agent/xdsv2/listener_resources.go | 3 --- agent/xdsv2/route_resources.go | 14 ++++++++------ test/integration/connect/envoy/main_test.go | 6 +++--- 49 files changed, 101 insertions(+), 228 deletions(-) create mode 100644 .changelog/20013.txt diff --git a/.changelog/20013.txt b/.changelog/20013.txt new file mode 100644 index 000000000000..60218329a076 --- /dev/null +++ b/.changelog/20013.txt @@ -0,0 +1,3 @@ +```release-note:improvement +xds: replace usage of deprecated Envoy field `envoy.config.route.v3.HeaderMatcher.safe_regex_match` +``` \ No newline at end of file diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml index 32e09f2e34c1..a79d102b5e5b 100644 --- a/.github/workflows/nightly-test-integrations.yml +++ b/.github/workflows/nightly-test-integrations.yml @@ -196,7 +196,7 @@ jobs: consul-version: [ "1.16", "1.17"] env: CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} - ENVOY_VERSION: "1.28.0" + ENVOY_VERSION: "1.25.4" steps: - name: Checkout code uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index ebcf70bb65d6..4dbbedf09249 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -383,7 +383,7 @@ jobs: id-token: write # NOTE: this permission is explicitly required for Vault auth. contents: read env: - ENVOY_VERSION: "1.28.0" + ENVOY_VERSION: "1.25.4" CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi" steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/Makefile b/Makefile index ca186b426f75..228c3779562b 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ GO_BUILD_TAG?=consul-build-go UI_BUILD_TAG?=consul-build-ui BUILD_CONTAINER_NAME?=consul-builder CONSUL_IMAGE_VERSION?=latest -ENVOY_VERSION?='1.28.0' +ENVOY_VERSION?='1.25.4' CONSUL_DATAPLANE_IMAGE := $(or $(CONSUL_DATAPLANE_IMAGE),"docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi") DEPLOYER_CONSUL_DATAPLANE_IMAGE := $(or $(DEPLOYER_CONSUL_DATAPLANE_IMAGE), "docker.io/hashicorppreview/consul-dataplane:1.3-dev") diff --git a/agent/xds/rbac.go b/agent/xds/rbac.go index d8252d7cabc9..fbae7e95c4c1 100644 --- a/agent/xds/rbac.go +++ b/agent/xds/rbac.go @@ -1107,9 +1107,6 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, }, Substitution: f.sub, }, @@ -1310,8 +1307,12 @@ func convertPermission(perm *structs.IntentionPermission) *envoy_rbac_v3.Permiss eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } diff --git a/agent/xds/response/response.go b/agent/xds/response/response.go index 91ce6d739738..ff585a1af916 100644 --- a/agent/xds/response/response.go +++ b/agent/xds/response/response.go @@ -75,9 +75,7 @@ func MakeBoolValue(n bool) *wrapperspb.BoolValue { func MakeEnvoyRegexMatch(patt string) *envoy_matcher_v3.RegexMatcher { return &envoy_matcher_v3.RegexMatcher{ - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, - Regex: patt, + EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, + Regex: patt, } } diff --git a/agent/xds/routes.go b/agent/xds/routes.go index 9eb8375ed9d7..7380314f654e 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -924,8 +924,12 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden index 2492e2ffaf4d..9c7b4d7e6f99 100644 --- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden index 120bb1ee6fda..7a635fc0e462 100644 --- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden index 69dd07bf6340..978531f301d0 100644 --- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden index 52ff163ef607..5ed56531de2e 100644 --- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden @@ -204,7 +204,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -218,7 +217,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -232,7 +230,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -246,7 +243,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -260,7 +256,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden index bd8c7b3f952e..0d3fcbd8243b 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden @@ -132,7 +132,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -146,7 +145,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -160,7 +158,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -174,7 +171,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -188,7 +184,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden index 7dec626a708a..11e229356514 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden index b3d6800760fd..ab7aa39f4de6 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden @@ -123,7 +123,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -137,7 +136,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -151,7 +149,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -165,7 +162,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -179,7 +175,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden index d0ea17f3f1fa..096c399d8918 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden @@ -206,7 +206,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -220,7 +219,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -234,7 +232,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -248,7 +245,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -262,7 +258,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden index a35d2bc30c55..cbacd52309b6 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden @@ -132,7 +132,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -146,7 +145,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -160,7 +158,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -174,7 +171,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -188,7 +184,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden index e8a4a1432082..d54a1a90e45b 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden @@ -123,7 +123,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -137,7 +136,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -151,7 +149,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -165,7 +162,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -179,7 +175,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden index e8a4a1432082..d54a1a90e45b 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden @@ -123,7 +123,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -137,7 +136,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -151,7 +149,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -165,7 +162,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -179,7 +175,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden index ad4cde37e91f..bd0f4691bb22 100644 --- a/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden @@ -137,7 +137,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -151,7 +150,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -165,7 +163,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -179,7 +176,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -193,7 +189,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden index 63986a898dfc..79ed3b50c990 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden @@ -89,7 +89,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -103,7 +102,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -117,7 +115,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -131,7 +128,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -145,7 +141,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden index 9b756b88ea5f..00e176e779f7 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden index 91b69ea92489..ffb8ffc47f97 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden @@ -89,7 +89,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -103,7 +102,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -117,7 +115,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -131,7 +128,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -145,7 +141,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden index 63986a898dfc..79ed3b50c990 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden @@ -89,7 +89,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -103,7 +102,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -117,7 +115,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -131,7 +128,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -145,7 +141,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden index 81fdba1d6641..fa5f1bb2bd78 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden @@ -88,7 +88,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -102,7 +101,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -116,7 +114,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -130,7 +127,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -144,7 +140,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden index 680526bfbcf3..3c57971a7f8b 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden @@ -110,7 +110,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -124,7 +123,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -138,7 +136,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -152,7 +149,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -166,7 +162,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden index f7420d09994d..4a1c29f1cd9b 100644 --- a/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden index 6dfde3d213e3..224371a5f904 100644 --- a/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden index b72487ffba02..34b86e6ec73e 100644 --- a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden +++ b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden index a5e8bc06745f..5fc6315f6b77 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/listeners/http-public-listener.latest.golden b/agent/xds/testdata/listeners/http-public-listener.latest.golden index cec77f10e445..575b07e5bf3f 100644 --- a/agent/xds/testdata/listeners/http-public-listener.latest.golden +++ b/agent/xds/testdata/listeners/http-public-listener.latest.golden @@ -87,7 +87,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -101,7 +100,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -115,7 +113,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -129,7 +126,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -143,7 +139,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/listeners/http2-public-listener.latest.golden b/agent/xds/testdata/listeners/http2-public-listener.latest.golden index f78e46d25348..c81bd0f97c6c 100644 --- a/agent/xds/testdata/listeners/http2-public-listener.latest.golden +++ b/agent/xds/testdata/listeners/http2-public-listener.latest.golden @@ -88,7 +88,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -102,7 +101,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -116,7 +114,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -130,7 +127,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -144,7 +140,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden index c2e9504c390c..a664243a610f 100644 --- a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden @@ -48,9 +48,11 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -191,9 +193,11 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|HEAD|OPTIONS" + } } } } diff --git a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden index e745e5278f36..572133ed46c0 100644 --- a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden @@ -47,9 +47,11 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -190,9 +192,11 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|HEAD|OPTIONS" + } } } } diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden index 007534748710..f2b91ee7f6d1 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden @@ -140,9 +140,11 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], @@ -163,9 +165,11 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden index 7c92fc2f6545..238c8d90f4f7 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden @@ -179,9 +179,11 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], @@ -202,9 +204,11 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden index b7c4114a4c44..c0f505378aca 100644 --- a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden @@ -141,9 +141,11 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], @@ -164,9 +166,11 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden index b7c4114a4c44..c0f505378aca 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-ingress-with-router.latest.golden @@ -141,9 +141,11 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], @@ -164,9 +166,11 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], diff --git a/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden b/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden index 007534748710..f2b91ee7f6d1 100644 --- a/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden +++ b/agent/xds/testdata/routes/xds-fetch-timeout-ms-sidecar.latest.golden @@ -140,9 +140,11 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], @@ -163,9 +165,11 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "googleRe2": {}, + "regex": "GET|PUT" + } } } ], diff --git a/agent/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go index 230448402104..c58107faeaf9 100644 --- a/agent/xdsv2/listener_resources.go +++ b/agent/xdsv2/listener_resources.go @@ -1131,9 +1131,6 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, }, Substitution: f.sub, }, diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go index afbb7f26d4ea..aebd62b50174 100644 --- a/agent/xdsv2/route_resources.go +++ b/agent/xdsv2/route_resources.go @@ -111,8 +111,12 @@ func makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteMatch *pbproxystate.Rout eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } @@ -131,10 +135,8 @@ func makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteMatch *pbproxystate.Rout func makeEnvoyRegexMatch(pattern string) *envoy_matcher_v3.RegexMatcher { return &envoy_matcher_v3.RegexMatcher{ - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, - Regex: pattern, + EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, + Regex: pattern, } } diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go index aa83bb6bbec1..0268587f228d 100644 --- a/test/integration/connect/envoy/main_test.go +++ b/test/integration/connect/envoy/main_test.go @@ -50,9 +50,9 @@ func TestEnvoy(t *testing.T) { caseDir := "CASE_DIR=" + tc t.Cleanup(func() { - if t.Failed() { - runCmd(t, "capture_logs", caseDir) - } + //if t.Failed() { + runCmd(t, "capture_logs", caseDir) + //} runCmd(t, "test_teardown", caseDir) })