github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add endpoint test for NodesOnly flag

pull/20168/head
Dhia Ayachi 2024-01-11 11:45:48 -05:00
parent d00d9c5da4
commit b2db3d5eb4
No known key found for this signature in database
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/consul/internal_endpoint_test.go
View File

@ -1779,10 +1779,11 @@ func TestInternal_ServiceDump_Peering(t *testing.T) {
// prep the cluster with some data we can use in our filters // prep the cluster with some data we can use in our filters
registerTestCatalogEntries(t, codec) registerTestCatalogEntries(t, codec)
doRequest := func(t *testing.T, filter string) structs.IndexedNodesWithGateways { doRequest := func(t *testing.T, filter string, onlyNodes bool) structs.IndexedNodesWithGateways {
t.Helper() t.Helper()
args := structs.DCSpecificRequest{ args := structs.ServiceDumpRequest{
QueryOptions: structs.QueryOptions{Filter: filter}, QueryOptions: structs.QueryOptions{Filter: filter},
NodesOnly: onlyNodes,
} }
var out structs.IndexedNodesWithGateways var out structs.IndexedNodesWithGateways
@ -1792,7 +1793,7 @@ func TestInternal_ServiceDump_Peering(t *testing.T) {
} }
t.Run("No peerings", func(t *testing.T) { t.Run("No peerings", func(t *testing.T) {
nodes := doRequest(t, "") nodes := doRequest(t, "", false)
// redis (3), web (3), critical (1), warning (1) and consul (1) // redis (3), web (3), critical (1), warning (1) and consul (1)
require.Len(t, nodes.Nodes, 9) require.Len(t, nodes.Nodes, 9)
require.Len(t, nodes.ImportedNodes, 0) require.Len(t, nodes.ImportedNodes, 0)
@ -1809,19 +1810,27 @@ func TestInternal_ServiceDump_Peering(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
t.Run("peerings", func(t *testing.T) { t.Run("peerings", func(t *testing.T) {
nodes := doRequest(t, "") nodes := doRequest(t, "", false)
// redis (3), web (3), critical (1), warning (1) and consul (1) // redis (3), web (3), critical (1), warning (1) and consul (1)
require.Len(t, nodes.Nodes, 9) require.Len(t, nodes.Nodes, 9)
// service (1) // service (1)
require.Len(t, nodes.ImportedNodes, 1) require.Len(t, nodes.ImportedNodes, 1)
}) })
t.Run("peerings onlynodes", func(t *testing.T) {
nodes := doRequest(t, "", true)
// redis (3), web (3), critical (1), warning (1) and consul (1)
require.Len(t, nodes.Nodes, 9)
// service (1)
require.Len(t, nodes.ImportedNodes, 0)
})
t.Run("peerings w filter", func(t *testing.T) { t.Run("peerings w filter", func(t *testing.T) {
nodes := doRequest(t, "Node.PeerName == foo") nodes := doRequest(t, "Node.PeerName == foo", false)
require.Len(t, nodes.Nodes, 0) require.Len(t, nodes.Nodes, 0)
require.Len(t, nodes.ImportedNodes, 0) require.Len(t, nodes.ImportedNodes, 0)
nodes2 := doRequest(t, "Node.PeerName == peer1") nodes2 := doRequest(t, "Node.PeerName == peer1", false)
require.Len(t, nodes2.Nodes, 0) require.Len(t, nodes2.Nodes, 0)
require.Len(t, nodes2.ImportedNodes, 1) require.Len(t, nodes2.ImportedNodes, 1)
}) })