Skip to content

Commit

Permalink
update tests after adding sorting of routers in local_app builder tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmurret
jmurret committed Nov 2, 2023
1 parent c23d73b commit a152290
Show file tree
Hide file tree
Showing 7 changed files with 214 additions and 295 deletions.
123 changes: 24 additions & 99 deletions agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,7 @@
"name": "envoy.filters.http.rbac",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
"rules": {
"policies": {
"consul-intentions-layer4": {
"permissions": [
{
"any": true
}
],
"principals": [
{
"authenticated": {
"principalName": {
"safeRegex": {
"googleRe2": {},
"regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$"
}
}
}
}
]
}
}
}
"rules": {}
}
},
{
Expand Down Expand Up @@ -139,7 +117,7 @@
{
"filterChainMatch": {
"applicationProtocols": [
"consul~tcp"
"consul~http"
]
},
"filters": [
Expand All @@ -149,10 +127,10 @@
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "public_listener",
"routeConfig": {
"name": "public_listener:grpc",
"name": "public_listener:http",
"virtualHosts": [
{
"name": "public_listener:grpc",
"name": "public_listener:http",
"domains": [
"*"
],
Expand All @@ -162,27 +140,14 @@
"prefix": "/"
},
"route": {
"cluster": "local_app:grpc"
"cluster": "local_app:http"
}
}
]
}
]
},
"httpFilters": [
{
"name": "envoy.filters.http.grpc_stats",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
"statsForAllMethods": true
}
},
{
"name": "envoy.filters.http.grpc_http1_bridge",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
}
},
{
"name": "envoy.filters.http.rbac",
"typedConfig": {
Expand All @@ -200,7 +165,6 @@
"tracing": {
"randomSampling": {}
},
"http2ProtocolOptions": {},
"upgradeConfigs": [
{
"upgradeType": "websocket"
Expand Down Expand Up @@ -231,7 +195,6 @@
}
},
"alpnProtocols": [
"h2",
"http/1.1"
]
},
Expand All @@ -242,7 +205,7 @@
{
"filterChainMatch": {
"applicationProtocols": [
"consul~http"
"consul~http2"
]
},
"filters": [
Expand All @@ -252,10 +215,10 @@
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "public_listener",
"routeConfig": {
"name": "public_listener:http",
"name": "public_listener:http2",
"virtualHosts": [
{
"name": "public_listener:http",
"name": "public_listener:http2",
"domains": [
"*"
],
Expand All @@ -265,7 +228,7 @@
"prefix": "/"
},
"route": {
"cluster": "local_app:http"
"cluster": "local_app:http2"
}
}
]
Expand All @@ -290,6 +253,7 @@
"tracing": {
"randomSampling": {}
},
"http2ProtocolOptions": {},
"upgradeConfigs": [
{
"upgradeType": "websocket"
Expand Down Expand Up @@ -320,6 +284,7 @@
}
},
"alpnProtocols": [
"h2",
"http/1.1"
]
},
Expand All @@ -330,60 +295,24 @@
{
"filterChainMatch": {
"applicationProtocols": [
"consul~http2"
"consul~tcp"
]
},
"filters": [
{
"name": "envoy.filters.network.http_connection_manager",
"name": "envoy.filters.network.rbac",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
"rules": {},
"statPrefix": "connect_authz"
}
},
{
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "public_listener",
"routeConfig": {
"name": "public_listener:http2",
"virtualHosts": [
{
"name": "public_listener:http2",
"domains": [
"*"
],
"routes": [
{
"match": {
"prefix": "/"
},
"route": {
"cluster": "local_app:http2"
}
}
]
}
]
},
"httpFilters": [
{
"name": "envoy.filters.http.rbac",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
"rules": {}
}
},
{
"name": "envoy.filters.http.router",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
}
}
],
"tracing": {
"randomSampling": {}
},
"http2ProtocolOptions": {},
"upgradeConfigs": [
{
"upgradeType": "websocket"
}
]
"cluster": "local_app:tcp"
}
}
],
Expand All @@ -407,11 +336,7 @@
"trustedCa": {
"inlineString": "some-root\nsome-other-root\n"
}
},
"alpnProtocols": [
"h2",
"http/1.1"
]
}
},
"requireClientCertificate": true
}
Expand Down
Loading

0 comments on commit a152290

Please sign in to comment.