|
|
@ -18,6 +18,7 @@ import (
|
|
|
|
"github.com/hashicorp/consul/acl"
|
|
|
|
"github.com/hashicorp/consul/acl"
|
|
|
|
"github.com/hashicorp/consul/agent/proxycfg"
|
|
|
|
"github.com/hashicorp/consul/agent/proxycfg"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
|
|
|
|
|
|
"github.com/hashicorp/consul/agent/xds/xdscommon"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
// NOTE: For these tests, prefer not using xDS protobuf "factory" methods if
|
|
|
|
// NOTE: For these tests, prefer not using xDS protobuf "factory" methods if
|
|
|
@ -46,7 +47,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
// Send initial cluster discover. We'll assume we are testing a partial
|
|
|
|
// Send initial cluster discover. We'll assume we are testing a partial
|
|
|
|
// reconnect and include some initial resource versions that will be
|
|
|
|
// reconnect and include some initial resource versions that will be
|
|
|
|
// cleaned up.
|
|
|
|
// cleaned up.
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
InitialResourceVersions: mustMakeVersionMap(t,
|
|
|
|
InitialResourceVersions: mustMakeVersionMap(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:geo-cache"),
|
|
|
|
makeTestCluster(t, snap, "tcp:geo-cache"),
|
|
|
|
),
|
|
|
|
),
|
|
|
@ -63,7 +64,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "first sync", func(t *testing.T) {
|
|
|
|
runStep(t, "first sync", func(t *testing.T) {
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -73,7 +74,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
// We'll assume we are testing a partial "reconnect"
|
|
|
|
// We'll assume we are testing a partial "reconnect"
|
|
|
|
InitialResourceVersions: mustMakeVersionMap(t,
|
|
|
|
InitialResourceVersions: mustMakeVersionMap(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
@ -89,14 +90,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// deliver a new config version.
|
|
|
|
// deliver a new config version.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
@ -109,14 +110,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -129,25 +130,25 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 3)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 3)
|
|
|
|
|
|
|
|
|
|
|
|
// If we re-subscribe to something even if there are no changes we get a
|
|
|
|
// If we re-subscribe to something even if there are no changes we get a
|
|
|
|
// fresh copy.
|
|
|
|
// fresh copy.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
// And no other response yet
|
|
|
|
// And no other response yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -159,7 +160,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "avoid sending config for unsubscribed resource", func(t *testing.T) {
|
|
|
|
runStep(t, "avoid sending config for unsubscribed resource", func(t *testing.T) {
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesUnsubscribe: []string{
|
|
|
|
ResourceNamesUnsubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -185,20 +186,20 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// and fix the subscription
|
|
|
|
// and fix the subscription
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 5)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 5)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -247,7 +248,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
snap.Port = 1
|
|
|
|
snap.Port = 1
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover.
|
|
|
|
// Send initial cluster discover.
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -260,7 +261,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "first sync", func(t *testing.T) {
|
|
|
|
runStep(t, "first sync", func(t *testing.T) {
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -270,7 +271,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -278,14 +279,14 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// deliver a new config version.
|
|
|
|
// deliver a new config version.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
@ -297,14 +298,14 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
// Response contains public_listener with port that Envoy can't bind to
|
|
|
|
// Response contains public_listener with port that Envoy can't bind to
|
|
|
@ -318,7 +319,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// NACKs the listener update due to the bad public listener
|
|
|
|
// NACKs the listener update due to the bad public listener
|
|
|
|
envoy.SendDeltaReqNACK(t, ListenerType, 3, &rpcstatus.Status{})
|
|
|
|
envoy.SendDeltaReqNACK(t, xdscommon.ListenerType, 3, &rpcstatus.Status{})
|
|
|
|
|
|
|
|
|
|
|
|
// Consul should not respond until a new snapshot is delivered
|
|
|
|
// Consul should not respond until a new snapshot is delivered
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -331,7 +332,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
|
|
|
|
|
|
|
|
// And should send a response immediately.
|
|
|
|
// And should send a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
// Send a public listener that Envoy will accept
|
|
|
|
// Send a public listener that Envoy will accept
|
|
|
@ -342,7 +343,7 @@ func TestServer_DeltaAggregatedResources_v3_NackLoop(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// New listener is acked now
|
|
|
|
// New listener is acked now
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -370,7 +371,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover (empty payload)
|
|
|
|
// Send initial cluster discover (empty payload)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -385,7 +386,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "no-rds", func(t *testing.T) {
|
|
|
|
runStep(t, "no-rds", func(t *testing.T) {
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -395,7 +396,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -403,14 +404,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// deliver a new config version.
|
|
|
|
// deliver a new config version.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "http2:db"),
|
|
|
|
makeTestEndpoints(t, snap, "http2:db"),
|
|
|
@ -422,14 +423,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -442,7 +443,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 3)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 3)
|
|
|
|
|
|
|
|
|
|
|
|
// And no other response yet
|
|
|
|
// And no other response yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -464,7 +465,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
runStep(t, "with-rds", func(t *testing.T) {
|
|
|
|
runStep(t, "with-rds", func(t *testing.T) {
|
|
|
|
// Just the "db" listener sees a change
|
|
|
|
// Just the "db" listener sees a change
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "http2:db:rds"),
|
|
|
|
makeTestListener(t, snap, "http2:db:rds"),
|
|
|
@ -475,25 +476,25 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2(t *testing.T) {
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends routes request
|
|
|
|
// Envoy now sends routes request
|
|
|
|
envoy.SendDeltaReq(t, RouteType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.RouteType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db",
|
|
|
|
"db",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: RouteType,
|
|
|
|
TypeUrl: xdscommon.RouteType,
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, RouteType, 5)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.RouteType, 5)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -520,11 +521,11 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
// This mutateFn causes any endpoint with a name containing "geo-cache" to be
|
|
|
|
// This mutateFn causes any endpoint with a name containing "geo-cache" to be
|
|
|
|
// omitted from the response while the hack is active.
|
|
|
|
// omitted from the response while the hack is active.
|
|
|
|
var slowHackDisabled uint32
|
|
|
|
var slowHackDisabled uint32
|
|
|
|
server.ResourceMapMutateFn = func(resourceMap *IndexedResources) {
|
|
|
|
server.ResourceMapMutateFn = func(resourceMap *xdscommon.IndexedResources) {
|
|
|
|
if atomic.LoadUint32(&slowHackDisabled) == 1 {
|
|
|
|
if atomic.LoadUint32(&slowHackDisabled) == 1 {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if em, ok := resourceMap.Index[EndpointType]; ok {
|
|
|
|
if em, ok := resourceMap.Index[xdscommon.EndpointType]; ok {
|
|
|
|
for k := range em {
|
|
|
|
for k := range em {
|
|
|
|
if strings.Contains(k, "geo-cache") {
|
|
|
|
if strings.Contains(k, "geo-cache") {
|
|
|
|
delete(em, k)
|
|
|
|
delete(em, k)
|
|
|
@ -543,7 +544,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
snap = newTestSnapshot(t, nil, "")
|
|
|
|
snap = newTestSnapshot(t, nil, "")
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover.
|
|
|
|
// Send initial cluster discover.
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -554,7 +555,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -564,7 +565,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -572,7 +573,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
@ -581,7 +582,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// NOTE: we do NOT return back geo-cache yet
|
|
|
|
// NOTE: we do NOT return back geo-cache yet
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
@ -593,14 +594,14 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -613,7 +614,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 3)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 3)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Disable hack. Need to wait for one more event to wake up the loop.
|
|
|
|
// Disable hack. Need to wait for one more event to wake up the loop.
|
|
|
@ -626,7 +627,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
@ -637,7 +638,7 @@ func TestServer_DeltaAggregatedResources_v3_SlowEndpointPopulation(t *testing.T)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
@ -674,7 +675,7 @@ func TestServer_DeltaAggregatedResources_v3_GetAllClusterAfterConsulRestarted(t
|
|
|
|
// This is to simulate the discovery request call from envoy after disconnected from consul ads stream.
|
|
|
|
// This is to simulate the discovery request call from envoy after disconnected from consul ads stream.
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// We need to force it to be an older version of envoy so that the logic shifts.
|
|
|
|
// We need to force it to be an older version of envoy so that the logic shifts.
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"local_app",
|
|
|
|
"local_app",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -697,7 +698,7 @@ func TestServer_DeltaAggregatedResources_v3_GetAllClusterAfterConsulRestarted(t
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -734,7 +735,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
snap = newTestSnapshot(t, nil, "")
|
|
|
|
snap = newTestSnapshot(t, nil, "")
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover.
|
|
|
|
// Send initial cluster discover.
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, &envoy_discovery_v3.DeltaDiscoveryRequest{})
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -745,7 +746,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -755,7 +756,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -763,14 +764,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// deliver a new config version.
|
|
|
|
// deliver a new config version.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
@ -782,14 +783,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -802,7 +803,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 3)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 3)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "trigger cluster update needing implicit endpoint replacements", func(t *testing.T) {
|
|
|
|
runStep(t, "trigger cluster update needing implicit endpoint replacements", func(t *testing.T) {
|
|
|
@ -816,7 +817,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
|
|
|
|
|
|
|
|
// The cluster is updated
|
|
|
|
// The cluster is updated
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
// SAME makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
// SAME makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -825,19 +826,19 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpa
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
// And we re-send the endpoints for the updated cluster after getting the
|
|
|
|
// And we re-send the endpoints for the updated cluster after getting the
|
|
|
|
// ACK for the cluster.
|
|
|
|
// ACK for the cluster.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
makeTestEndpoints(t, snap, "tcp:db"),
|
|
|
|
// SAME makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
// SAME makeTestEndpoints(t, snap, "tcp:geo-cache"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 5)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 5)
|
|
|
|
|
|
|
|
|
|
|
|
// And no other response yet
|
|
|
|
// And no other response yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -869,7 +870,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
|
|
|
|
|
|
|
|
runStep(t, "get into initial state", func(t *testing.T) {
|
|
|
|
runStep(t, "get into initial state", func(t *testing.T) {
|
|
|
|
// Send initial cluster discover (empty payload)
|
|
|
|
// Send initial cluster discover (empty payload)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -887,7 +888,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -897,7 +898,7 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
// Envoy then tries to discover endpoints for those clusters.
|
|
|
|
envoy.SendDeltaReq(t, EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.EndpointType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
|
"geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
|
|
|
@ -905,14 +906,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
// It also (in parallel) issues the cluster ACK
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// We should get a response immediately since the config is already present in
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// the server for endpoints. Note that this should not be racy if the server
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// is behaving well since the Cluster send above should be blocked until we
|
|
|
|
// deliver a new config version.
|
|
|
|
// deliver a new config version.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "http2:db"),
|
|
|
|
makeTestEndpoints(t, snap, "http2:db"),
|
|
|
@ -924,14 +925,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends listener request
|
|
|
|
// Envoy now sends listener request
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
// It also (in parallel) issues the endpoint ACK
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 2)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 2)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Nonce: hexString(3),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -944,25 +945,25 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// Envoy now sends routes request
|
|
|
|
// Envoy now sends routes request
|
|
|
|
envoy.SendDeltaReq(t, RouteType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.RouteType, &envoy_discovery_v3.DeltaDiscoveryRequest{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
ResourceNamesSubscribe: []string{
|
|
|
|
"db",
|
|
|
|
"db",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 3)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 3)
|
|
|
|
|
|
|
|
|
|
|
|
// And should get a response immediately.
|
|
|
|
// And should get a response immediately.
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: RouteType,
|
|
|
|
TypeUrl: xdscommon.RouteType,
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Nonce: hexString(4),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, RouteType, 4)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.RouteType, 4)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -984,14 +985,14 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
|
|
|
|
|
|
|
|
// db cluster is refreshed (unrelated to the test scenario other than it's required)
|
|
|
|
// db cluster is refreshed (unrelated to the test scenario other than it's required)
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Nonce: hexString(5),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "http:db"),
|
|
|
|
makeTestCluster(t, snap, "http:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 5)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 5)
|
|
|
|
|
|
|
|
|
|
|
|
// The behaviors of Cluster updates triggering re-sends of Endpoint updates
|
|
|
|
// The behaviors of Cluster updates triggering re-sends of Endpoint updates
|
|
|
|
// tested in TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpactEndpoints
|
|
|
|
// tested in TestServer_DeltaAggregatedResources_v3_BasicProtocol_TCP_clusterChangesImpactEndpoints
|
|
|
@ -999,18 +1000,18 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
// this exchange to get to the part we care about.
|
|
|
|
// this exchange to get to the part we care about.
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: EndpointType,
|
|
|
|
TypeUrl: xdscommon.EndpointType,
|
|
|
|
Nonce: hexString(6),
|
|
|
|
Nonce: hexString(6),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestEndpoints(t, snap, "http:db"),
|
|
|
|
makeTestEndpoints(t, snap, "http:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, EndpointType, 6)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.EndpointType, 6)
|
|
|
|
|
|
|
|
|
|
|
|
// the listener is updated
|
|
|
|
// the listener is updated
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(7),
|
|
|
|
Nonce: hexString(7),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "http:db:rds"),
|
|
|
|
makeTestListener(t, snap, "http:db:rds"),
|
|
|
@ -1018,18 +1019,18 @@ func TestServer_DeltaAggregatedResources_v3_BasicProtocol_HTTP2_RDS_listenerChan
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
// ACKs the listener
|
|
|
|
// ACKs the listener
|
|
|
|
envoy.SendDeltaReqACK(t, ListenerType, 7)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ListenerType, 7)
|
|
|
|
|
|
|
|
|
|
|
|
// THE ACTUAL THING WE CARE ABOUT: replaced route config
|
|
|
|
// THE ACTUAL THING WE CARE ABOUT: replaced route config
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: RouteType,
|
|
|
|
TypeUrl: xdscommon.RouteType,
|
|
|
|
Nonce: hexString(8),
|
|
|
|
Nonce: hexString(8),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
makeTestRoute(t, "http2:db"),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
envoy.SendDeltaReqACK(t, RouteType, 8)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.RouteType, 8)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -1134,11 +1135,11 @@ func TestServer_DeltaAggregatedResources_v3_ACLEnforcement(t *testing.T) {
|
|
|
|
// Send initial listener discover, in real life Envoy always sends cluster
|
|
|
|
// Send initial listener discover, in real life Envoy always sends cluster
|
|
|
|
// first but it doesn't really matter and listener has a response that
|
|
|
|
// first but it doesn't really matter and listener has a response that
|
|
|
|
// includes the token in the ext rbac filter so lets us test more stuff.
|
|
|
|
// includes the token in the ext rbac filter so lets us test more stuff.
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
if !tt.wantDenied {
|
|
|
|
if !tt.wantDenied {
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
|
makeTestListener(t, snap, "tcp:public_listener"),
|
|
|
@ -1208,7 +1209,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedDuri
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover (OK)
|
|
|
|
// Send initial cluster discover (OK)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
err, ok := getError()
|
|
|
|
err, ok := getError()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, err)
|
|
|
@ -1228,7 +1229,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedDuri
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -1239,7 +1240,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedDuri
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the next cluster request (which acts as an ACK
|
|
|
|
// It also (in parallel) issues the next cluster request (which acts as an ACK
|
|
|
|
// of the version we sent)
|
|
|
|
// of the version we sent)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -1306,7 +1307,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedInBa
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover (OK)
|
|
|
|
// Send initial cluster discover (OK)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
err, ok := getError()
|
|
|
|
err, ok := getError()
|
|
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, err)
|
|
|
@ -1326,7 +1327,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedInBa
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
Resources: makeTestResources(t,
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
|
makeTestCluster(t, snap, "tcp:local_app"),
|
|
|
@ -1337,7 +1338,7 @@ func TestServer_DeltaAggregatedResources_v3_ACLTokenDeleted_StreamTerminatedInBa
|
|
|
|
|
|
|
|
|
|
|
|
// It also (in parallel) issues the next cluster request (which acts as an ACK
|
|
|
|
// It also (in parallel) issues the next cluster request (which acts as an ACK
|
|
|
|
// of the version we sent)
|
|
|
|
// of the version we sent)
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -1378,7 +1379,7 @@ func TestServer_DeltaAggregatedResources_v3_IngressEmptyResponse(t *testing.T) {
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
mgr.RegisterProxy(t, sid)
|
|
|
|
|
|
|
|
|
|
|
|
// Send initial cluster discover
|
|
|
|
// Send initial cluster discover
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// Check no response sent yet
|
|
|
|
// Check no response sent yet
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
@ -1388,25 +1389,25 @@ func TestServer_DeltaAggregatedResources_v3_IngressEmptyResponse(t *testing.T) {
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
mgr.DeliverConfig(t, sid, snap)
|
|
|
|
|
|
|
|
|
|
|
|
// REQ: clusters
|
|
|
|
// REQ: clusters
|
|
|
|
envoy.SendDeltaReq(t, ClusterType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ClusterType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// RESP: cluster
|
|
|
|
// RESP: cluster
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ClusterType,
|
|
|
|
TypeUrl: xdscommon.ClusterType,
|
|
|
|
Nonce: hexString(1),
|
|
|
|
Nonce: hexString(1),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
assertDeltaChanBlocked(t, envoy.deltaStream.sendCh)
|
|
|
|
|
|
|
|
|
|
|
|
// ACK: clusters
|
|
|
|
// ACK: clusters
|
|
|
|
envoy.SendDeltaReqACK(t, ClusterType, 1)
|
|
|
|
envoy.SendDeltaReqACK(t, xdscommon.ClusterType, 1)
|
|
|
|
|
|
|
|
|
|
|
|
// REQ: listeners
|
|
|
|
// REQ: listeners
|
|
|
|
envoy.SendDeltaReq(t, ListenerType, nil)
|
|
|
|
envoy.SendDeltaReq(t, xdscommon.ListenerType, nil)
|
|
|
|
|
|
|
|
|
|
|
|
// RESP: listeners
|
|
|
|
// RESP: listeners
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
assertDeltaResponseSent(t, envoy.deltaStream.sendCh, &envoy_discovery_v3.DeltaDiscoveryResponse{
|
|
|
|
TypeUrl: ListenerType,
|
|
|
|
TypeUrl: xdscommon.ListenerType,
|
|
|
|
Nonce: hexString(2),
|
|
|
|
Nonce: hexString(2),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|