status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

NET-6946 / NET-6941 - Replace usage of deprecated Envoy fields envoy.config.route.v3.HeaderMatcher.safe_regex_match and envoy.type.matcher.v3.RegexMatcher.google_re2 (#20013) 

* NET-6946 - Replace usage of deprecated Envoy field envoy.config.route.v3.HeaderMatcher.safe_regex_match

* removing unrelated changes

* update golden files

* do not set engine type
This commit is contained in:
John Murret 2024-01-03 09:53:39 -07:00 committed by GitHub
parent 3b94efa8de
commit d925e4b812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
286 changed files with 1527 additions and 1781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/20013.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
xds: replace usage of deprecated Envoy field `envoy.config.route.v3.HeaderMatcher.safe_regex_match`
```

3
agent/envoyextensions/builtin/ext-authz/structs.go
View File

@ -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,
},
},
}

11
agent/xds/rbac.go
View File

@ -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),
},
},
},
}

3
agent/xds/response/response.go
View File

@ -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,
}
}

8
agent/xds/routes.go
View File

@ -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),
},
},
},
}

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden vendored
View File

@ -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": {

8
agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden vendored
View File

@ -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": {

8
agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden vendored
View File

@ -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": {

8
agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden vendored
View File

@ -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": {

28
agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden vendored
View File

@ -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": {

5
agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden vendored
View File

@ -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"

7
agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden vendored
View File

@ -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"

5
agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden vendored
View File

@ -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"

12
agent/xds/testdata/clusters/access-logs-defaults.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/access-logs-json-file.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden vendored
View File

@ -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": {

8
agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden vendored
View File

@ -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": {

4
agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden vendored
View File

@ -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": {

26
agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden vendored
View File

@ -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": {

16
agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden vendored
View File

@ -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": {

128
agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden vendored
View File

@ -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": {

28
agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden vendored
View File

@ -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": {

12
agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden vendored
View File

@ -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": {

Some files were not shown because too many files have changed in this diff Show More