From 35db5affee0eafb05e2faa615a80fe38e41ddfcc Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 21 Dec 2023 16:34:55 -0700 Subject: [PATCH 1/7] ci: test-integrations failures in compatibility tests. panics occuring in selectionTracker.TrackIDForSelection --- .../resource/mappers/selectiontracker/selection_tracker.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/resource/mappers/selectiontracker/selection_tracker.go b/internal/resource/mappers/selectiontracker/selection_tracker.go index 5b60680bb546..d78601b1f56c 100644 --- a/internal/resource/mappers/selectiontracker/selection_tracker.go +++ b/internal/resource/mappers/selectiontracker/selection_tracker.go @@ -72,6 +72,10 @@ func (t *WorkloadSelectionTracker) GetIDsForWorkload(id *pbresource.ID) []*pbres // TrackIDForSelector will associate workloads matching the specified workload // selector with the given resource id. func (t *WorkloadSelectionTracker) TrackIDForSelector(id *pbresource.ID, selector *pbcatalog.WorkloadSelector) { + if selector != nil { + return + } + t.lock.Lock() defer t.lock.Unlock() From 9ca881e8c7017d741de58dd895bbfe14af47d23c Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 21 Dec 2023 16:53:44 -0700 Subject: [PATCH 2/7] Update selection_tracker.go --- internal/resource/mappers/selectiontracker/selection_tracker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/resource/mappers/selectiontracker/selection_tracker.go b/internal/resource/mappers/selectiontracker/selection_tracker.go index d78601b1f56c..5f10e410b980 100644 --- a/internal/resource/mappers/selectiontracker/selection_tracker.go +++ b/internal/resource/mappers/selectiontracker/selection_tracker.go @@ -72,7 +72,7 @@ func (t *WorkloadSelectionTracker) GetIDsForWorkload(id *pbresource.ID) []*pbres // TrackIDForSelector will associate workloads matching the specified workload // selector with the given resource id. func (t *WorkloadSelectionTracker) TrackIDForSelector(id *pbresource.ID, selector *pbcatalog.WorkloadSelector) { - if selector != nil { + if selector == nil { return } From 0edee9d9b4cba67ca5790f9bfe1e29eb1af6c407 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 20 Dec 2023 10:24:48 -0700 Subject: [PATCH 3/7] NET-6941 - Replace usage of deprecated Envoy field google_re2 --- agent/xds/rbac.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/agent/xds/rbac.go b/agent/xds/rbac.go index d8252d7cabc9..8ca613226020 100644 --- a/agent/xds/rbac.go +++ b/agent/xds/rbac.go @@ -1106,10 +1106,8 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { Key: f.name, RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ - Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, + Regex: downstreamServiceIdentityMatcher, + EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, }, Substitution: f.sub, }, From 411236e1642e7340b7b044d327bd27fbc29eb6c9 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 20 Dec 2023 14:16:45 -0700 Subject: [PATCH 4/7] remove more --- agent/xds/rbac.go | 3 +-- agent/xds/response/response.go | 6 ++---- agent/xdsv2/listener_resources.go | 6 ++---- agent/xdsv2/route_resources.go | 6 ++---- test/integration/connect/envoy/main_test.go | 6 +++--- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/agent/xds/rbac.go b/agent/xds/rbac.go index 8ca613226020..dbc853f5eaa2 100644 --- a/agent/xds/rbac.go +++ b/agent/xds/rbac.go @@ -1106,8 +1106,7 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { Key: f.name, RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ - Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, + Regex: downstreamServiceIdentityMatcher, }, Substitution: f.sub, }, 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/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go index 29c0e42af0e0..9f36f7cd6055 100644 --- a/agent/xdsv2/listener_resources.go +++ b/agent/xdsv2/listener_resources.go @@ -1127,10 +1127,8 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { Key: f.name, RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ - Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, + Regex: downstreamServiceIdentityMatcher, + EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, }, Substitution: f.sub, }, diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go index 073b89d22ca8..79a47fca7928 100644 --- a/agent/xdsv2/route_resources.go +++ b/agent/xdsv2/route_resources.go @@ -131,10 +131,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) }) From efb390834a4264674c7fd99f91e3cb9cf382329c Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 20 Dec 2023 14:39:02 -0700 Subject: [PATCH 5/7] fix golden tests --- .../envoyextensions/builtin/ext-authz/structs.go | 3 +-- agent/xds/response/response.go | 3 +-- ...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 | 11 ++--------- .../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 ----- ...patch-specific-upstream-service.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 ----- ...-gateway-with-peer-trust-bundle.latest.golden | 1 - ...ow-deny-all-and-path-allow--httpfilter.golden | 6 ++---- .../default-allow-deny-all-and-path-allow.golden | 7 ++----- ...low-deny-all-and-path-deny--httpfilter.golden | 7 ++----- .../default-allow-deny-all-and-path-deny.golden | 7 ++----- ...default-allow-kitchen-sink--httpfilter.golden | 14 ++++---------- .../rbac/default-allow-kitchen-sink.golden | 14 ++++---------- .../default-allow-one-deny--httpfilter.golden | 1 - .../testdata/rbac/default-allow-one-deny.golden | 1 - .../rbac/default-allow-path-allow.golden | 1 - .../default-allow-path-deny--httpfilter.golden | 1 - .../testdata/rbac/default-allow-path-deny.golden | 1 - ...llow-service-wildcard-deny--httpfilter.golden | 1 - .../default-allow-service-wildcard-deny.golden | 1 - ...on-with-kitchen-sink-perms--httpfilter.golden | 11 ++--------- ...ngle-intention-with-kitchen-sink-perms.golden | 1 - ...o-path-deny-and-path-allow--httpfilter.golden | 1 - ...ult-allow-two-path-deny-and-path-allow.golden | 1 - .../default-deny-allow-deny--httpfilter.golden | 6 ++---- .../testdata/rbac/default-deny-allow-deny.golden | 6 ++---- ...ny-deny-all-and-path-allow--httpfilter.golden | 1 - .../default-deny-kitchen-sink--httpfilter.golden | 14 ++++---------- .../rbac/default-deny-kitchen-sink.golden | 14 ++++---------- ...ault-deny-mixed-precedence--httpfilter.golden | 1 - .../rbac/default-deny-mixed-precedence.golden | 1 - .../default-deny-one-allow--httpfilter.golden | 1 - .../testdata/rbac/default-deny-one-allow.golden | 1 - .../default-deny-path-allow--httpfilter.golden | 1 - ...t-deny-peered-kitchen-sink--httpfilter.golden | 8 ++------ .../rbac/default-deny-peered-kitchen-sink.golden | 7 ++----- ...eny-service-wildcard-allow--httpfilter.golden | 1 - .../default-deny-service-wildcard-allow.golden | 1 - ...on-with-kitchen-sink-perms--httpfilter.golden | 11 ++--------- ...o-path-deny-and-path-allow--httpfilter.golden | 1 - ...el-jwt-with-one-permission--httpfilter.golden | 1 - ...p-level-jwt-no-permissions--httpfilter.golden | 3 +-- .../rbac/top-level-jwt-no-permissions.golden | 1 - ...-with-multiple-permissions--httpfilter.golden | 3 +-- ...el-jwt-with-one-permission--httpfilter.golden | 3 +-- agent/xds/testdata/rbac/v2-kitchen-sink.golden | 16 +++++----------- ...ect-proxy-with-chain-and-router.latest.golden | 13 ++++--------- ...h-chain-and-router-header-manip.latest.golden | 13 ++++--------- .../ingress-with-chain-and-router.latest.golden | 13 ++++--------- ...-timeout-ms-ingress-with-router.latest.golden | 13 ++++--------- .../xds-fetch-timeout-ms-sidecar.latest.golden | 13 ++++--------- agent/xdsv2/listener_resources.go | 3 +-- agent/xdsv2/route_resources.go | 3 +-- 82 files changed, 70 insertions(+), 357 deletions(-) diff --git a/agent/envoyextensions/builtin/ext-authz/structs.go b/agent/envoyextensions/builtin/ext-authz/structs.go index 0a7e7dcce43a..d85d6c022587 100644 --- a/agent/envoyextensions/builtin/ext-authz/structs.go +++ b/agent/envoyextensions/builtin/ext-authz/structs.go @@ -547,8 +547,7 @@ func (s *StringMatcher) toEnvoy() *envoy_type_matcher_v3.StringMatcher { return &envoy_type_matcher_v3.StringMatcher{ MatchPattern: &envoy_type_matcher_v3.StringMatcher_SafeRegex{ SafeRegex: &envoy_type_matcher_v3.RegexMatcher{ - EngineType: &envoy_type_matcher_v3.RegexMatcher_GoogleRe2{}, - Regex: s.SafeRegex, + Regex: s.SafeRegex, }, }, } diff --git a/agent/xds/response/response.go b/agent/xds/response/response.go index ff585a1af916..cc6f132eb600 100644 --- a/agent/xds/response/response.go +++ b/agent/xds/response/response.go @@ -75,7 +75,6 @@ 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{}, - Regex: patt, + Regex: patt, } } 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..a90b144ee184 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 @@ -121,14 +121,12 @@ "patterns": [ { "safeRegex": { - "googleRe2": {}, - "regex": "client-ok-header-1" + "regex": "client-ok-header-1" } }, { "safeRegex": { - "googleRe2": {}, - "regex": "client-ok-header-2" + "regex": "client-ok-header-2" } } ] @@ -204,7 +202,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -218,7 +215,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -232,7 +228,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -246,7 +241,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -260,7 +254,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 bf09509b375d..eff24666f27e 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 f0b2d4684088..fc2e57170143 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 3b2dab64b526..bda53c54359f 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 0b349be9433b..9535144889f4 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 @@ -202,7 +202,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -216,7 +215,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -230,7 +228,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -244,7 +241,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -258,7 +254,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 ade1593e2eab..51f6c027aa65 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 @@ -130,7 +130,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -144,7 +143,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -158,7 +156,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -172,7 +169,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -186,7 +182,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-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden index 7a4514f1d783..8437fb9b2ee2 100644 --- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden @@ -109,7 +109,6 @@ "key": "trust-domain", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -123,7 +122,6 @@ "key": "partition", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -137,7 +135,6 @@ "key": "namespace", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -151,7 +148,6 @@ "key": "datacenter", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -165,7 +161,6 @@ "key": "service", "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/listeners/terminating-gateway-with-peer-trust-bundle.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-with-peer-trust-bundle.latest.golden index d4b5f848831f..feed47691f3b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-with-peer-trust-bundle.latest.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-with-peer-trust-bundle.latest.golden @@ -184,7 +184,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://foo.bar.gov/ns/default/dc/[^/]+/svc/source$" } } diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden index 0659f2c4afc9..4ea3c29ae1e5 100644 --- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden @@ -19,8 +19,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -30,8 +29,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden index 956dd00006cc..13e55c99a262 100644 --- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden +++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -29,8 +28,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -40,8 +38,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden index d57d60bc770b..0a4c036d53b4 100644 --- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden @@ -19,8 +19,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -30,8 +29,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } @@ -57,7 +55,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden index 956dd00006cc..13e55c99a262 100644 --- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden +++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -29,8 +28,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -40,8 +38,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden index b220a6d38ed6..ceaffe4844cf 100644 --- a/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } @@ -26,7 +25,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -39,8 +37,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -50,8 +47,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } @@ -62,8 +58,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } } @@ -74,8 +69,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } } diff --git a/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden b/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden index 6bb4e9e2ff2e..8e5aef92d34f 100644 --- a/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden +++ b/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } @@ -26,7 +25,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -39,8 +37,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -50,8 +47,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } @@ -62,8 +58,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } } @@ -74,8 +69,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } } diff --git a/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden index 851499ce9796..75497aca4bc1 100644 --- a/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-one-deny.golden b/agent/xds/testdata/rbac/default-allow-one-deny.golden index 19f25b92ff5f..f0dacb3ef1fe 100644 --- a/agent/xds/testdata/rbac/default-allow-one-deny.golden +++ b/agent/xds/testdata/rbac/default-allow-one-deny.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-path-allow.golden b/agent/xds/testdata/rbac/default-allow-path-allow.golden index 19f25b92ff5f..f0dacb3ef1fe 100644 --- a/agent/xds/testdata/rbac/default-allow-path-allow.golden +++ b/agent/xds/testdata/rbac/default-allow-path-allow.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden index fc818d19ec37..9aaf467011fc 100644 --- a/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden @@ -20,7 +20,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-path-deny.golden b/agent/xds/testdata/rbac/default-allow-path-deny.golden index 19f25b92ff5f..f0dacb3ef1fe 100644 --- a/agent/xds/testdata/rbac/default-allow-path-deny.golden +++ b/agent/xds/testdata/rbac/default-allow-path-deny.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden index c16e12089d06..e1f14bf632a1 100644 --- a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } diff --git a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden index 907c9e06b1f4..f9dc08623f2b 100644 --- a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden +++ b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } 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..79021afab6d4 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 @@ -39,7 +39,6 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, "regex": "/v[123]" } } @@ -49,8 +48,7 @@ "header": { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "regex": "GET|HEAD|OPTIONS" } } } @@ -119,7 +117,6 @@ "name": "x-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -165,7 +162,6 @@ "name": "z-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -182,8 +178,7 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, - "regex": "/v[123]" + "regex": "/v[123]" } } } @@ -192,7 +187,6 @@ "header": { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, "regex": "GET|HEAD|OPTIONS" } } @@ -228,7 +222,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden index 19f25b92ff5f..f0dacb3ef1fe 100644 --- a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden +++ b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden index ec4f26e958c1..2c8d3b86f7ea 100644 --- a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden @@ -42,7 +42,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden index 19f25b92ff5f..f0dacb3ef1fe 100644 --- a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden +++ b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden @@ -16,7 +16,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden index cba46edc59cc..ce0e25bfaa9d 100644 --- a/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden @@ -18,8 +18,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -29,8 +28,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-allow-deny.golden b/agent/xds/testdata/rbac/default-deny-allow-deny.golden index 185bbc27343c..2c045cdd4e94 100644 --- a/agent/xds/testdata/rbac/default-deny-allow-deny.golden +++ b/agent/xds/testdata/rbac/default-deny-allow-deny.golden @@ -18,8 +18,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -29,8 +28,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden index 880d5e18673f..4adcbd001ec5 100644 --- a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden @@ -19,7 +19,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden index c551798d6bc2..b45fd1c7a86c 100644 --- a/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } @@ -25,7 +24,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -38,8 +36,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -49,8 +46,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } @@ -61,8 +57,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } } @@ -73,8 +68,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden b/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden index 173f54b3db16..cd11fa60cfcc 100644 --- a/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden +++ b/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } @@ -25,7 +24,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -38,8 +36,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -49,8 +46,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } @@ -61,8 +57,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } } @@ -73,8 +68,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden index fb2154c82e27..e066c2daedeb 100644 --- a/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden b/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden index a02fd3518c1e..a67e2f89c90a 100644 --- a/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden +++ b/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden index fb2154c82e27..e066c2daedeb 100644 --- a/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-one-allow.golden b/agent/xds/testdata/rbac/default-deny-one-allow.golden index a02fd3518c1e..a67e2f89c90a 100644 --- a/agent/xds/testdata/rbac/default-deny-one-allow.golden +++ b/agent/xds/testdata/rbac/default-deny-one-allow.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden index 880d5e18673f..4adcbd001ec5 100644 --- a/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden @@ -19,7 +19,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden index 8b81593142cd..104365122c99 100644 --- a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -28,8 +27,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/gateway/mesh/dc/[^/]+$" + "regex": "^spiffe://test.consul/gateway/mesh/dc/[^/]+$" } } } @@ -42,7 +40,6 @@ "name": "x-forwarded-client-cert", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "^[^,]+;URI=spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+(?:,.*)?$" } } @@ -54,8 +51,7 @@ "name": "x-forwarded-client-cert", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "^[^,]+;URI=spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web(?:,.*)?$" + "regex": "^[^,]+;URI=spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web(?:,.*)?$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden index ba7fc6b4d0d0..f548c2371baf 100644 --- a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden +++ b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -28,8 +27,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -39,8 +37,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden index ce7174d5d013..bbad43cb100c 100644 --- a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } diff --git a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden index caad3988db14..030cc138800b 100644 --- a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden +++ b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } 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..8a70dfc63e54 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 @@ -38,7 +38,6 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, "regex": "/v[123]" } } @@ -48,8 +47,7 @@ "header": { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "regex": "GET|HEAD|OPTIONS" } } } @@ -118,7 +116,6 @@ "name": "x-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -164,7 +161,6 @@ "name": "z-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -181,8 +177,7 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, - "regex": "/v[123]" + "regex": "/v[123]" } } } @@ -191,7 +186,6 @@ "header": { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, "regex": "GET|HEAD|OPTIONS" } } @@ -227,7 +221,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden index bfaa5c46c387..cd558af911a5 100644 --- a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden @@ -43,7 +43,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden b/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden index 28cb4df8f41d..4a7c7dbb231e 100644 --- a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden +++ b/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden @@ -67,7 +67,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden index 522e134591fc..192d90eecc44 100644 --- a/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden +++ b/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden @@ -18,8 +18,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden b/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden index a02fd3518c1e..a67e2f89c90a 100644 --- a/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden +++ b/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden @@ -15,7 +15,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden index 461429f6c499..258d915e6ebc 100644 --- a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden +++ b/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden @@ -146,8 +146,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden index f384cbdd654b..4d2e676cdc86 100644 --- a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden +++ b/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden @@ -95,8 +95,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } diff --git a/agent/xds/testdata/rbac/v2-kitchen-sink.golden b/agent/xds/testdata/rbac/v2-kitchen-sink.golden index d298830ee935..3e7d2fc7082a 100644 --- a/agent/xds/testdata/rbac/v2-kitchen-sink.golden +++ b/agent/xds/testdata/rbac/v2-kitchen-sink.golden @@ -18,8 +18,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/db$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/db$" } } } @@ -28,8 +27,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } } @@ -58,8 +56,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/api$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/api$" } } } @@ -71,8 +68,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } } @@ -82,7 +78,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } @@ -105,8 +100,7 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, - "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" + "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } } 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 958709e3477e..e3124a7d6bcf 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 @@ -31,7 +31,6 @@ { "match": { "safeRegex": { - "googleRe2": {}, "regex": "/regex" } }, @@ -123,8 +122,7 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } @@ -141,8 +139,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -164,8 +161,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -199,8 +195,7 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } 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 2a55ed339500..87b951e639ad 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 @@ -70,7 +70,6 @@ { "match": { "safeRegex": { - "googleRe2": {}, "regex": "/regex" } }, @@ -162,8 +161,7 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } @@ -180,8 +178,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -203,8 +200,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -238,8 +234,7 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } 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 dac7fbcf0f28..6ff9dda74d49 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 @@ -32,7 +32,6 @@ { "match": { "safeRegex": { - "googleRe2": {}, "regex": "/regex" } }, @@ -124,8 +123,7 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } @@ -142,8 +140,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -165,8 +162,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -200,8 +196,7 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } 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 dac7fbcf0f28..6ff9dda74d49 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 @@ -32,7 +32,6 @@ { "match": { "safeRegex": { - "googleRe2": {}, "regex": "/regex" } }, @@ -124,8 +123,7 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } @@ -142,8 +140,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -165,8 +162,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -200,8 +196,7 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } 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 958709e3477e..e3124a7d6bcf 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 @@ -31,7 +31,6 @@ { "match": { "safeRegex": { - "googleRe2": {}, "regex": "/regex" } }, @@ -123,8 +122,7 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } @@ -141,8 +139,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -164,8 +161,7 @@ { "name": ":method", "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "regex": "GET|PUT" } } ], @@ -199,8 +195,7 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, - "regex": "regex" + "regex": "regex" } } } diff --git a/agent/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go index 9f36f7cd6055..a95d3785e497 100644 --- a/agent/xdsv2/listener_resources.go +++ b/agent/xdsv2/listener_resources.go @@ -1127,8 +1127,7 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { Key: f.name, RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ - Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, + Regex: downstreamServiceIdentityMatcher, }, Substitution: f.sub, }, diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go index 79a47fca7928..ef13cb067866 100644 --- a/agent/xdsv2/route_resources.go +++ b/agent/xdsv2/route_resources.go @@ -131,8 +131,7 @@ func makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteMatch *pbproxystate.Rout func makeEnvoyRegexMatch(pattern string) *envoy_matcher_v3.RegexMatcher { return &envoy_matcher_v3.RegexMatcher{ - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{}, - Regex: pattern, + Regex: pattern, } } From 6f4bb5fc2548784ca85886eb72fa8b09e87e7258 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 20 Dec 2023 14:42:08 -0700 Subject: [PATCH 6/7] put logging back toonly happen on failure. --- test/integration/connect/envoy/main_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go index 0268587f228d..aa83bb6bbec1 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) }) From 2d8be2860af1a295050f8691207ac6145b54a49e Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 21 Dec 2023 16:50:24 -0700 Subject: [PATCH 7/7] add changelog --- .changelog/20005.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/20005.txt diff --git a/.changelog/20005.txt b/.changelog/20005.txt new file mode 100644 index 000000000000..c771070be131 --- /dev/null +++ b/.changelog/20005.txt @@ -0,0 +1,3 @@ +```release-note:improvement +xds: replace usage of deprecated Envoy field `google_re2` +``` \ No newline at end of file