diff --git a/.changelog/20013.txt b/.changelog/20013.txt new file mode 100644 index 0000000000..60218329a0 --- /dev/null +++ b/.changelog/20013.txt @@ -0,0 +1,3 @@ +```release-note:improvement +xds: replace usage of deprecated Envoy field `envoy.config.route.v3.HeaderMatcher.safe_regex_match` +``` \ No newline at end of file diff --git a/agent/envoyextensions/builtin/ext-authz/structs.go b/agent/envoyextensions/builtin/ext-authz/structs.go index 0a7e7dcce4..d85d6c0225 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/rbac.go b/agent/xds/rbac.go index d8252d7cab..fbae7e95c4 100644 --- a/agent/xds/rbac.go +++ b/agent/xds/rbac.go @@ -1107,9 +1107,6 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, }, Substitution: f.sub, }, @@ -1310,8 +1307,12 @@ func convertPermission(perm *structs.IntentionPermission) *envoy_rbac_v3.Permiss eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } diff --git a/agent/xds/response/response.go b/agent/xds/response/response.go index 91ce6d7397..cc6f132eb6 100644 --- a/agent/xds/response/response.go +++ b/agent/xds/response/response.go @@ -75,9 +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{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, Regex: patt, } } diff --git a/agent/xds/routes.go b/agent/xds/routes.go index 9eb8375ed9..7380314f65 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -924,8 +924,12 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden index 534f810ec7..386fcabc12 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden index 937f0432c7..afcb0af066 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden index 534f810ec7..386fcabc12 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden index 6516d48f9e..e02f5639c2 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden @@ -72,16 +72,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden index 6516d48f9e..e02f5639c2 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden @@ -72,16 +72,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden index 954f23ef10..20674f6fae 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -205,10 +205,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden index 6516d48f9e..e02f5639c2 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden @@ -72,16 +72,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden index e98cd3f5b5..2c627cfb7a 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -86,10 +86,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -136,10 +136,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -186,10 +186,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -236,10 +236,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -283,16 +283,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden index 1c361056aa..1f17d80831 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -88,16 +88,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden index ea3fbe6e16..9d2c057c85 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden @@ -39,10 +39,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,16 +89,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden index dd72465b70..8646d9607d 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden @@ -38,10 +38,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,16 +87,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden index cea925675a..b4e4bf5ed0 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden @@ -37,10 +37,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -85,16 +85,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden index 46cd9a064b..6a4524b7cc 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden index cef7fbd13c..96442eb9aa 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden @@ -58,10 +58,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -111,10 +111,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -158,16 +158,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden index a68e790ae8..1abfefc30d 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden @@ -32,16 +32,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -116,10 +116,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -169,10 +169,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden index efe753226c..32f4590f61 100644 --- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden @@ -35,10 +35,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -81,16 +81,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden +++ b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { 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 2492e2ffaf..9c7b4d7e6f 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 120bb1ee6f..7a635fc0e4 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 69dd07bf63..978531f301 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 52ff163ef6..11b165f054 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,13 +121,11 @@ "patterns": [ { "safeRegex": { - "googleRe2": {}, "regex": "client-ok-header-1" } }, { "safeRegex": { - "googleRe2": {}, "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 bd8c7b3f95..0d3fcbd824 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 7dec626a70..11e2293565 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 b3d6800760..ab7aa39f4d 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 d0ea17f3f1..096c399d89 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden @@ -206,7 +206,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -220,7 +219,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -234,7 +232,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -248,7 +245,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -262,7 +258,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden index a35d2bc30c..cbacd52309 100644 --- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden +++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden @@ -132,7 +132,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\1" @@ -146,7 +145,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\2" @@ -160,7 +158,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\3" @@ -174,7 +171,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\4" @@ -188,7 +184,6 @@ "metadataNamespace": "consul", "regexValueRewrite": { "pattern": { - "googleRe2": {}, "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*" }, "substitution": "\\5" diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden index cec77f10e4..575b07e5bf 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 e8a4a14320..d54a1a90e4 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 e8a4a14320..d54a1a90e4 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 ad4cde37e9..bd0f4691bb 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 cec77f10e4..575b07e5bf 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 cec77f10e4..575b07e5bf 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 cec77f10e4..575b07e5bf 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 cec77f10e4..575b07e5bf 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 cec77f10e4..575b07e5bf 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 cec77f10e4..575b07e5bf 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 63986a898d..79ed3b50c9 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 9b756b88ea..00e176e779 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 91b69ea924..ffb8ffc47f 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 63986a898d..79ed3b50c9 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 81fdba1d66..fa5f1bb2bd 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 680526bfbc..3c57971a7f 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 7a4514f1d7..8437fb9b2e 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 cec77f10e4..575b07e5bf 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 f7420d0999..4a1c29f1cd 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 6dfde3d213..224371a5f9 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/clusters/access-logs-defaults.latest.golden b/agent/xds/testdata/clusters/access-logs-defaults.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/access-logs-defaults.latest.golden +++ b/agent/xds/testdata/clusters/access-logs-defaults.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/access-logs-json-file.latest.golden b/agent/xds/testdata/clusters/access-logs-json-file.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/access-logs-json-file.latest.golden +++ b/agent/xds/testdata/clusters/access-logs-json-file.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden +++ b/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden index 119ca359b5..6adc2759b6 100644 --- a/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/http-service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden index c6eaa8c5d8..44b54139de 100644 --- a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/http-service" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/tcp-service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden index 44e42d764f..8a1b647fe8 100644 --- a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/tcp-service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden index 4de66f3506..0e1609fc1a 100644 --- a/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden index 4de66f3506..0e1609fc1a 100644 --- a/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden index fd1bb67fe4..52ba9b3f70 100644 --- a/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/backend" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/backend" + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/frontend" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/frontend" + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden index 4de66f3506..0e1609fc1a 100644 --- a/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden index 4de66f3506..0e1609fc1a 100644 --- a/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden +++ b/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden index 1bd8716ef5..15da9c0948 100644 --- a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden @@ -41,10 +41,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -88,16 +88,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -170,10 +170,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/something-else" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden b/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden index 852f75ea9e..9396e8d11a 100644 --- a/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden @@ -41,10 +41,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -88,16 +88,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden b/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden index 8b1b3340bf..d596a62877 100644 --- a/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -170,10 +170,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/web" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden index 48df6287b5..ba4ae02e6f 100644 --- a/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -191,10 +191,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden b/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden index f136f26999..e8c6fe498d 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden index bc59491c86..9a2a48fc5a 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden index 9eb5bad5ee..855477a934 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -91,16 +91,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden index bee55cf805..f623f5cd38 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden index 8efdba48f5..5e21bd47e6 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -189,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -240,10 +240,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -287,16 +287,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -344,10 +344,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -395,10 +395,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact-with-method" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -446,10 +446,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -497,10 +497,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-not-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -548,10 +548,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -599,10 +599,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -650,10 +650,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -701,10 +701,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-suffix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -752,10 +752,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/header-manip" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -803,10 +803,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/idle-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -854,10 +854,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/just-methods" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -905,10 +905,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -981,10 +981,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/nil-match" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1032,10 +1032,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1083,10 +1083,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1134,10 +1134,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1185,10 +1185,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1236,10 +1236,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1287,10 +1287,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1338,10 +1338,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1389,10 +1389,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/req-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1440,10 +1440,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-all" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1491,10 +1491,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-codes" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1542,10 +1542,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-connect" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1593,10 +1593,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-reset" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden index a6781d241e..930870b006 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -134,16 +134,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -191,10 +191,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -242,10 +242,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden index 35b7e902bb..a0b4401d98 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden index d2c192ac1f..0ddad7ce0d 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -91,16 +91,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden index b89067c7a6..7920034940 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden index da534e7c1f..537e24c418 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden @@ -32,16 +32,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -121,10 +121,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden index d2c192ac1f..0ddad7ce0d 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -91,16 +91,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden index 5082a3ec7a..6d8ceeaf25 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -91,16 +91,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -173,10 +173,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-http-chain.latest.golden index b89067c7a6..7920034940 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-http-chain.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-http-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.latest.golden index d2c192ac1f..0ddad7ce0d 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -91,16 +91,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden index 3005cc463d..a370a6b851 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden index 84e426aae8..3a661a9412 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden @@ -68,10 +68,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -119,10 +119,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden index d156c75983..17c0317f28 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden @@ -79,10 +79,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -139,10 +139,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden index cf0a67cd63..1d8fd606ff 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden @@ -79,10 +79,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -131,10 +131,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden index a387dbedb4..9b385cabdc 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -156,10 +156,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -203,16 +203,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden index a387dbedb4..9b385cabdc 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -156,10 +156,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -203,16 +203,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden index a387dbedb4..9b385cabdc 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -156,10 +156,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -203,16 +203,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden index a387dbedb4..9b385cabdc 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -156,10 +156,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -203,16 +203,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden index 542d4913da..cc7976651e 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden index 542d4913da..cc7976651e 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden index 542d4913da..cc7976651e 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden index 542d4913da..cc7976651e 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.latest.golden index b89067c7a6..7920034940 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden index 9afa8a275a..f826871feb 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden @@ -41,10 +41,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -93,16 +93,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden index fd5906d643..1f67e93178 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden @@ -38,10 +38,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,16 +87,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden index 8fabcfd1f8..fc501a8899 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden @@ -38,10 +38,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,16 +87,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden index a36dfcbc0a..a415de533f 100644 --- a/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden +++ b/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden index 29b1666acb..afeebfc8e9 100644 --- a/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden +++ b/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden @@ -42,10 +42,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,16 +95,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden index 54711b14d9..957d759245 100644 --- a/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden +++ b/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden @@ -44,10 +44,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -99,16 +99,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-limits.latest.golden b/agent/xds/testdata/clusters/custom-limits.latest.golden index 5ae56712a1..45e81b64d1 100644 --- a/agent/xds/testdata/clusters/custom-limits.latest.golden +++ b/agent/xds/testdata/clusters/custom-limits.latest.golden @@ -44,10 +44,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -99,16 +99,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-local-app.latest.golden b/agent/xds/testdata/clusters/custom-local-app.latest.golden index 66c013fd8b..419125274a 100644 --- a/agent/xds/testdata/clusters/custom-local-app.latest.golden +++ b/agent/xds/testdata/clusters/custom-local-app.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden b/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden index 2199d1a248..d379a32447 100644 --- a/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden +++ b/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden index f23ee6099a..9ffc5c8bb7 100644 --- a/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden +++ b/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden @@ -42,10 +42,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,16 +89,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden index be112e3957..bbc59af99a 100644 --- a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden +++ b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden @@ -42,10 +42,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,16 +89,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http-2.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/custom-public-listener-http-2.latest.golden +++ b/agent/xds/testdata/clusters/custom-public-listener-http-2.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http-missing.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/custom-public-listener-http-missing.latest.golden +++ b/agent/xds/testdata/clusters/custom-public-listener-http-missing.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-public-listener-http.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/custom-public-listener-http.latest.golden +++ b/agent/xds/testdata/clusters/custom-public-listener-http.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-public-listener.latest.golden b/agent/xds/testdata/clusters/custom-public-listener.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/custom-public-listener.latest.golden +++ b/agent/xds/testdata/clusters/custom-public-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-timeouts.latest.golden b/agent/xds/testdata/clusters/custom-timeouts.latest.golden index 3a727d4403..a5443ef299 100644 --- a/agent/xds/testdata/clusters/custom-timeouts.latest.golden +++ b/agent/xds/testdata/clusters/custom-timeouts.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-trace-listener.latest.golden b/agent/xds/testdata/clusters/custom-trace-listener.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/custom-trace-listener.latest.golden +++ b/agent/xds/testdata/clusters/custom-trace-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden index da534e7c1f..537e24c418 100644 --- a/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden +++ b/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden @@ -32,16 +32,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -121,10 +121,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden index bc59491c86..9a2a48fc5a 100644 --- a/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden +++ b/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden @@ -53,10 +53,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -104,10 +104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,16 +151,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden index 132682626b..364dbe0184 100644 --- a/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden +++ b/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden @@ -81,16 +81,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/custom-upstream.latest.golden b/agent/xds/testdata/clusters/custom-upstream.latest.golden index da534e7c1f..537e24c418 100644 --- a/agent/xds/testdata/clusters/custom-upstream.latest.golden +++ b/agent/xds/testdata/clusters/custom-upstream.latest.golden @@ -32,16 +32,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -121,10 +121,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/defaults.latest.golden b/agent/xds/testdata/clusters/defaults.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/defaults.latest.golden +++ b/agent/xds/testdata/clusters/defaults.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden index 8193ef219c..8f986425eb 100644 --- a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden +++ b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/grpc-public-listener.latest.golden b/agent/xds/testdata/clusters/grpc-public-listener.latest.golden index 70bf8607e4..dc6c3c60d7 100644 --- a/agent/xds/testdata/clusters/grpc-public-listener.latest.golden +++ b/agent/xds/testdata/clusters/grpc-public-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden index 3a727d4403..a5443ef299 100644 --- a/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden +++ b/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/clusters/http-public-listener-no-xfcc.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/http-public-listener-no-xfcc.latest.golden +++ b/agent/xds/testdata/clusters/http-public-listener-no-xfcc.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/http-public-listener.latest.golden b/agent/xds/testdata/clusters/http-public-listener.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/http-public-listener.latest.golden +++ b/agent/xds/testdata/clusters/http-public-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/http-upstream.latest.golden b/agent/xds/testdata/clusters/http-upstream.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/http-upstream.latest.golden +++ b/agent/xds/testdata/clusters/http-upstream.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/http2-public-listener.latest.golden b/agent/xds/testdata/clusters/http2-public-listener.latest.golden index 70bf8607e4..dc6c3c60d7 100644 --- a/agent/xds/testdata/clusters/http2-public-listener.latest.golden +++ b/agent/xds/testdata/clusters/http2-public-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden index 2cc24d95b7..8304805b9e 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden @@ -41,10 +41,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden index 5fedecd8b3..6965884abf 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden @@ -38,10 +38,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden index ef32beffda..5750801ba4 100644 --- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden +++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden @@ -38,10 +38,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-gateway.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-gateway.latest.golden +++ b/agent/xds/testdata/clusters/ingress-gateway.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden index cf46a7c991..2d1a992e00 100644 --- a/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden +++ b/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,10 +95,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden index 9d16f7dc03..95d7aaa412 100644 --- a/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden +++ b/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/baz" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -189,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/qux" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden index 2f4c70a742..e0c6fb23cc 100644 --- a/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden +++ b/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden @@ -41,10 +41,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -92,10 +92,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/something-else" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden index b1345fb32f..bf07a9f1b3 100644 --- a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden +++ b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden index cbff0d03a6..9a84de6484 100644 --- a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden index cbdb10ec98..399ab9722a 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden index 85b04507a1..0811cc28b0 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden index e0ed38dd7c..4c3b758e47 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" + }, + "sanType": "URI" } ], "trustedCa": { @@ -189,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" + }, + "sanType": "URI" } ], "trustedCa": { @@ -240,10 +240,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" + }, + "sanType": "URI" } ], "trustedCa": { @@ -291,10 +291,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -342,10 +342,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact-with-method" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -393,10 +393,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -444,10 +444,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-not-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -495,10 +495,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -546,10 +546,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -597,10 +597,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -648,10 +648,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-suffix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -699,10 +699,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/header-manip" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -750,10 +750,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/idle-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -801,10 +801,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/just-methods" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -852,10 +852,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -903,10 +903,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/nil-match" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -954,10 +954,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1005,10 +1005,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1056,10 +1056,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1107,10 +1107,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1158,10 +1158,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1209,10 +1209,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1260,10 +1260,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1311,10 +1311,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/req-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1362,10 +1362,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-all" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1413,10 +1413,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-codes" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1464,10 +1464,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-connect" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1515,10 +1515,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-reset" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden index e0ed38dd7c..4c3b758e47 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" + }, + "sanType": "URI" } ], "trustedCa": { @@ -189,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" + }, + "sanType": "URI" } ], "trustedCa": { @@ -240,10 +240,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" + }, + "sanType": "URI" } ], "trustedCa": { @@ -291,10 +291,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -342,10 +342,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact-with-method" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -393,10 +393,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -444,10 +444,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-not-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -495,10 +495,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -546,10 +546,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -597,10 +597,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -648,10 +648,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-suffix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -699,10 +699,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/header-manip" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -750,10 +750,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/idle-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -801,10 +801,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/just-methods" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -852,10 +852,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -903,10 +903,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/nil-match" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -954,10 +954,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1005,10 +1005,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1056,10 +1056,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1107,10 +1107,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1158,10 +1158,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1209,10 +1209,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1260,10 +1260,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1311,10 +1311,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/req-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1362,10 +1362,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-all" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1413,10 +1413,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-codes" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1464,10 +1464,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-connect" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1515,10 +1515,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-reset" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden index cc0b58f3e6..9ae1398b77 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -85,13 +85,12 @@ ], "tlsParams": {}, "validationContext": { - "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -139,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -190,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden index d9c7ff5505..7491cea550 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-chain.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain.latest.golden index c3df0a0821..bd5b312d1a 100644 --- a/agent/xds/testdata/clusters/ingress-with-chain.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-chain.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden index 98a2b6130b..16435630b6 100644 --- a/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden @@ -49,10 +49,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden index 56a49bc48a..3013a698d3 100644 --- a/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden @@ -44,10 +44,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden index e4f5cd2170..2eefc5a5c1 100644 --- a/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden index 30514bedd4..f30230437d 100644 --- a/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,10 +95,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden index 30514bedd4..f30230437d 100644 --- a/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,10 +95,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden index 30514bedd4..f30230437d 100644 --- a/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,10 +95,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden index 0063bcfb1e..48fdd7b067 100644 --- a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden @@ -48,10 +48,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden index 6c3f165917..50465fe343 100644 --- a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden @@ -43,10 +43,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden index 42bfe2d69e..8c2b57684f 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/http" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden index d6c813eff5..4457208992 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/insecure" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/secure" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden index 18e5cde875..50e5df3d2f 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/web" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden index 18e5cde875..50e5df3d2f 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/web" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden index 18e5cde875..50e5df3d2f 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/web" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden index 18e5cde875..50e5df3d2f 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/web" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden index 30d1aecd4a..c3f3e2bea7 100644 --- a/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden @@ -42,10 +42,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden index 3f1dfa5c6a..89cbcabf34 100644 --- a/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden @@ -46,10 +46,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden index b83f7c4ad0..a8b6c55581 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden @@ -55,10 +55,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -106,10 +106,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -157,10 +157,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden index b83f7c4ad0..a8b6c55581 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden @@ -55,10 +55,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -106,10 +106,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -157,10 +157,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden index b83f7c4ad0..a8b6c55581 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden @@ -55,10 +55,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -106,10 +106,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -157,10 +157,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden index b83f7c4ad0..a8b6c55581 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden @@ -55,10 +55,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -106,10 +106,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -157,10 +157,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden index 7351e2dbd6..0f53226125 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden index 7351e2dbd6..0f53226125 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden index 7351e2dbd6..0f53226125 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden index 7351e2dbd6..0f53226125 100644 --- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden @@ -54,10 +54,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -105,10 +105,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden index 7d6753a098..6e7724c2e0 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden index 45d27e53a2..904f1a4f1b 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s3" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -189,10 +189,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s4" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden index 2429cd14ff..e18feea7c4 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden index 4c33535c2f..a25ed52fea 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s3" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden index 4c33535c2f..a25ed52fea 100644 --- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden +++ b/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -87,10 +87,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -138,10 +138,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/s3" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/clusters/listener-balance-inbound-connections.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-balance-inbound-connections.latest.golden +++ b/agent/xds/testdata/clusters/listener-balance-inbound-connections.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.latest.golden +++ b/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-bind-address-port.latest.golden b/agent/xds/testdata/clusters/listener-bind-address-port.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-bind-address-port.latest.golden +++ b/agent/xds/testdata/clusters/listener-bind-address-port.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-bind-address.latest.golden b/agent/xds/testdata/clusters/listener-bind-address.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-bind-address.latest.golden +++ b/agent/xds/testdata/clusters/listener-bind-address.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-bind-port.latest.golden b/agent/xds/testdata/clusters/listener-bind-port.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-bind-port.latest.golden +++ b/agent/xds/testdata/clusters/listener-bind-port.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden index eb535dad76..9d96abda6a 100644 --- a/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden +++ b/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/clusters/listener-unix-domain-socket.latest.golden index cbd67ae2c6..3f142f8aa4 100644 --- a/agent/xds/testdata/clusters/listener-unix-domain-socket.latest.golden +++ b/agent/xds/testdata/clusters/listener-unix-domain-socket.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden index cf0a67cd63..1d8fd606ff 100644 --- a/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden +++ b/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden @@ -79,10 +79,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -131,10 +131,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden index a1cd49975d..d9abfdd6d7 100644 --- a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden +++ b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden @@ -75,10 +75,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/alt" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -126,10 +126,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -177,10 +177,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/api" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden index 95d7b4defc..608443d633 100644 --- a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden +++ b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden @@ -49,10 +49,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -100,10 +100,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -151,10 +151,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/gir" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden index 9ffbfb9391..e77c9cb119 100644 --- a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden +++ b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden @@ -32,16 +32,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -114,10 +114,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -165,10 +165,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/telemetry-collector.latest.golden b/agent/xds/testdata/clusters/telemetry-collector.latest.golden index 28ce344d22..1c5278843b 100644 --- a/agent/xds/testdata/clusters/telemetry-collector.latest.golden +++ b/agent/xds/testdata/clusters/telemetry-collector.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/consul-telemetry-collector" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -95,10 +95,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -142,16 +142,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden index e3b9b57e91..516b6d3915 100644 --- a/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden +++ b/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden @@ -48,10 +48,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "bar.com" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -144,10 +144,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "foo.com" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden index ec49fafae0..13e985402b 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -216,10 +216,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden index e98cd3f5b5..2c627cfb7a 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -86,10 +86,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -136,10 +136,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -186,10 +186,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -236,10 +236,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -283,16 +283,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden index 603a54f952..3de286c87c 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -86,10 +86,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -136,10 +136,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -186,10 +186,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -236,10 +236,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -283,16 +283,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden index 9a9a0a7bb1..6e29251896 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -216,10 +216,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/mongo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -263,10 +263,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -303,10 +303,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/mongo" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden index ef18c051c9..a142ff7e2d 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -216,10 +216,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden index a7bb651e2d..9f531929c7 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden @@ -168,10 +168,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "api.test.com" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden index d6914838eb..e02609b182 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -191,10 +191,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden index 027f481d3f..f6804a2d93 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden @@ -37,10 +37,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/api-a" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,10 +89,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden index 774cfd2d09..23471f004b 100644 --- a/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/transparent-proxy.latest.golden b/agent/xds/testdata/clusters/transparent-proxy.latest.golden index ef18c051c9..a142ff7e2d 100644 --- a/agent/xds/testdata/clusters/transparent-proxy.latest.golden +++ b/agent/xds/testdata/clusters/transparent-proxy.latest.golden @@ -36,10 +36,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -83,16 +83,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -216,10 +216,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-ingress-with-router.latest.golden b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-ingress-with-router.latest.golden index 2fc2487f8b..3e06a34c37 100644 --- a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-ingress-with-router.latest.golden +++ b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-ingress-with-router.latest.golden @@ -37,10 +37,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,10 +89,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -141,10 +141,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" + }, + "sanType": "URI" } ], "trustedCa": { @@ -193,10 +193,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" + }, + "sanType": "URI" } ], "trustedCa": { @@ -245,10 +245,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" + }, + "sanType": "URI" } ], "trustedCa": { @@ -297,10 +297,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -349,10 +349,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact-with-method" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -401,10 +401,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -453,10 +453,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-not-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -505,10 +505,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -557,10 +557,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -609,10 +609,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -661,10 +661,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-suffix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -713,10 +713,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/header-manip" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -765,10 +765,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/idle-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -817,10 +817,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/just-methods" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -869,10 +869,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -921,10 +921,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/nil-match" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -973,10 +973,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1025,10 +1025,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1077,10 +1077,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1129,10 +1129,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1181,10 +1181,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1233,10 +1233,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1285,10 +1285,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1337,10 +1337,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/req-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1389,10 +1389,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-all" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1441,10 +1441,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-codes" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1493,10 +1493,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-connect" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1545,10 +1545,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-reset" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-mgw-peering.latest.golden b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-mgw-peering.latest.golden index d65f66f520..fb9645aac4 100644 --- a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-mgw-peering.latest.golden +++ b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-mgw-peering.latest.golden @@ -51,10 +51,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -103,10 +103,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -155,10 +155,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/gir" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-sidecar.latest.golden b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-sidecar.latest.golden index 9fe073c73c..47d7f60978 100644 --- a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-sidecar.latest.golden +++ b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-sidecar.latest.golden @@ -37,10 +37,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/big-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -89,10 +89,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -141,10 +141,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-1" + }, + "sanType": "URI" } ], "trustedCa": { @@ -193,10 +193,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/empty-match-2" + }, + "sanType": "URI" } ], "trustedCa": { @@ -245,10 +245,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/exact" + }, + "sanType": "URI" } ], "trustedCa": { @@ -293,16 +293,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -351,10 +351,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { - "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" - } + "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/goldilocks-side" + }, + "sanType": "URI" } ], "trustedCa": { @@ -403,10 +403,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact-with-method" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -455,10 +455,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -507,10 +507,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-not-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -559,10 +559,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -611,10 +611,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -663,10 +663,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -715,10 +715,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/hdr-suffix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -767,10 +767,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/header-manip" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -819,10 +819,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/idle-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -871,10 +871,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/just-methods" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -923,10 +923,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/lil-bit-side" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1000,10 +1000,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/nil-match" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1052,10 +1052,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-1" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1104,10 +1104,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix-rewrite-2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1156,10 +1156,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prefix" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1208,10 +1208,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-exact" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1260,10 +1260,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-present" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1312,10 +1312,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/prm-regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1364,10 +1364,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/regex" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1416,10 +1416,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/req-timeout" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1468,10 +1468,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-all" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1520,10 +1520,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-codes" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1572,10 +1572,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-connect" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -1624,10 +1624,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/retry-reset" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-http-peering.latest.golden b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-http-peering.latest.golden index ad09fc6f9e..2c176c84ee 100644 --- a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-http-peering.latest.golden +++ b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-http-peering.latest.golden @@ -79,10 +79,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -140,10 +140,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden index aed3225ab2..6d6212a30e 100644 --- a/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden +++ b/agent/xds/testdata/clusters/xds-fetch-timeout-ms-tproxy-passthrough.latest.golden @@ -37,10 +37,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -88,10 +88,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -139,10 +139,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -190,10 +190,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -241,10 +241,10 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google" - } + }, + "sanType": "URI" } ], "trustedCa": { @@ -289,16 +289,16 @@ "validationContext": { "matchTypedSubjectAltNames": [ { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target" - } + }, + "sanType": "URI" }, { - "sanType": "URI", "matcher": { "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target" - } + }, + "sanType": "URI" } ], "trustedCa": { diff --git a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden index b72487ffba..34b86e6ec7 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 a5e8bc0674..5fc6315f6b 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 cec77f10e4..575b07e5bf 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 f78e46d253..c81bd0f97c 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 d4b5f84883..feed47691f 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 0659f2c4af..e2fe258af0 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,7 +19,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -30,7 +29,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-allow.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden index 956dd00006..7cd13fb8c8 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,7 +28,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -40,7 +38,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--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden index d57d60bc77..fda55dac32 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,7 +19,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -30,7 +29,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 956dd00006..7cd13fb8c8 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,7 +28,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -40,7 +38,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 b220a6d38e..568b4fa124 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,7 +37,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -50,7 +47,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -62,7 +58,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } @@ -74,7 +69,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 6bb4e9e2ff..7d6aebd7c7 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,7 +37,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -50,7 +47,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -62,7 +58,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } @@ -74,7 +69,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 851499ce97..75497aca4b 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 19f25b92ff..f0dacb3ef1 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 19f25b92ff..f0dacb3ef1 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 fc818d19ec..9aaf467011 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 19f25b92ff..f0dacb3ef1 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 c16e12089d..e1f14bf632 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 907c9e06b1..f9dc08623f 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 c2e9504c39..77c138f184 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]" } } @@ -48,9 +47,10 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -119,7 +119,6 @@ "name": "x-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -165,7 +164,6 @@ "name": "z-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -182,7 +180,6 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, "regex": "/v[123]" } } @@ -191,9 +188,10 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -228,7 +226,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 19f25b92ff..f0dacb3ef1 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 ec4f26e958..2c8d3b86f7 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 19f25b92ff..f0dacb3ef1 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 cba46edc59..9eaeb2ad96 100644 --- a/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden +++ b/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden @@ -18,7 +18,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -29,7 +28,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.golden b/agent/xds/testdata/rbac/default-deny-allow-deny.golden index 185bbc2734..040def966e 100644 --- a/agent/xds/testdata/rbac/default-deny-allow-deny.golden +++ b/agent/xds/testdata/rbac/default-deny-allow-deny.golden @@ -18,7 +18,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -29,7 +28,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 880d5e1867..4adcbd001e 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 c551798d6b..90fe5eaeae 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,7 +36,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -49,7 +46,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -61,7 +57,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } @@ -73,7 +68,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 173f54b3db..3e1b6e8449 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,7 +36,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -49,7 +46,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$" } } @@ -61,7 +57,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$" } } @@ -73,7 +68,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 fb2154c82e..e066c2daed 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 a02fd3518c..a67e2f89c9 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 fb2154c82e..e066c2daed 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 a02fd3518c..a67e2f89c9 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 880d5e1867..4adcbd001e 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 8b81593142..d69ba4fb2c 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,7 +27,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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,7 +51,6 @@ "name": "x-forwarded-client-cert", "stringMatch": { "safeRegex": { - "googleRe2": {}, "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 ba7fc6b4d0..7fb1bf3034 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,7 +27,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+$" } } @@ -39,7 +37,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 ce7174d5d0..bbad43cb10 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 caad3988db..030cc13880 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 e745e5278f..d83d07ea7a 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]" } } @@ -47,9 +46,10 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -118,7 +118,6 @@ "name": "x-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -164,7 +163,6 @@ "name": "z-zim", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "gi[rR]" } } @@ -181,7 +179,6 @@ "urlPath": { "path": { "safeRegex": { - "googleRe2": {}, "regex": "/v[123]" } } @@ -190,9 +187,10 @@ { "header": { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|HEAD|OPTIONS" + "stringMatch": { + "safeRegex": { + "regex": "GET|HEAD|OPTIONS" + } } } } @@ -227,7 +225,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 bfaa5c46c3..cd558af911 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 28cb4df8f4..4a7c7dbb23 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 522e134591..59af52d88f 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,7 +18,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.golden b/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden index a02fd3518c..a67e2f89c9 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 461429f6c4..c3c57ae4e1 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,7 +146,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-one-permission--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden index f384cbdd65..994978cc80 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,7 +95,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 d298830ee9..78ece60029 100644 --- a/agent/xds/testdata/rbac/v2-kitchen-sink.golden +++ b/agent/xds/testdata/rbac/v2-kitchen-sink.golden @@ -18,7 +18,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/db$" } } @@ -28,7 +27,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$" } } @@ -58,7 +56,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/api$" } } @@ -71,7 +68,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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,7 +100,6 @@ "authenticated": { "principalName": { "safeRegex": { - "googleRe2": {}, "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 0075347487..fe2dd30a27 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,7 +122,6 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } @@ -140,9 +138,10 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -163,9 +162,10 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -199,7 +199,6 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, "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 7c92fc2f65..9ab7d3ae29 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,7 +161,6 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } @@ -179,9 +177,10 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -202,9 +201,10 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -238,7 +238,6 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, "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 b7c4114a4c..06795b1e5e 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,7 +123,6 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } @@ -141,9 +139,10 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -164,9 +163,10 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -200,7 +200,6 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, "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 b7c4114a4c..06795b1e5e 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,7 +123,6 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } @@ -141,9 +139,10 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -164,9 +163,10 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -200,7 +200,6 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, "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 0075347487..fe2dd30a27 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,7 +122,6 @@ "name": "x-debug", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } @@ -140,9 +138,10 @@ "headers": [ { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -163,9 +162,10 @@ }, { "name": ":method", - "safeRegexMatch": { - "googleRe2": {}, - "regex": "GET|PUT" + "stringMatch": { + "safeRegex": { + "regex": "GET|PUT" + } } } ], @@ -199,7 +199,6 @@ "name": "secretparam2", "stringMatch": { "safeRegex": { - "googleRe2": {}, "regex": "regex" } } diff --git a/agent/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go index 2304484021..c58107faea 100644 --- a/agent/xdsv2/listener_resources.go +++ b/agent/xdsv2/listener_resources.go @@ -1131,9 +1131,6 @@ func parseXFCCToDynamicMetaHTTPFilter() (*envoy_http_v3.HttpFilter, error) { RegexValueRewrite: &envoy_matcher_v3.RegexMatchAndSubstitute{ Pattern: &envoy_matcher_v3.RegexMatcher{ Regex: downstreamServiceIdentityMatcher, - EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{ - GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{}, - }, }, Substitution: f.sub, }, diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go index afbb7f26d4..c3526e48de 100644 --- a/agent/xdsv2/route_resources.go +++ b/agent/xdsv2/route_resources.go @@ -111,8 +111,12 @@ func makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteMatch *pbproxystate.Rout eh := &envoy_route_v3.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex), + HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{ + StringMatch: &envoy_matcher_v3.StringMatcher{ + MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{ + SafeRegex: response.MakeEnvoyRegexMatch(methodHeaderRegex), + }, + }, }, } @@ -131,9 +135,6 @@ 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, } }