2017-01-13 19:47:16 +00:00
|
|
|
|
package state
|
|
|
|
|
|
|
|
|
|
import (
|
2022-05-27 11:38:52 +00:00
|
|
|
|
"context"
|
2021-08-19 21:17:59 +00:00
|
|
|
|
crand "crypto/rand"
|
2017-01-13 19:47:16 +00:00
|
|
|
|
"fmt"
|
2022-07-14 18:45:51 +00:00
|
|
|
|
"github.com/hashicorp/consul/acl"
|
2020-05-20 16:43:33 +00:00
|
|
|
|
"reflect"
|
|
|
|
|
"sort"
|
|
|
|
|
"strings"
|
|
|
|
|
"testing"
|
2022-05-27 11:38:52 +00:00
|
|
|
|
"time"
|
2020-05-20 16:43:33 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
"github.com/hashicorp/go-memdb"
|
2022-06-24 18:38:39 +00:00
|
|
|
|
"github.com/hashicorp/go-uuid"
|
2018-03-07 01:13:52 +00:00
|
|
|
|
"github.com/stretchr/testify/assert"
|
2018-10-11 11:50:05 +00:00
|
|
|
|
"github.com/stretchr/testify/require"
|
2020-10-23 19:21:37 +00:00
|
|
|
|
|
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
|
|
|
"github.com/hashicorp/consul/api"
|
|
|
|
|
"github.com/hashicorp/consul/lib/stringslice"
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
"github.com/hashicorp/consul/sdk/testutil"
|
2020-10-23 19:21:37 +00:00
|
|
|
|
"github.com/hashicorp/consul/types"
|
2017-01-13 19:47:16 +00:00
|
|
|
|
)
|
|
|
|
|
|
2017-02-01 22:20:25 +00:00
|
|
|
|
func makeRandomNodeID(t *testing.T) types.NodeID {
|
|
|
|
|
id, err := uuid.GenerateUUID()
|
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
return types.NodeID(id)
|
|
|
|
|
}
|
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
func TestStateStore_GetNodeID(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err := s.GetNodeID(types.NodeID("wrongId"), nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: UUID (without hyphens) must be") {
|
|
|
|
|
t.Errorf("want an error, nil value, err:=%q ; out:=%q", err.Error(), out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNodeID(types.NodeID("0123456789abcdefghijklmnopqrstuvwxyz"), nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: invalid UUID") {
|
|
|
|
|
t.Errorf("want an error, nil value, err:=%q ; out:=%q", err, out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNodeID(types.NodeID("00a916bc-a357-4a19-b886-59419fcee50Z"), nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: invalid UUID") {
|
|
|
|
|
t.Errorf("want an error, nil value, err:=%q ; out:=%q", err, out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNodeID(types.NodeID("00a916bc-a357-4a19-b886-59419fcee506"), nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil || out != nil {
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Errorf("do not want any error nor returned value, err:=%q ; out:=%q", err, out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nodeID := types.NodeID("00a916bc-a357-4a19-b886-59419fceeaaa")
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: nodeID,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.NoError(t, s.EnsureRegistration(1, req))
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNodeID(nodeID, nil, "")
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.NoError(t, err)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if out == nil || out.ID != nodeID {
|
2018-08-28 16:37:34 +00:00
|
|
|
|
t.Fatalf("out should not be nil and contain nodeId, but was:=%#v", out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
// Case insensitive lookup should work as well
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNodeID(types.NodeID("00a916bC-a357-4a19-b886-59419fceeAAA"), nil, "")
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.NoError(t, err)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if out == nil || out.ID != nodeID {
|
2018-08-28 16:37:34 +00:00
|
|
|
|
t.Fatalf("out should not be nil and contain nodeId, but was:=%#v", out)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 21:49:26 +00:00
|
|
|
|
func TestStateStore_GetNode(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assertExists := func(t *testing.T, s *Store, node, peerName string, expectIndex uint64) {
|
|
|
|
|
idx, out, err := s.GetNode(node, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, out)
|
|
|
|
|
require.Equal(t, expectIndex, idx)
|
|
|
|
|
require.Equal(t, strings.ToLower(node), out.Node)
|
|
|
|
|
require.Equal(t, strings.ToLower(peerName), out.PeerName)
|
|
|
|
|
}
|
|
|
|
|
assertNotExist := func(t *testing.T, s *Store, node, peerName string) {
|
|
|
|
|
idx, out, err := s.GetNode(node, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Nil(t, out)
|
|
|
|
|
require.Equal(t, uint64(0), idx)
|
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
t.Run("default peer", func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// initially does not exist
|
|
|
|
|
assertNotExist(t, s, "node1", "")
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Create it
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// now exists
|
|
|
|
|
assertExists(t, s, "node1", "", 1)
|
|
|
|
|
|
|
|
|
|
// Case insensitive lookup should work as well
|
|
|
|
|
assertExists(t, s, "NoDe1", "", 1)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("random peer", func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// initially do not exist
|
|
|
|
|
assertNotExist(t, s, "node1", "")
|
|
|
|
|
assertNotExist(t, s, "node1", "my-peer")
|
|
|
|
|
|
|
|
|
|
// Create one with no peer, and one with a peer to test a peer-name crossing issue.
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
testRegisterNodeOpts(t, s, 2, "node1", func(n *structs.Node) error {
|
|
|
|
|
n.PeerName = "my-peer"
|
|
|
|
|
return nil
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// now exist
|
|
|
|
|
assertExists(t, s, "node1", "", 1)
|
|
|
|
|
assertExists(t, s, "node1", "my-peer", 2)
|
|
|
|
|
|
|
|
|
|
// Case insensitive lookup should work as well
|
|
|
|
|
assertExists(t, s, "NoDe1", "", 1)
|
|
|
|
|
assertExists(t, s, "NoDe1", "my-peer", 2)
|
|
|
|
|
})
|
2021-08-17 21:49:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
func TestStateStore_ensureNoNodeWithSimilarNameTxn(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
s := testStateStore(t)
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
nodeID := makeRandomNodeID(t)
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: nodeID,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
TaggedAddresses: map[string]string{"hello": "world"},
|
|
|
|
|
NodeMeta: map[string]string{"somekey": "somevalue"},
|
2019-03-13 23:23:05 +00:00
|
|
|
|
Check: &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
},
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.NoError(t, s.EnsureRegistration(1, req))
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
req = &structs.RegisterRequest{
|
|
|
|
|
ID: types.NodeID(""),
|
|
|
|
|
Node: "node2",
|
|
|
|
|
Address: "10.0.0.1",
|
2019-03-13 23:23:05 +00:00
|
|
|
|
Check: &structs.HealthCheck{
|
|
|
|
|
Node: "node2",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
},
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.NoError(t, s.EnsureRegistration(2, req))
|
|
|
|
|
|
2020-03-19 13:11:20 +00:00
|
|
|
|
tx := s.db.WriteTxnRestore()
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
defer tx.Abort()
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
node := &structs.Node{
|
|
|
|
|
ID: makeRandomNodeID(t),
|
|
|
|
|
Node: "NOdE1", // Name is similar but case is different
|
|
|
|
|
Address: "2.3.4.5",
|
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
// Lets conflict with node1 (has an ID)
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.Error(t, ensureNoNodeWithSimilarNameTxn(tx, node, false),
|
|
|
|
|
"Should return an error since another name with similar name exists")
|
|
|
|
|
require.Error(t, ensureNoNodeWithSimilarNameTxn(tx, node, true),
|
|
|
|
|
"Should return an error since another name with similar name exists")
|
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
// Lets conflict with node without ID
|
|
|
|
|
node.Node = "NoDe2"
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.Error(t, ensureNoNodeWithSimilarNameTxn(tx, node, false),
|
|
|
|
|
"Should return an error since another name with similar name exists")
|
|
|
|
|
require.NoError(t, ensureNoNodeWithSimilarNameTxn(tx, node, true),
|
|
|
|
|
"Should not clash with another similar node name without ID")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
|
2019-03-13 23:23:05 +00:00
|
|
|
|
// Set node1's Serf health to failing and replace it.
|
|
|
|
|
newNode := &structs.Node{
|
|
|
|
|
ID: makeRandomNodeID(t),
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "2.3.4.5",
|
|
|
|
|
}
|
2021-08-17 21:49:26 +00:00
|
|
|
|
require.Error(t, ensureNoNodeWithSimilarNameTxn(tx, newNode, false),
|
|
|
|
|
"Should return an error since the previous node is still healthy")
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.ensureCheckTxn(tx, 5, false, &structs.HealthCheck{
|
2019-03-13 23:23:05 +00:00
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthCritical,
|
2021-08-17 21:49:26 +00:00
|
|
|
|
}))
|
|
|
|
|
require.NoError(t, ensureNoNodeWithSimilarNameTxn(tx, newNode, false))
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_EnsureRegistration(t *testing.T) {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Parallel()
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
run := func(t *testing.T, peerName string) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
// Start with just a node.
|
|
|
|
|
nodeID := makeRandomNodeID(t)
|
|
|
|
|
|
|
|
|
|
makeReq := func(f func(*structs.RegisterRequest)) *structs.RegisterRequest {
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: nodeID,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
TaggedAddresses: map[string]string{"hello": "world"},
|
|
|
|
|
NodeMeta: map[string]string{"somekey": "somevalue"},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
if f != nil {
|
|
|
|
|
f(req)
|
|
|
|
|
}
|
|
|
|
|
return req
|
2017-04-27 23:03:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyNode := func(t *testing.T) {
|
|
|
|
|
node := &structs.Node{
|
|
|
|
|
ID: nodeID,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
Partition: structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
|
|
|
|
|
TaggedAddresses: map[string]string{"hello": "world"},
|
|
|
|
|
Meta: map[string]string{"somekey": "somevalue"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{CreateIndex: 1, ModifyIndex: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
2017-04-27 23:03:05 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err := s.GetNode("node1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, node, out)
|
|
|
|
|
|
|
|
|
|
_, out2, err := s.GetNodeID(nodeID, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, out2)
|
|
|
|
|
require.Equal(t, out, out2)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyService := func(t *testing.T) {
|
|
|
|
|
svcmap := map[string]*structs.NodeService{
|
|
|
|
|
"redis1": {
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
RaftIndex: structs.RaftIndex{CreateIndex: 2, ModifyIndex: 2},
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.NodeServices(nil, "node1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(2), idx)
|
|
|
|
|
require.Equal(t, svcmap, out.Services)
|
2018-03-27 20:22:42 +00:00
|
|
|
|
|
2022-05-27 11:38:52 +00:00
|
|
|
|
idx, r, err := s.NodeService(nil, "node1", "redis1", nil, peerName)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(2), idx)
|
|
|
|
|
require.Equal(t, svcmap["redis1"], r)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// lookup service by node name
|
|
|
|
|
idx, sn, err := s.ServiceNode("", "node1", "redis1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(2), idx)
|
|
|
|
|
require.Equal(t, svcmap["redis1"].ToServiceNode("node1"), sn)
|
2017-04-27 23:03:05 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// lookup service by node ID
|
|
|
|
|
idx, sn, err = s.ServiceNode(string(nodeID), "", "redis1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(2), idx)
|
|
|
|
|
require.Equal(t, svcmap["redis1"].ToServiceNode("node1"), sn)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// lookup service by invalid node
|
|
|
|
|
_, _, err = s.ServiceNode("", "invalid-node", "redis1", nil, peerName)
|
|
|
|
|
testutil.RequireErrorContains(t, err, "node not found")
|
2022-04-20 00:24:21 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// lookup service without node name or ID
|
|
|
|
|
_, _, err = s.ServiceNode("", "", "redis1", nil, peerName)
|
|
|
|
|
testutil.RequireErrorContains(t, err, "Node ID or name required to lookup the service")
|
2022-04-20 00:24:21 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyCheck := func(t *testing.T) {
|
|
|
|
|
checks := structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
Status: "critical",
|
|
|
|
|
RaftIndex: structs.RaftIndex{CreateIndex: 3, ModifyIndex: 3},
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
2022-04-20 00:24:21 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.NodeChecks(nil, "node1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(3), idx)
|
|
|
|
|
require.Equal(t, checks, out)
|
2022-04-20 00:24:21 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, c, err := s.NodeCheck("node1", "check1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(3), idx)
|
|
|
|
|
require.Equal(t, checks[0], c)
|
2022-04-20 00:24:21 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyChecks := func(t *testing.T) {
|
|
|
|
|
checks := structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
Status: "critical",
|
|
|
|
|
RaftIndex: structs.RaftIndex{CreateIndex: 3, ModifyIndex: 3},
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "check",
|
|
|
|
|
Status: "critical",
|
|
|
|
|
ServiceID: "redis1",
|
|
|
|
|
ServiceName: "redis",
|
|
|
|
|
ServiceTags: []string{"primary"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{CreateIndex: 4, ModifyIndex: 4},
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
idx, out, err := s.NodeChecks(nil, "node1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(4), idx)
|
|
|
|
|
require.Equal(t, checks, out)
|
2022-04-20 00:24:21 +00:00
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a node", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(nil)
|
|
|
|
|
require.NoError(t, s.EnsureRegistration(1, req))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Retrieve the node and verify its contents.
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
})
|
2017-04-27 23:03:05 +00:00
|
|
|
|
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a node with invalid meta", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add in a invalid service definition with too long Key value for Meta
|
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Meta: map[string]string{strings.Repeat("a", 129): "somevalue"},
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
testutil.RequireErrorContains(t, s.EnsureRegistration(9, req), `Key is too long (limit: 128 characters)`)
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add in a service definition.
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a service definition", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, s.EnsureRegistration(2, req))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Verify that the service got registered.
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
verifyService(t)
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add in a top-level check.
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a top level check", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Check = &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, s.EnsureRegistration(3, req))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Verify that the check got registered.
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
verifyService(t)
|
|
|
|
|
verifyCheck(t)
|
|
|
|
|
})
|
2017-03-29 23:01:53 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add a service check which should populate the ServiceName
|
|
|
|
|
// and ServiceTags fields in the response.
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a service check", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Check = &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Checks = structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "check",
|
|
|
|
|
ServiceID: "redis1",
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, s.EnsureRegistration(4, req))
|
2017-03-29 23:01:53 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Verify that the additional check got registered.
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
verifyService(t)
|
|
|
|
|
verifyChecks(t)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Try to register a check for some other node (top-level check).
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "try to register a check for some other node via the top level check", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Check = &structs.HealthCheck{
|
|
|
|
|
Node: "nope",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Checks = structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "check",
|
|
|
|
|
ServiceID: "redis1",
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
testutil.RequireErrorContains(t, s.EnsureRegistration(5, req), `does not match node`)
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
verifyService(t)
|
|
|
|
|
verifyChecks(t)
|
|
|
|
|
})
|
|
|
|
|
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "try to register a check for some other node via the checks array", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Try to register a check for some other node (checks array).
|
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Checks = structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "nope",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "check",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
testutil.RequireErrorContains(t, s.EnsureRegistration(6, req), `does not match node`)
|
|
|
|
|
verifyNode(t)
|
|
|
|
|
verifyService(t)
|
|
|
|
|
verifyChecks(t)
|
|
|
|
|
})
|
2022-05-27 11:38:52 +00:00
|
|
|
|
|
|
|
|
|
testutil.RunStep(t, "NodeService with WatchSet", func(t *testing.T) {
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
|
|
|
|
|
_, _, err := s.NodeService(ws, "node1", "watch1", nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "watch1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Tags: []string{"primary"},
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, s.EnsureRegistration(7, req))
|
|
|
|
|
|
|
|
|
|
select {
|
|
|
|
|
case <-ws.WatchCh(context.Background()):
|
|
|
|
|
case <-time.After(100 * time.Millisecond):
|
|
|
|
|
t.Fatal("WatchSet did not trigger after service registration")
|
|
|
|
|
}
|
|
|
|
|
})
|
2017-03-29 23:01:53 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
|
|
|
|
|
t.Run("default peer", func(t *testing.T) {
|
|
|
|
|
run(t, structs.DefaultPeerKeyword)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("random peer", func(t *testing.T) {
|
|
|
|
|
run(t, "my-peer")
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_EnsureRegistration_Restore(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
const (
|
|
|
|
|
nodeID = "099eac9d-8e3e-464b-b3f5-8d7dcfcf9f71"
|
|
|
|
|
nodeName = "node1"
|
|
|
|
|
)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
run := func(t *testing.T, peerName string) {
|
2022-06-23 15:13:25 +00:00
|
|
|
|
verifyNode := func(t *testing.T, s *Store, nodeLookup string, expectIdx uint64) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.GetNode(nodeLookup, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
byID := false
|
|
|
|
|
if out == nil {
|
|
|
|
|
_, out, err = s.GetNodeID(types.NodeID(nodeLookup), nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
byID = true
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NotNil(t, out)
|
2022-06-23 15:13:25 +00:00
|
|
|
|
require.Equal(t, expectIdx, idx)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
|
|
|
|
|
require.Equal(t, "1.2.3.4", out.Address)
|
|
|
|
|
if byID {
|
|
|
|
|
require.Equal(t, nodeLookup, string(out.ID))
|
|
|
|
|
} else {
|
|
|
|
|
require.Equal(t, nodeLookup, out.Node)
|
2017-02-01 23:41:10 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.Equal(t, peerName, out.PeerName)
|
|
|
|
|
require.Equal(t, uint64(1), out.CreateIndex)
|
|
|
|
|
require.Equal(t, uint64(1), out.ModifyIndex)
|
2017-02-01 23:41:10 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyService := func(t *testing.T, s *Store, nodeLookup string) {
|
|
|
|
|
idx, out, err := s.NodeServices(nil, nodeLookup, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
2017-02-01 23:41:10 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.Len(t, out.Services, 1)
|
|
|
|
|
require.Equal(t, uint64(2), idx)
|
|
|
|
|
svc := out.Services["redis1"]
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "redis1", svc.ID)
|
|
|
|
|
require.Equal(t, "redis", svc.Service)
|
|
|
|
|
require.Equal(t, peerName, svc.PeerName)
|
|
|
|
|
require.Equal(t, "1.1.1.1", svc.Address)
|
|
|
|
|
require.Equal(t, 8080, svc.Port)
|
|
|
|
|
require.Equal(t, uint64(2), svc.CreateIndex)
|
|
|
|
|
require.Equal(t, uint64(2), svc.ModifyIndex)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyCheck := func(t *testing.T, s *Store) {
|
|
|
|
|
idx, out, err := s.NodeChecks(nil, nodeName, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.Len(t, out, 1)
|
|
|
|
|
require.Equal(t, uint64(3), idx)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
c := out[0]
|
|
|
|
|
|
|
|
|
|
require.Equal(t, strings.ToUpper(nodeName), c.Node)
|
|
|
|
|
require.Equal(t, "check1", string(c.CheckID))
|
|
|
|
|
require.Equal(t, "check", c.Name)
|
|
|
|
|
require.Equal(t, peerName, c.PeerName)
|
|
|
|
|
require.Equal(t, uint64(3), c.CreateIndex)
|
|
|
|
|
require.Equal(t, uint64(3), c.ModifyIndex)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyChecks := func(t *testing.T, s *Store) {
|
|
|
|
|
idx, out, err := s.NodeChecks(nil, nodeName, nil, peerName)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
require.Len(t, out, 2)
|
|
|
|
|
require.Equal(t, uint64(4), idx)
|
|
|
|
|
|
|
|
|
|
c1 := out[0]
|
|
|
|
|
require.Equal(t, strings.ToUpper(nodeName), c1.Node)
|
|
|
|
|
require.Equal(t, "check1", string(c1.CheckID))
|
|
|
|
|
require.Equal(t, "check", c1.Name)
|
|
|
|
|
require.Equal(t, peerName, c1.PeerName)
|
|
|
|
|
require.Equal(t, uint64(3), c1.CreateIndex)
|
|
|
|
|
require.Equal(t, uint64(3), c1.ModifyIndex)
|
|
|
|
|
|
|
|
|
|
c2 := out[1]
|
|
|
|
|
require.Equal(t, nodeName, c2.Node)
|
|
|
|
|
require.Equal(t, "check2", string(c2.CheckID))
|
|
|
|
|
require.Equal(t, "check", c2.Name)
|
|
|
|
|
require.Equal(t, peerName, c2.PeerName)
|
|
|
|
|
require.Equal(t, uint64(4), c2.CreateIndex)
|
|
|
|
|
require.Equal(t, uint64(4), c2.ModifyIndex)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
|
|
|
|
|
makeReq := func(f func(*structs.RegisterRequest)) *structs.RegisterRequest {
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: types.NodeID(nodeID),
|
|
|
|
|
Node: nodeName,
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 1,
|
|
|
|
|
ModifyIndex: 1,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
if f != nil {
|
|
|
|
|
f(req)
|
|
|
|
|
}
|
|
|
|
|
return req
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s := testStateStore(t)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Start with just a node.
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a node", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(nil)
|
|
|
|
|
restore := s.Restore()
|
|
|
|
|
require.NoError(t, restore.Registration(1, req))
|
|
|
|
|
require.NoError(t, restore.Commit())
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Retrieve the node and verify its contents.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
verifyNode(t, s, nodeID, 1)
|
|
|
|
|
verifyNode(t, s, nodeName, 1)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Add in a service definition.
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a service definition", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 2,
|
|
|
|
|
ModifyIndex: 2,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
restore := s.Restore()
|
|
|
|
|
require.NoError(t, restore.Registration(2, req))
|
|
|
|
|
require.NoError(t, restore.Commit())
|
|
|
|
|
|
|
|
|
|
// Verify that the service got registered.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
verifyNode(t, s, nodeID, 2)
|
|
|
|
|
verifyNode(t, s, nodeName, 2)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyService(t, s, nodeID)
|
|
|
|
|
verifyService(t, s, nodeName)
|
|
|
|
|
})
|
|
|
|
|
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add a top-level check", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add in a top-level check.
|
|
|
|
|
//
|
|
|
|
|
// Verify that node name references in checks are case-insensitive during
|
|
|
|
|
// restore.
|
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 2,
|
|
|
|
|
ModifyIndex: 2,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Check = &structs.HealthCheck{
|
|
|
|
|
Node: strings.ToUpper(nodeName),
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 3,
|
|
|
|
|
ModifyIndex: 3,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
restore := s.Restore()
|
|
|
|
|
require.NoError(t, restore.Registration(3, req))
|
|
|
|
|
require.NoError(t, restore.Commit())
|
|
|
|
|
|
|
|
|
|
// Verify that the check got registered.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
verifyNode(t, s, nodeID, 2)
|
|
|
|
|
verifyNode(t, s, nodeName, 2)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyService(t, s, nodeID)
|
|
|
|
|
verifyService(t, s, nodeName)
|
|
|
|
|
verifyCheck(t, s)
|
|
|
|
|
})
|
|
|
|
|
|
2022-05-10 20:25:51 +00:00
|
|
|
|
testutil.RunStep(t, "add another check via the slice", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
// Add in another check via the slice.
|
|
|
|
|
req := makeReq(func(req *structs.RegisterRequest) {
|
|
|
|
|
req.Service = &structs.NodeService{
|
|
|
|
|
ID: "redis1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 8080,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 2,
|
|
|
|
|
ModifyIndex: 2,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Check = &structs.HealthCheck{
|
|
|
|
|
Node: strings.ToUpper(nodeName),
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 3,
|
|
|
|
|
ModifyIndex: 3,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
}
|
|
|
|
|
req.Checks = structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: nodeName,
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "check",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
|
|
|
|
PeerName: peerName,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
restore := s.Restore()
|
|
|
|
|
require.NoError(t, restore.Registration(4, req))
|
|
|
|
|
require.NoError(t, restore.Commit())
|
|
|
|
|
|
|
|
|
|
// Verify that the additional check got registered.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
verifyNode(t, s, nodeID, 2)
|
|
|
|
|
verifyNode(t, s, nodeName, 2)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
verifyService(t, s, nodeID)
|
|
|
|
|
verifyService(t, s, nodeName)
|
|
|
|
|
verifyChecks(t, s)
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
t.Run("default peer", func(t *testing.T) {
|
|
|
|
|
run(t, structs.DefaultPeerKeyword)
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
t.Run("random peer", func(t *testing.T) {
|
|
|
|
|
run(t, "my-peer")
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
func deprecatedEnsureNodeWithoutIDCanRegister(t *testing.T, s *Store, nodeName string, txIdx uint64) {
|
|
|
|
|
// All the following is deprecated, and should be removed in future Consul versions
|
|
|
|
|
in := &structs.Node{
|
|
|
|
|
Node: nodeName,
|
|
|
|
|
Address: "1.1.1.9",
|
2018-10-11 11:42:39 +00:00
|
|
|
|
Meta: map[string]string{
|
2020-09-24 10:14:07 +00:00
|
|
|
|
"version": fmt.Sprint(txIdx),
|
2018-10-11 11:42:39 +00:00
|
|
|
|
},
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(txIdx, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.GetNode(nodeName, nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != txIdx {
|
2018-10-11 11:42:39 +00:00
|
|
|
|
t.Fatalf("index should be %v, was: %v", txIdx, idx)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
if out.Node != nodeName {
|
2018-10-11 11:42:39 +00:00
|
|
|
|
t.Fatalf("unexpected result out = %v, nodeName supposed to be %s", out, nodeName)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_EnsureNodeDeprecated(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
firstNodeName := "node-without-id"
|
|
|
|
|
deprecatedEnsureNodeWithoutIDCanRegister(t, s, firstNodeName, 1)
|
|
|
|
|
|
|
|
|
|
newNodeID := types.NodeID("00a916bc-a357-4a19-b886-59419fcee50c")
|
|
|
|
|
// With this request, we basically add a node ID to existing node
|
|
|
|
|
// and change its address
|
|
|
|
|
in := &structs.Node{
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Node: firstNodeName,
|
|
|
|
|
Address: "1.1.7.8",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(4, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
// Retrieve the node again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.GetNode(firstNodeName, nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node has updated information
|
|
|
|
|
if idx != 4 || out.Node != firstNodeName || out.ID != newNodeID || out.Address != "1.1.7.8" {
|
|
|
|
|
t.Fatalf("[DEPRECATED] bad node returned: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 4 {
|
|
|
|
|
t.Fatalf("[DEPRECATED] bad CreateIndex/ModifyIndex returned: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Now, lets update IP Address without providing any ID
|
|
|
|
|
// Only name of node will be used to match
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: firstNodeName,
|
|
|
|
|
Address: "1.1.7.10",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(7, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
// Retrieve the node again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode(firstNodeName, nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node has updated information, its ID has been removed (deprecated, but working)
|
|
|
|
|
if idx != 7 || out.Node != firstNodeName || out.ID != "" || out.Address != "1.1.7.10" {
|
|
|
|
|
t.Fatalf("[DEPRECATED] bad node returned: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 7 {
|
|
|
|
|
t.Fatalf("[DEPRECATED] bad CreateIndex/ModifyIndex returned: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestNodeRenamingNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
nodeID1 := types.NodeID("b789bf0a-d96b-4f70-a4a6-ac5dfaece53d")
|
|
|
|
|
nodeID2 := types.NodeID("27bee224-a4d7-45d0-9b8e-65b3c94a61ba")
|
|
|
|
|
|
|
|
|
|
// Node1 with ID
|
|
|
|
|
in1 := &structs.Node{
|
|
|
|
|
ID: nodeID1,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(1, in1); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureCheck(2, &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
}); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
|
|
|
|
|
// Node2 with ID
|
|
|
|
|
in2 := &structs.Node{
|
|
|
|
|
ID: nodeID2,
|
|
|
|
|
Node: "node2",
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(3, in2); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(4, &structs.HealthCheck{
|
|
|
|
|
Node: "node2",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
}); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node3 without ID
|
|
|
|
|
in3 := &structs.Node{
|
|
|
|
|
Node: "node3",
|
|
|
|
|
Address: "1.1.1.3",
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(5, in3); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(6, &structs.HealthCheck{
|
|
|
|
|
Node: "node3",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
}); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if _, node, err := s.GetNodeID(nodeID1, nil, ""); err != nil || node == nil || node.ID != nodeID1 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s, node:= %q", err, node)
|
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if _, node, err := s.GetNodeID(nodeID2, nil, ""); err != nil && node == nil || node.ID != nodeID2 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Renaming node2 into node1 should fail
|
|
|
|
|
in2Modify := &structs.Node{
|
|
|
|
|
ID: nodeID2,
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(7, in2Modify); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("Renaming node2 into node1 should fail")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Conflict with case insensitive matching as well
|
|
|
|
|
in2Modify = &structs.Node{
|
|
|
|
|
ID: nodeID2,
|
|
|
|
|
Node: "NoDe1",
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(8, in2Modify); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("Renaming node2 into node1 should fail")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Conflict with case insensitive on node without ID
|
|
|
|
|
in2Modify = &structs.Node{
|
|
|
|
|
ID: nodeID2,
|
|
|
|
|
Node: "NoDe3",
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(9, in2Modify); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("Renaming node2 into node1 should fail")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// No conflict, should work
|
|
|
|
|
in2Modify = &structs.Node{
|
|
|
|
|
ID: nodeID2,
|
|
|
|
|
Node: "node2bis",
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(10, in2Modify); err != nil {
|
2022-06-23 15:13:25 +00:00
|
|
|
|
t.Fatalf("Renaming node2 into node1 should not fail: " + err.Error())
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.GetNode("node2bis", nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx2, out2, err := s.GetNodeID(nodeID2, nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if idx != idx2 {
|
|
|
|
|
t.Fatalf("node should be the same")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if out.ID != out2.ID || out.Node != out2.Node {
|
|
|
|
|
t.Fatalf("all should match")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_EnsureNode(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Fetching a non-existent node returns nil
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if _, node, err := s.GetNode("node1", nil, ""); node != nil || err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("expected (nil, nil), got: (%#v, %#v)", node, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create a node registration request
|
|
|
|
|
in := &structs.Node{
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
ID: types.NodeID("cda916bc-a357-4a19-b886-59419fcee50c"),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Ensure the node is registered in the db
|
|
|
|
|
if err := s.EnsureNode(1, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.GetNode("node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Correct node was returned
|
|
|
|
|
if out.Node != "node1" || out.Address != "1.1.1.1" {
|
|
|
|
|
t.Fatalf("bad node returned: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Indexes are set properly
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 1 {
|
|
|
|
|
t.Fatalf("bad node index: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if idx != 1 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Update the node registration
|
2018-10-11 11:42:39 +00:00
|
|
|
|
in2 := &structs.Node{
|
|
|
|
|
ID: in.ID,
|
|
|
|
|
Node: in.Node,
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(2, in2); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode("node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node and indexes were updated
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 2 || out.Address != "1.1.1.2" {
|
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if idx != 2 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-11 11:42:39 +00:00
|
|
|
|
// Re-inserting data should not modify ModifiedIndex
|
|
|
|
|
if err := s.EnsureNode(3, in2); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNode("node1", nil, "")
|
2018-10-11 11:42:39 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 2 || out.Address != "1.1.1.2" {
|
|
|
|
|
t.Fatalf("node was modified: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
// Node upsert preserves the create index
|
2018-10-11 11:42:39 +00:00
|
|
|
|
in3 := &structs.Node{
|
|
|
|
|
ID: in.ID,
|
|
|
|
|
Node: in.Node,
|
|
|
|
|
Address: "1.1.1.3",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(3, in3); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode("node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2018-10-11 11:42:39 +00:00
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 3 || out.Address != "1.1.1.3" {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("node was modified: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if idx != 3 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
2017-03-27 07:15:21 +00:00
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
// Update index to 4, no change
|
2017-03-27 07:15:21 +00:00
|
|
|
|
if err := s.EnsureNode(4, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-12 15:19:21 +00:00
|
|
|
|
// Now try to add another node with the same ID
|
2017-03-27 07:15:21 +00:00
|
|
|
|
in = &structs.Node{
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
Node: "node1-renamed",
|
2017-03-27 07:15:21 +00:00
|
|
|
|
ID: types.NodeID("cda916bc-a357-4a19-b886-59419fcee50c"),
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
Address: "1.1.1.2",
|
2018-07-11 12:42:54 +00:00
|
|
|
|
}
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err := s.EnsureNode(6, in); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNode("node1", nil, "")
|
2020-06-05 19:28:03 +00:00
|
|
|
|
require.NoError(t, err)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if out != nil {
|
|
|
|
|
t.Fatalf("Node should not exist anymore: %q", out)
|
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode("node1-renamed", nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if out == nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node and indexes were updated
|
|
|
|
|
if out.CreateIndex != 1 || out.ModifyIndex != 6 || out.Address != "1.1.1.2" || out.Node != "node1-renamed" {
|
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
if idx != 6 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
newNodeID := types.NodeID("d0347693-65cc-4d9f-a6e0-5025b2e6513f")
|
|
|
|
|
|
2019-03-13 23:23:05 +00:00
|
|
|
|
// Set a Serf check on the new node to inform whether to allow changing ID
|
|
|
|
|
if err := s.EnsureCheck(8, &structs.HealthCheck{
|
|
|
|
|
Node: "node1-renamed",
|
|
|
|
|
CheckID: structs.SerfCheckID,
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
}); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
// Adding another node with same name should fail
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "node1-renamed",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(9, in); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("There should be an error since node1-renamed already exists")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Adding another node with same name but different case should fail
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1-RENAMED",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(9, in); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Lets add another valid node now
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1bis",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(10, in); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the node
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNode("Node1bis", nil, "")
|
2020-06-05 19:28:03 +00:00
|
|
|
|
require.NoError(t, err)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if out == nil {
|
|
|
|
|
t.Fatalf("Node should exist, but was null")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Renaming should fail
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1bis",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(10, in); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode("Node1bis", nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node and indexes were updated
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if out.ID != newNodeID || out.CreateIndex != 10 || out.ModifyIndex != 10 || out.Address != "1.1.1.7" || out.Node != "Node1bis" {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if idx != 10 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Renaming to same value as first node should fail as well
|
|
|
|
|
// Adding another node with same name but different case should fail
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "node1-renamed",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(11, in); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// It should fail also with different case
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1-Renamed",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(11, in); err == nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// But should work if names are different
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1-Renamed2",
|
|
|
|
|
ID: newNodeID,
|
|
|
|
|
Address: "1.1.1.7",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(12, in); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.GetNode("Node1-Renamed2", nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Node and indexes were updated
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if out.ID != newNodeID || out.CreateIndex != 10 || out.ModifyIndex != 12 || out.Address != "1.1.1.7" || out.Node != "Node1-Renamed2" {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if idx != 12 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// All the remaining tests are deprecated, please remove them on next Consul major release
|
|
|
|
|
// See https://github.com/hashicorp/consul/pull/3983 for context
|
|
|
|
|
|
|
|
|
|
// Deprecated behavior is following
|
2019-03-13 23:23:05 +00:00
|
|
|
|
deprecatedEnsureNodeWithoutIDCanRegister(t, s, "new-node-without-id", 13)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
|
|
|
|
|
// Deprecated, but should work as well
|
2019-03-13 23:23:05 +00:00
|
|
|
|
deprecatedEnsureNodeWithoutIDCanRegister(t, s, "new-node-without-id", 14)
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
|
|
|
|
|
// All of this is deprecated as well, should be removed
|
|
|
|
|
in = &structs.Node{
|
|
|
|
|
Node: "Node1-Renamed2",
|
|
|
|
|
Address: "1.1.1.66",
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if err := s.EnsureNode(15, in); err != nil {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("[DEPRECATED] it should work, err:= %q", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.GetNode("Node1-Renamed2", nil, "")
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("[DEPRECATED] err: %s", err)
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if out.CreateIndex != 10 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("[DEPRECATED] We expected to modify node previously added, but add index = %d for node %q", out.CreateIndex, out)
|
|
|
|
|
}
|
2019-03-13 23:23:05 +00:00
|
|
|
|
if out.Address != "1.1.1.66" || out.ModifyIndex != 15 {
|
Allow to rename nodes with IDs, will fix #3974 and #4413 (#4415)
* Allow to rename nodes with IDs, will fix #3974 and #4413
This change allow to rename any well behaving recent agent with an
ID to be renamed safely, ie: without taking the name of another one
with case insensitive comparison.
Deprecated behaviour warning
----------------------------
Due to asceding compatibility, it is still possible however to
"take" the name of another name by not providing any ID.
Note that when not providing any ID, it is possible to have 2 nodes
having similar names with case differences, ie: myNode and mynode
which might lead to DB corruption on Consul server side and
lead to server not properly restarting.
See #3983 and #4399 for Context about this change.
Disabling registration of nodes without IDs as specified in #4414
should probably be the way to go eventually.
* Removed the case-insensitive search when adding a node within the else
block since it breaks the test TestAgentAntiEntropy_Services
While the else case is probably legit, it will be fixed with #4414 in
a later release.
* Added again the test in the else to avoid duplicated names, but
enforce this test only for nodes having IDs.
Thus most tests without any ID will work, and allows us fixing
* Added more tests regarding request with/without IDs.
`TestStateStore_EnsureNode` now test registration and renaming with IDs
`TestStateStore_EnsureNodeDeprecated` tests registration without IDs
and tests removing an ID from a node as well as updated a node
without its ID (deprecated behaviour kept for backwards compatibility)
* Do not allow renaming in case of conflict, including when other node has no ID
* Fixed function GetNodeID that was not working due to wrong type when searching node from its ID
Thus, all tests about renaming were not working properly.
Added the full test cas that allowed me to detect it.
* Better error messages, more tests when nodeID is not a valid UUID in GetNodeID()
* Added separate TestStateStore_GetNodeID to test GetNodeID.
More complete test coverage for GetNodeID
* Added new unit test `TestStateStore_ensureNoNodeWithSimilarNameTxn`
Also fixed comments to be clearer after remarks from @banks
* Fixed error message in unit test to match test case
* Use uuid.ParseUUID to parse Node.ID as requested by @mkeeler
2018-08-10 15:30:45 +00:00
|
|
|
|
t.Fatalf("[DEPRECATED] Node with newNodeID should have been updated, but was: %d with content := %q", out.CreateIndex, out)
|
2017-03-27 07:15:21 +00:00
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_GetNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Listing with no results returns nil.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.Nodes(ws, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Create some nodes in the state store.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 0, "node0")
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
testRegisterNode(t, s, 2, "node2")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Retrieve the nodes.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.Nodes(ws, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Highest index was returned.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 2 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// All nodes were returned.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if n := len(nodes); n != 3 {
|
|
|
|
|
t.Fatalf("bad node count: %d", n)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Make sure the nodes match.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
for i, node := range nodes {
|
|
|
|
|
if node.CreateIndex != uint64(i) || node.ModifyIndex != uint64(i) {
|
|
|
|
|
t.Fatalf("bad node index: %d, %d", node.CreateIndex, node.ModifyIndex)
|
|
|
|
|
}
|
|
|
|
|
name := fmt.Sprintf("node%d", i)
|
|
|
|
|
if node.Node != name {
|
|
|
|
|
t.Fatalf("bad: %#v", node)
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
|
|
|
|
// Make sure a node delete fires the watch.
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(3, "node1", nil, ""); err != nil {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func BenchmarkGetNodes(b *testing.B) {
|
2020-10-23 19:21:37 +00:00
|
|
|
|
s := NewStateStore(nil)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(100, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(101, &structs.Node{Node: "bar", Address: "127.0.0.2"}); err != nil {
|
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
2017-01-13 19:47:16 +00:00
|
|
|
|
for i := 0; i < b.N; i++ {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.Nodes(ws, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_GetNodesByMeta(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns nil
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.NodesByMeta(ws, map[string]string{"somekey": "somevalue"}, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Create some nodes in the state store.
|
2017-01-14 01:45:34 +00:00
|
|
|
|
testRegisterNodeWithMeta(t, s, 0, "node0", map[string]string{"role": "client"})
|
|
|
|
|
testRegisterNodeWithMeta(t, s, 1, "node1", map[string]string{"role": "client", "common": "1"})
|
|
|
|
|
testRegisterNodeWithMeta(t, s, 2, "node2", map[string]string{"role": "server", "common": "1"})
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-14 01:45:34 +00:00
|
|
|
|
|
|
|
|
|
cases := []struct {
|
|
|
|
|
filters map[string]string
|
|
|
|
|
nodes []string
|
|
|
|
|
}{
|
2021-08-19 21:17:59 +00:00
|
|
|
|
// Empty meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{},
|
|
|
|
|
nodes: []string{},
|
|
|
|
|
},
|
2017-01-14 01:45:34 +00:00
|
|
|
|
// Simple meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"role": "server"},
|
|
|
|
|
nodes: []string{"node2"},
|
|
|
|
|
},
|
|
|
|
|
// Common meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"common": "1"},
|
|
|
|
|
nodes: []string{"node1", "node2"},
|
|
|
|
|
},
|
|
|
|
|
// Invalid meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"invalid": "nope"},
|
|
|
|
|
nodes: []string{},
|
|
|
|
|
},
|
|
|
|
|
// Multiple meta filters
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"role": "client", "common": "1"},
|
|
|
|
|
nodes: []string{"node1"},
|
|
|
|
|
},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 01:45:34 +00:00
|
|
|
|
for _, tc := range cases {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, result, err := s.NodesByMeta(nil, tc.filters, nil, "")
|
2017-01-14 01:45:34 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("bad: %v", err)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2017-01-14 01:45:34 +00:00
|
|
|
|
|
|
|
|
|
if len(result) != len(tc.nodes) {
|
|
|
|
|
t.Fatalf("bad: %v %v", result, tc.nodes)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2017-01-14 01:45:34 +00:00
|
|
|
|
|
|
|
|
|
for i, node := range result {
|
|
|
|
|
if node.Node != tc.nodes[i] {
|
|
|
|
|
t.Fatalf("bad: %v %v", node.Node, tc.nodes[i])
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Set up a watch.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.NodesByMeta(ws, map[string]string{"role": "client"}, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Make an unrelated modification and make sure the watch doesn't fire.
|
|
|
|
|
testRegisterNodeWithMeta(t, s, 3, "node3", map[string]string{"foo": "bar"})
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Change a watched key and make sure it fires.
|
|
|
|
|
testRegisterNodeWithMeta(t, s, 4, "node0", map[string]string{"role": "different"})
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_NodeServices(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Register some nodes with similar IDs.
|
|
|
|
|
{
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: types.NodeID("40e4a748-2192-161a-0510-aaaaaaaaaaaa"),
|
|
|
|
|
Node: "node1",
|
|
|
|
|
Address: "1.2.3.4",
|
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, s.EnsureRegistration(1, req))
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
req := &structs.RegisterRequest{
|
|
|
|
|
ID: types.NodeID("40e4a748-2192-161a-0510-bbbbbbbbbbbb"),
|
|
|
|
|
Node: "node2",
|
|
|
|
|
Address: "5.6.7.8",
|
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, s.EnsureRegistration(2, req))
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Look up by name.
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Run("Look up by name", func(t *testing.T) {
|
|
|
|
|
{
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "node1", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, ns)
|
|
|
|
|
require.Equal(t, "node1", ns.Node.Node)
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
{
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "node2", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, ns)
|
|
|
|
|
require.Equal(t, "node2", ns.Node.Node)
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
})
|
2017-02-02 00:41:04 +00:00
|
|
|
|
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Run("Look up by UUID", func(t *testing.T) {
|
|
|
|
|
{
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "40e4a748-2192-161a-0510-aaaaaaaaaaaa", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, ns)
|
|
|
|
|
require.Equal(t, "node1", ns.Node.Node)
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
{
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "40e4a748-2192-161a-0510-bbbbbbbbbbbb", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, ns)
|
|
|
|
|
require.Equal(t, "node2", ns.Node.Node)
|
2017-02-02 00:41:04 +00:00
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
})
|
2017-02-02 00:41:04 +00:00
|
|
|
|
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Run("Ambiguous prefix", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "40e4a748-2192-161a-0510", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Nil(t, ns)
|
|
|
|
|
})
|
2017-02-02 00:41:04 +00:00
|
|
|
|
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Run("Bad node", func(t *testing.T) {
|
|
|
|
|
// Bad node, and not a UUID (should not get a UUID error).
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "nope", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Nil(t, ns)
|
|
|
|
|
})
|
2017-02-02 00:41:04 +00:00
|
|
|
|
|
2021-08-19 21:17:59 +00:00
|
|
|
|
t.Run("Specific prefix", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(nil, "40e4a748-2192-161a-0510-bb", nil, "")
|
2021-08-19 21:17:59 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, ns)
|
|
|
|
|
require.Equal(t, "node2", ns.Node.Node)
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_DeleteNode(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create a node and register a service and health check with it.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check1", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Delete the node
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(3, "node1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// The node was removed
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if idx, n, err := s.GetNode("node1", nil, ""); err != nil || n != nil || idx != 3 {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %#v %d (err: %#v)", n, idx, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Associated service was removed. Need to query this directly out of
|
|
|
|
|
// the DB to make sure it is actually gone.
|
|
|
|
|
tx := s.db.Txn(false)
|
|
|
|
|
defer tx.Abort()
|
2021-02-12 18:39:38 +00:00
|
|
|
|
services, err := tx.Get(tableServices, indexID, NodeServiceQuery{Node: "node1", Service: "service1"})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if service := services.Next(); service != nil {
|
|
|
|
|
t.Fatalf("bad: %#v", service)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Associated health check was removed.
|
2021-03-22 21:29:58 +00:00
|
|
|
|
checks, err := tx.Get(tableChecks, indexID, NodeCheckQuery{Node: "node1", CheckID: "check1"})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if check := checks.Next(); check != nil {
|
|
|
|
|
t.Fatalf("bad: %#v", check)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Indexes were updated.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(3), catalogChecksMaxIndex(tx, nil, ""))
|
|
|
|
|
assert.Equal(t, uint64(3), catalogServicesMaxIndex(tx, nil, ""))
|
|
|
|
|
assert.Equal(t, uint64(3), catalogNodesMaxIndex(tx, nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Deleting a nonexistent node should be idempotent and not return
|
|
|
|
|
// an error
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(4, "node1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(3), catalogNodesMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_Node_Snapshot(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create some nodes in the state store.
|
|
|
|
|
testRegisterNode(t, s, 0, "node0")
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
testRegisterNode(t, s, 2, "node2")
|
|
|
|
|
|
|
|
|
|
// Snapshot the nodes.
|
|
|
|
|
snap := s.Snapshot()
|
|
|
|
|
defer snap.Close()
|
|
|
|
|
|
|
|
|
|
// Alter the real state store.
|
|
|
|
|
testRegisterNode(t, s, 3, "node3")
|
|
|
|
|
|
|
|
|
|
// Verify the snapshot.
|
|
|
|
|
if idx := snap.LastIndex(); idx != 2 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
nodes, err := snap.Nodes()
|
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
for i := 0; i < 3; i++ {
|
|
|
|
|
node := nodes.Next().(*structs.Node)
|
|
|
|
|
if node == nil {
|
|
|
|
|
t.Fatalf("unexpected end of nodes")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if node.CreateIndex != uint64(i) || node.ModifyIndex != uint64(i) {
|
|
|
|
|
t.Fatalf("bad node index: %d, %d", node.CreateIndex, node.ModifyIndex)
|
|
|
|
|
}
|
|
|
|
|
if node.Node != fmt.Sprintf("node%d", i) {
|
|
|
|
|
t.Fatalf("bad: %#v", node)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if nodes.Next() != nil {
|
|
|
|
|
t.Fatalf("unexpected extra nodes")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_EnsureService(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Fetching services for a node with none returns nil.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.NodeServices(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil || res != nil || idx != 0 {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Create the service registration.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ns1 := &structs.NodeService{
|
2019-12-10 02:26:41 +00:00
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Tags: []string{"prod"},
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 0},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Creating a service without a node returns an error.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err := s.EnsureService(1, "node1", ns1); err != ErrMissingNode {
|
|
|
|
|
t.Fatalf("expected %#v, got: %#v", ErrMissingNode, err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Register the nodes.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Service successfully registers into the state store.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.NodeServices(ws, "node1", nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err = s.EnsureService(10, "node1", ns1); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Register a similar service against both nodes.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ns2 := *ns1
|
|
|
|
|
ns2.ID = "service2"
|
|
|
|
|
for _, n := range []string{"node1", "node2"} {
|
|
|
|
|
if err := s.EnsureService(20, n, &ns2); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Register a different service on the bad node.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.NodeServices(ws, "node1", nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ns3 := *ns1
|
|
|
|
|
ns3.ID = "service3"
|
|
|
|
|
if err := s.EnsureService(30, "node2", &ns3); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Retrieve the services.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err := s.NodeServices(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2022-06-23 15:13:25 +00:00
|
|
|
|
// expect node1's max idx
|
|
|
|
|
if idx != 20 {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Only the services for the requested node are returned.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if out == nil || len(out.Services) != 2 {
|
|
|
|
|
t.Fatalf("bad services: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Results match the inserted services and have the proper indexes set.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
expect1 := *ns1
|
|
|
|
|
expect1.CreateIndex, expect1.ModifyIndex = 10, 10
|
|
|
|
|
if svc := out.Services["service1"]; !reflect.DeepEqual(&expect1, svc) {
|
|
|
|
|
t.Fatalf("bad: %#v", svc)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
expect2 := ns2
|
|
|
|
|
expect2.CreateIndex, expect2.ModifyIndex = 20, 20
|
|
|
|
|
if svc := out.Services["service2"]; !reflect.DeepEqual(&expect2, svc) {
|
|
|
|
|
t.Fatalf("bad: %#v %#v", ns2, svc)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Index tables were updated.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(30), catalogServicesMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Update a service registration.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ns1.Address = "1.1.1.2"
|
|
|
|
|
if err := s.EnsureService(40, "node1", ns1); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Retrieve the service again and ensure it matches..
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, out, err = s.NodeServices(nil, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 40 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if out == nil || len(out.Services) != 2 {
|
|
|
|
|
t.Fatalf("bad: %#v", out)
|
|
|
|
|
}
|
|
|
|
|
expect1.Address = "1.1.1.2"
|
|
|
|
|
expect1.ModifyIndex = 40
|
|
|
|
|
if svc := out.Services["service1"]; !reflect.DeepEqual(&expect1, svc) {
|
|
|
|
|
t.Fatalf("bad: %#v", svc)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Index tables were updated.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(40), catalogServicesMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-06 03:56:52 +00:00
|
|
|
|
func TestStateStore_EnsureService_connectProxy(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
ns1 := &structs.NodeService{
|
2018-09-12 16:07:47 +00:00
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "connect-proxy",
|
|
|
|
|
Service: "connect-proxy",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
2018-09-07 14:30:47 +00:00
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
2019-12-10 02:26:41 +00:00
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "foo"},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2018-03-06 03:56:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Service successfully registers into the state store.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(10, "node1", ns1))
|
2018-03-06 03:56:52 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err := s.NodeServices(nil, "node1", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.NotNil(t, out)
|
|
|
|
|
assert.Len(t, out.Services, 1)
|
2018-03-07 01:13:52 +00:00
|
|
|
|
|
2018-03-06 03:56:52 +00:00
|
|
|
|
expect1 := *ns1
|
|
|
|
|
expect1.CreateIndex, expect1.ModifyIndex = 10, 10
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, &expect1, out.Services["connect-proxy"])
|
2018-03-06 03:56:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
2021-12-10 21:36:10 +00:00
|
|
|
|
func TestStateStore_EnsureService_VirtualIPAssign(t *testing.T) {
|
2021-12-02 23:42:47 +00:00
|
|
|
|
s := testStateStore(t)
|
2022-01-12 20:08:49 +00:00
|
|
|
|
setVirtualIPFlags(t, s)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
entMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
|
|
|
|
ns1 := &structs.NodeService{
|
|
|
|
|
ID: "foo",
|
|
|
|
|
Service: "foo",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Connect: structs.ServiceConnect{Native: true},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Service successfully registers into the state store.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
require.NoError(t, s.EnsureService(10, "node1", ns1))
|
|
|
|
|
|
|
|
|
|
// Make sure there's a virtual IP for the foo service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err := s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "foo"}})
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.1", vip)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err := s.NodeServices(nil, "node1", nil, "")
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.NotNil(t, out)
|
|
|
|
|
assert.Len(t, out.Services, 1)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress := out.Services["foo"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns1.Port, taggedAddress.Port)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
ns2 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "redis-proxy",
|
|
|
|
|
Service: "redis-proxy",
|
|
|
|
|
Address: "2.2.2.2",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "redis"},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(11, "node1", ns2))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP has been incremented for the redis service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "redis"}})
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.2", vip)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.NotNil(t, out)
|
|
|
|
|
assert.Len(t, out.Services, 2)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress = out.Services["redis-proxy"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns2.Port, taggedAddress.Port)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Delete the first service and make sure it no longer has a virtual IP assigned.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(12, "node1", "foo", entMeta, ""))
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "connect-proxy"}})
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "", vip)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Register another instance of redis-proxy and make sure the virtual IP is unchanged.
|
|
|
|
|
ns3 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "redis-proxy2",
|
|
|
|
|
Service: "redis-proxy",
|
|
|
|
|
Address: "3.3.3.3",
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "redis"},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(13, "node1", ns3))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP is unchanged for the redis service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "redis"}})
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.2", vip)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Make sure the new instance has the same virtual IP.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
taggedAddress = out.Services["redis-proxy2"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns3.Port, taggedAddress.Port)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Register another service to take its virtual IP.
|
|
|
|
|
ns4 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "4.4.4.4",
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "web"},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(14, "node1", ns4))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP has allocated from the previously freed service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "web"}})
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.1", vip)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
2021-12-02 23:42:47 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
taggedAddress = out.Services["web-proxy"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns4.Port, taggedAddress.Port)
|
2022-06-24 18:38:39 +00:00
|
|
|
|
|
|
|
|
|
// Register a node1 in another peer (technically this node would be imported
|
|
|
|
|
// and stored through the peering stream handlers).
|
|
|
|
|
testRegisterNodeOpts(t, s, 15, "node1", func(node *structs.Node) error {
|
|
|
|
|
node.PeerName = "billing"
|
|
|
|
|
return nil
|
|
|
|
|
})
|
|
|
|
|
// Register an identical service but imported from a peer
|
|
|
|
|
ns5 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "4.4.4.4",
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "web"},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
PeerName: "billing",
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(15, "node1", ns5))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP is different from the identically named local service.
|
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{Peer: "billing", ServiceName: structs.ServiceName{Name: "web"}})
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
assert.Equal(t, "240.0.0.3", vip)
|
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "billing")
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
taggedAddress = out.Services["web-proxy"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns5.Port, taggedAddress.Port)
|
2021-12-02 23:42:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2021-12-10 21:36:10 +00:00
|
|
|
|
func TestStateStore_EnsureService_ReassignFreedVIPs(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
2022-01-12 20:08:49 +00:00
|
|
|
|
setVirtualIPFlags(t, s)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
entMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
|
|
|
|
ns1 := &structs.NodeService{
|
|
|
|
|
ID: "foo",
|
|
|
|
|
Service: "foo",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Connect: structs.ServiceConnect{Native: true},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Service successfully registers into the state store.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
require.NoError(t, s.EnsureService(10, "node1", ns1))
|
|
|
|
|
|
|
|
|
|
// Make sure there's a virtual IP for the foo service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err := s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "foo"}})
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.1", vip)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err := s.NodeServices(nil, "node1", nil, "")
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.NotNil(t, out)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress := out.Services["foo"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns1.Port, taggedAddress.Port)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
ns2 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindTypical,
|
|
|
|
|
ID: "redis",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Address: "2.2.2.2",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Connect: structs.ServiceConnect{Native: true},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(11, "node1", ns2))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP has been incremented for the redis service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "redis"}})
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.2", vip)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.NotNil(t, out)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress = out.Services["redis"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns2.Port, taggedAddress.Port)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Delete the last service and make sure it no longer has a virtual IP assigned.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(12, "node1", "redis", entMeta, ""))
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "redis"}})
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "", vip)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Register a new service, should end up with the freed 240.0.0.2 address.
|
|
|
|
|
ns3 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindTypical,
|
|
|
|
|
ID: "backend",
|
|
|
|
|
Service: "backend",
|
|
|
|
|
Address: "2.2.2.2",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Connect: structs.ServiceConnect{Native: true},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(13, "node1", ns3))
|
|
|
|
|
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "backend"}})
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.2", vip)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.NotNil(t, out)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress = out.Services["backend"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns3.Port, taggedAddress.Port)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Create a new service, no more freed VIPs so it should go back to using the counter.
|
|
|
|
|
ns4 := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindTypical,
|
|
|
|
|
ID: "frontend",
|
|
|
|
|
Service: "frontend",
|
|
|
|
|
Address: "2.2.2.2",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Weights: &structs.Weights{
|
|
|
|
|
Passing: 1,
|
|
|
|
|
Warning: 1,
|
|
|
|
|
},
|
|
|
|
|
Connect: structs.ServiceConnect{Native: true},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(14, "node1", ns4))
|
|
|
|
|
|
|
|
|
|
// Make sure the virtual IP has been incremented for the frontend service.
|
2022-06-24 18:38:39 +00:00
|
|
|
|
vip, err = s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "frontend"}})
|
2021-12-10 21:36:10 +00:00
|
|
|
|
require.NoError(t, err)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, "240.0.0.3", vip)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
// Retrieve and verify
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, out, err = s.NodeServices(nil, "node1", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.NotNil(t, out)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
|
|
|
|
|
taggedAddress = out.Services["frontend"].TaggedAddresses[structs.TaggedAddressVirtualIP]
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, vip, taggedAddress.Address)
|
|
|
|
|
assert.Equal(t, ns4.Port, taggedAddress.Port)
|
2021-12-10 21:36:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_Services(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, services, err := s.Services(ws, nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(services) != 0 {
|
|
|
|
|
t.Fatalf("bad: %v", services)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
// Register several nodes and services.
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
ns1 := &structs.NodeService{
|
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "redis",
|
2020-09-16 18:05:01 +00:00
|
|
|
|
Tags: []string{"prod", "primary"},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(2, "node1", ns1); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
testRegisterService(t, s, 3, "node1", "dogs")
|
|
|
|
|
testRegisterNode(t, s, 4, "node2")
|
|
|
|
|
ns2 := &structs.NodeService{
|
|
|
|
|
ID: "service3",
|
|
|
|
|
Service: "redis",
|
2020-09-16 18:05:01 +00:00
|
|
|
|
Tags: []string{"prod", "replica"},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(5, "node2", ns2); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Pull all the services.
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, services, err = s.Services(ws, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 5 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Verify the result. We sort the lists since the order is
|
|
|
|
|
// non-deterministic (it's built using a map internally).
|
|
|
|
|
expected := structs.Services{
|
2020-09-16 18:05:01 +00:00
|
|
|
|
"redis": []string{"prod", "primary", "replica"},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
"dogs": []string{},
|
|
|
|
|
}
|
|
|
|
|
sort.Strings(expected["redis"])
|
|
|
|
|
for _, tags := range services {
|
|
|
|
|
sort.Strings(tags)
|
|
|
|
|
}
|
|
|
|
|
if !reflect.DeepEqual(expected, services) {
|
|
|
|
|
t.Fatalf("bad: %#v", services)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
|
|
|
|
// Deleting a node with a service should fire the watch.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(6, "node1", nil, ""); err != nil {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_ServicesByNodeMeta(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
2020-07-22 20:26:49 +00:00
|
|
|
|
|
|
|
|
|
t.Run("Listing with no results returns nil", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.ServicesByNodeMeta(ws, map[string]string{"somekey": "somevalue"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
if idx != 0 || len(res) != 0 || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Create some nodes and services in the state store.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
node0 := &structs.Node{Node: "node0", Address: "127.0.0.1", Meta: map[string]string{"role": "client", "common": "1"}}
|
|
|
|
|
if err := s.EnsureNode(0, node0); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
node1 := &structs.Node{Node: "node1", Address: "127.0.0.1", Meta: map[string]string{"role": "server", "common": "1"}}
|
|
|
|
|
if err := s.EnsureNode(1, node1); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
ns1 := &structs.NodeService{
|
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "redis",
|
2020-09-16 18:05:01 +00:00
|
|
|
|
Tags: []string{"prod", "primary"},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(2, "node0", ns1); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
ns2 := &structs.NodeService{
|
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "redis",
|
2020-09-16 18:05:01 +00:00
|
|
|
|
Tags: []string{"prod", "replica"},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(3, "node1", ns2); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Fatalf("expected the watch to be triggered by the queries")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Filter the services by the first node's meta value", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, res, err := s.ServicesByNodeMeta(ws, map[string]string{"role": "client"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
expected := structs.Services{
|
2020-09-16 18:05:01 +00:00
|
|
|
|
"redis": []string{"primary", "prod"},
|
2020-07-22 20:26:49 +00:00
|
|
|
|
}
|
|
|
|
|
sort.Strings(res["redis"])
|
|
|
|
|
require.Equal(t, expected, res)
|
|
|
|
|
})
|
2017-01-14 01:45:34 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Get all services using the common meta value", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, res, err := s.ServicesByNodeMeta(ws, map[string]string{"common": "1"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
expected := structs.Services{
|
2020-09-16 18:05:01 +00:00
|
|
|
|
"redis": []string{"primary", "prod", "replica"},
|
2020-07-22 20:26:49 +00:00
|
|
|
|
}
|
|
|
|
|
sort.Strings(res["redis"])
|
|
|
|
|
require.Equal(t, expected, res)
|
|
|
|
|
})
|
2017-01-14 01:45:34 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Get an empty list for an invalid meta value", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, res, err := s.ServicesByNodeMeta(ws, map[string]string{"invalid": "nope"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
expected := structs.Services{}
|
|
|
|
|
require.Equal(t, expected, res)
|
|
|
|
|
})
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Get the first node's service instance using multiple meta filters", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, res, err := s.ServicesByNodeMeta(ws, map[string]string{"role": "client", "common": "1"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
expected := structs.Services{
|
2020-09-16 18:05:01 +00:00
|
|
|
|
"redis": []string{"primary", "prod"},
|
2020-07-22 20:26:49 +00:00
|
|
|
|
}
|
|
|
|
|
sort.Strings(res["redis"])
|
|
|
|
|
require.Equal(t, expected, res)
|
|
|
|
|
})
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Registering some unrelated node + service should not fire the watch.", func(t *testing.T) {
|
|
|
|
|
testRegisterNode(t, s, 4, "nope")
|
|
|
|
|
testRegisterService(t, s, 5, "nope", "nope")
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("expected the watch to timeout and not be triggered")
|
|
|
|
|
}
|
|
|
|
|
})
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
t.Run("Uses watchLimit to limit the number of watches", func(t *testing.T) {
|
2020-07-22 20:38:39 +00:00
|
|
|
|
patchWatchLimit(t, 10)
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
var idx uint64 = 6
|
2020-07-22 20:38:39 +00:00
|
|
|
|
for i := 0; i < watchLimit+2; i++ {
|
2020-07-22 20:26:49 +00:00
|
|
|
|
node := fmt.Sprintf("many%d", i)
|
|
|
|
|
testRegisterNodeWithMeta(t, s, idx, node, map[string]string{"common": "1"})
|
|
|
|
|
idx++
|
|
|
|
|
testRegisterService(t, s, idx, node, "nope")
|
|
|
|
|
idx++
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
// Now get a fresh watch, which will be forced to watch the whole
|
|
|
|
|
// service table.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err := s.ServicesByNodeMeta(ws, map[string]string{"common": "1"}, nil, "")
|
2020-07-22 20:26:49 +00:00
|
|
|
|
require.NoError(t, err)
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
2020-07-22 20:26:49 +00:00
|
|
|
|
testRegisterService(t, s, idx, "nope", "more-nope")
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("expected the watch to timeout and not be triggered")
|
|
|
|
|
}
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-07-22 20:38:39 +00:00
|
|
|
|
// patchWatchLimit package variable. Not safe for concurrent use. Do not use
|
|
|
|
|
// with t.Parallel.
|
|
|
|
|
func patchWatchLimit(t *testing.T, limit int) {
|
|
|
|
|
oldLimit := watchLimit
|
|
|
|
|
watchLimit = limit
|
|
|
|
|
t.Cleanup(func() {
|
|
|
|
|
watchLimit = oldLimit
|
|
|
|
|
})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_ServiceNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.ServiceNodes(ws, "db", nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(nodes) != 0 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err := s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(12, "foo", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(13, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(14, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(15, "bar", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(16, "bar", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ServiceNodes(ws, "db", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 16 {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("bad: %d", idx)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
if len(nodes) != 3 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Node != "bar" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Address != "127.0.0.2" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].ServiceID != "db" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if !stringslice.Contains(nodes[0].ServiceTags, "replica") {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].ServicePort != 8000 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[1].Node != "bar" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[1].Address != "127.0.0.2" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[1].ServiceID != "db2" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if !stringslice.Contains(nodes[1].ServiceTags, "replica") {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[1].ServicePort != 8001 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[2].Node != "foo" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[2].Address != "127.0.0.1" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[2].ServiceID != "db" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if !stringslice.Contains(nodes[2].ServiceTags, "primary") {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[2].ServicePort != 8000 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, 17, "nope")
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// But removing a node with the "db" service should fire the watch.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(18, "bar", nil, ""); err != nil {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Overwhelm the node tracking.
|
|
|
|
|
idx = 19
|
2020-07-22 20:38:39 +00:00
|
|
|
|
patchWatchLimit(t, 10)
|
|
|
|
|
for i := 0; i < watchLimit+2; i++ {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
node := fmt.Sprintf("many%d", i)
|
|
|
|
|
if err := s.EnsureNode(idx, &structs.Node{Node: node, Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureService(idx, node, &structs.NodeService{ID: "db", Service: "db", Port: 8000}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
idx++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Now get a fresh watch, which will be forced to watch the whole nodes
|
|
|
|
|
// table.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ServiceNodes(ws, "db", nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should fire the watch now.
|
|
|
|
|
testRegisterNode(t, s, idx, "more-nope")
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_ServiceTagNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.ServiceTagNodes(ws, "db", []string{"primary"}, nil, "")
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(nodes) != 0 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err := s.EnsureNode(15, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureNode(16, &structs.Node{Node: "bar", Address: "127.0.0.2"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(17, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(18, "foo", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(19, "bar", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ServiceTagNodes(ws, "db", []string{"primary"}, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 19 {
|
|
|
|
|
t.Fatalf("bad: %v", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(nodes) != 1 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Node != "foo" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Address != "127.0.0.1" {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if !stringslice.Contains(nodes[0].ServiceTags, "primary") {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].ServicePort != 8000 {
|
|
|
|
|
t.Fatalf("bad: %v", nodes)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, 20, "nope")
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-16 18:05:01 +00:00
|
|
|
|
// But removing a node with the "db:primary" service should fire the watch.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteNode(21, "foo", nil, ""); err != nil {
|
2017-01-20 07:36:50 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_ServiceTagNodes_MultipleTags(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(15, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(16, &structs.Node{Node: "bar", Address: "127.0.0.2"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(17, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary", "v2"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(18, "foo", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica", "v2", "dev"}, Address: "", Port: 8001}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(19, "bar", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"replica", "v2"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.ServiceTagNodes(nil, "db", []string{"primary"}, nil, "")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, int(idx), 19)
|
|
|
|
|
require.Len(t, nodes, 1)
|
|
|
|
|
require.Equal(t, nodes[0].Node, "foo")
|
|
|
|
|
require.Equal(t, nodes[0].Address, "127.0.0.1")
|
2020-09-16 18:05:01 +00:00
|
|
|
|
require.Contains(t, nodes[0].ServiceTags, "primary")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.Equal(t, nodes[0].ServicePort, 8000)
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ServiceTagNodes(nil, "db", []string{"v2"}, nil, "")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, int(idx), 19)
|
|
|
|
|
require.Len(t, nodes, 3)
|
|
|
|
|
|
|
|
|
|
// Test filtering on multiple tags
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ServiceTagNodes(nil, "db", []string{"v2", "replica"}, nil, "")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, int(idx), 19)
|
|
|
|
|
require.Len(t, nodes, 2)
|
|
|
|
|
require.Contains(t, nodes[0].ServiceTags, "v2")
|
2020-09-16 18:05:01 +00:00
|
|
|
|
require.Contains(t, nodes[0].ServiceTags, "replica")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.Contains(t, nodes[1].ServiceTags, "v2")
|
2020-09-16 18:05:01 +00:00
|
|
|
|
require.Contains(t, nodes[1].ServiceTags, "replica")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ServiceTagNodes(nil, "db", []string{"dev"}, nil, "")
|
2018-10-11 11:50:05 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, int(idx), 19)
|
|
|
|
|
require.Len(t, nodes, 1)
|
|
|
|
|
require.Equal(t, nodes[0].Node, "foo")
|
|
|
|
|
require.Equal(t, nodes[0].Address, "127.0.0.1")
|
|
|
|
|
require.Contains(t, nodes[0].ServiceTags, "dev")
|
|
|
|
|
require.Equal(t, nodes[0].ServicePort, 8001)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_DeleteService(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Register a node with one service and a check.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 3, "node1", "service1", "check1", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Delete the service.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err := s.NodeServices(ws, "node1", nil, "")
|
2020-06-05 19:28:03 +00:00
|
|
|
|
require.NoError(t, err)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteService(4, "node1", "service1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Service doesn't exist.
|
2017-01-20 07:36:50 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, ns, err := s.NodeServices(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil || ns == nil || len(ns.Services) != 0 {
|
|
|
|
|
t.Fatalf("bad: %#v (err: %#v)", ns, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check doesn't exist. Check using the raw DB so we can test
|
|
|
|
|
// that it actually is removed in the state store.
|
|
|
|
|
tx := s.db.Txn(false)
|
|
|
|
|
defer tx.Abort()
|
2021-03-22 21:29:58 +00:00
|
|
|
|
check, err := tx.First(tableChecks, indexID, NodeCheckQuery{Node: "node1", CheckID: "check1"})
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil || check != nil {
|
|
|
|
|
t.Fatalf("bad: %#v (err: %s)", check, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// Index tables were updated.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(4), catalogChecksMaxIndex(tx, nil, ""))
|
|
|
|
|
assert.Equal(t, uint64(4), catalogServicesMaxIndex(tx, nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Deleting a nonexistent service should be idempotent and not return an
|
2017-01-20 07:36:50 +00:00
|
|
|
|
// error, nor fire a watch.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteService(5, "node1", "service1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(4), catalogServicesMaxIndex(tx, nil, ""))
|
2017-01-20 07:36:50 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-09 16:11:39 +00:00
|
|
|
|
func TestStateStore_ConnectServiceNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
2018-03-09 16:11:39 +00:00
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(12, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(14, "foo", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(15, "bar", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{ID: "native-db", Service: "db", Connect: structs.ServiceConnect{Native: true}}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(17, "bar", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2018-03-09 16:11:39 +00:00
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(17))
|
|
|
|
|
assert.Len(t, nodes, 3)
|
2018-03-09 16:11:39 +00:00
|
|
|
|
|
|
|
|
|
for _, n := range nodes {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, n.ServiceKind == structs.ServiceKindConnectProxy ||
|
2022-01-20 16:45:56 +00:00
|
|
|
|
n.ServiceConnect.Native,
|
2018-06-05 03:04:45 +00:00
|
|
|
|
"either proxy or connect native")
|
2018-03-09 16:11:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, 17, "nope")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.False(t, watchFired(ws))
|
2018-03-09 16:11:39 +00:00
|
|
|
|
|
|
|
|
|
// But removing a node with the "db" service should fire the watch.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteNode(18, "bar", nil, ""))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2018-03-09 16:11:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
func TestStateStore_ConnectServiceNodes_Gateways(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Typical services
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(12, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(14, "bar", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}))
|
|
|
|
|
assert.False(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Register a sidecar for db
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(15, "foo", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
// Reset WatchSet to ensure watch fires when associating db with gateway
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
// Associate gateway with db
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(17, &structs.TerminatingGatewayConfigEntry{
|
2020-04-08 18:37:24 +00:00
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(17))
|
|
|
|
|
assert.Len(t, nodes, 2)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check sidecar
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindConnectProxy, nodes[0].ServiceKind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[0].Node)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].ServiceName)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].ServiceID)
|
|
|
|
|
assert.Equal(t, "db", nodes[0].ServiceProxy.DestinationServiceName)
|
|
|
|
|
assert.Equal(t, 8000, nodes[0].ServicePort)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindTerminatingGateway, nodes[1].ServiceKind)
|
|
|
|
|
assert.Equal(t, "bar", nodes[1].Node)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].ServiceName)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].ServiceID)
|
|
|
|
|
assert.Equal(t, 443, nodes[1].ServicePort)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Watch should fire when another gateway instance is registered
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(18, "foo", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway-2", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
// Reset WatchSet to ensure watch fires when deregistering gateway
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
2020-05-08 14:03:45 +00:00
|
|
|
|
// Watch should fire when a gateway instance is deregistered
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(19, "bar", "gateway", nil, ""))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(19))
|
|
|
|
|
assert.Len(t, nodes, 2)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check the new gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindTerminatingGateway, nodes[1].ServiceKind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[1].Node)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].ServiceName)
|
|
|
|
|
assert.Equal(t, "gateway-2", nodes[1].ServiceID)
|
|
|
|
|
assert.Equal(t, 443, nodes[1].ServicePort)
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
|
|
|
|
// Index should not slide back after deleting all instances of the gateway
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(20, "foo", "gateway-2", nil, ""))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.ConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, nodes, 1)
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
|
|
|
|
// Ensure that remaining node is the proxy and not a gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindConnectProxy, nodes[0].ServiceKind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[0].Node)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].ServiceName)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].ServiceID)
|
|
|
|
|
assert.Equal(t, 8000, nodes[0].ServicePort)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_Service_Snapshot(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Register a node with two services.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
ns := []*structs.NodeService{
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2019-12-10 02:26:41 +00:00
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "redis",
|
|
|
|
|
Tags: []string{"prod"},
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 0},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2019-12-10 02:26:41 +00:00
|
|
|
|
ID: "service2",
|
|
|
|
|
Service: "nomad",
|
|
|
|
|
Tags: []string{"dev"},
|
|
|
|
|
Address: "1.1.1.2",
|
|
|
|
|
Port: 1112,
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
for i, svc := range ns {
|
|
|
|
|
if err := s.EnsureService(uint64(i+1), "node1", svc); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create a second node/service to make sure node filtering works. This
|
|
|
|
|
// will affect the index but not the dump.
|
|
|
|
|
testRegisterNode(t, s, 3, "node2")
|
|
|
|
|
testRegisterService(t, s, 4, "node2", "service2")
|
|
|
|
|
|
|
|
|
|
// Snapshot the service.
|
|
|
|
|
snap := s.Snapshot()
|
|
|
|
|
defer snap.Close()
|
|
|
|
|
|
|
|
|
|
// Alter the real state store.
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service3")
|
|
|
|
|
|
|
|
|
|
// Verify the snapshot.
|
|
|
|
|
if idx := snap.LastIndex(); idx != 4 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
services, err := snap.Services("node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
for i := 0; i < len(ns); i++ {
|
|
|
|
|
svc := services.Next().(*structs.ServiceNode)
|
|
|
|
|
if svc == nil {
|
|
|
|
|
t.Fatalf("unexpected end of services")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ns[i].CreateIndex, ns[i].ModifyIndex = uint64(i+1), uint64(i+1)
|
|
|
|
|
if !reflect.DeepEqual(ns[i], svc.ToNodeService()) {
|
|
|
|
|
t.Fatalf("bad: %#v != %#v", svc, ns[i])
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if services.Next() != nil {
|
|
|
|
|
t.Fatalf("unexpected extra services")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_EnsureCheck(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create a check associated with the node
|
|
|
|
|
check := &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "redis check",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Notes: "test check",
|
|
|
|
|
Output: "aaa",
|
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
ServiceName: "redis",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Creating a check without a node returns error
|
|
|
|
|
if err := s.EnsureCheck(1, check); err != ErrMissingNode {
|
|
|
|
|
t.Fatalf("expected %#v, got: %#v", ErrMissingNode, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register the node
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
|
|
|
|
|
// Creating a check with a bad services returns error
|
|
|
|
|
if err := s.EnsureCheck(1, check); err != ErrMissingService {
|
|
|
|
|
t.Fatalf("expected: %#v, got: %#v", ErrMissingService, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register the service
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "service1")
|
|
|
|
|
|
|
|
|
|
// Inserting the check with the prerequisites succeeds
|
|
|
|
|
if err := s.EnsureCheck(3, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Retrieve the check and make sure it matches
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err := s.NodeChecks(nil, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 3 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 1 {
|
|
|
|
|
t.Fatalf("wrong number of checks: %d", len(checks))
|
|
|
|
|
}
|
|
|
|
|
if !reflect.DeepEqual(checks[0], check) {
|
|
|
|
|
t.Fatalf("bad: %#v", checks[0])
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-10 02:26:41 +00:00
|
|
|
|
testCheckOutput := func(t *testing.T, expectedNodeIndex, expectedIndexForCheck uint64, outputTxt string) {
|
|
|
|
|
t.Helper()
|
2018-10-11 11:42:39 +00:00
|
|
|
|
// Check that we successfully updated
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err = s.NodeChecks(nil, "node1", nil, "")
|
2019-12-10 02:26:41 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, expectedNodeIndex, idx, "bad raft index")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2019-12-10 02:26:41 +00:00
|
|
|
|
require.Len(t, checks, 1, "wrong number of checks")
|
|
|
|
|
require.Equal(t, outputTxt, checks[0].Output, "wrong check output")
|
|
|
|
|
require.Equal(t, uint64(3), checks[0].CreateIndex, "bad create index")
|
|
|
|
|
require.Equal(t, expectedIndexForCheck, checks[0].ModifyIndex, "bad modify index")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2018-10-11 11:42:39 +00:00
|
|
|
|
// Do not really modify the health check content the health check
|
|
|
|
|
check = &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "redis check",
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
Notes: "test check",
|
|
|
|
|
Output: "aaa",
|
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
ServiceName: "redis",
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2018-10-11 11:42:39 +00:00
|
|
|
|
if err := s.EnsureCheck(4, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2020-03-19 13:11:20 +00:00
|
|
|
|
// Since there was no change to the check it won't actually have been updated
|
|
|
|
|
// so the ModifyIndex index should still be 3
|
|
|
|
|
testCheckOutput(t, 3, 3, check.Output)
|
2018-10-11 11:42:39 +00:00
|
|
|
|
|
|
|
|
|
// Do modify the heathcheck
|
|
|
|
|
check = &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "redis check",
|
|
|
|
|
Status: api.HealthPassing,
|
|
|
|
|
Notes: "test check",
|
|
|
|
|
Output: "bbbmodified",
|
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
ServiceName: "redis",
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2018-10-11 11:42:39 +00:00
|
|
|
|
if err := s.EnsureCheck(5, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2019-12-10 02:26:41 +00:00
|
|
|
|
testCheckOutput(t, 5, 5, "bbbmodified")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Index tables were updated
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(5), catalogChecksMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_EnsureCheck_defaultStatus(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Register a node
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
|
|
|
|
|
// Create and register a check with no health status
|
|
|
|
|
check := &structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Status: "",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(2, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get the check again
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, result, err := s.NodeChecks(nil, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check that the status was set to the proper default
|
2017-04-19 23:00:11 +00:00
|
|
|
|
if len(result) != 1 || result[0].Status != api.HealthCritical {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad: %#v", result)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_NodeChecks(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Do an initial query for a node that doesn't exist.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err := s.NodeChecks(ws, "node1", nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 0 {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create some nodes and checks.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "service1", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node1", "service1", "check2", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 4, "node2")
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service2")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node2", "service2", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Try querying for all checks associated with node1
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err = s.NodeChecks(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 6 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 2 || checks[0].CheckID != "check1" || checks[1].CheckID != "check2" {
|
|
|
|
|
t.Fatalf("bad checks: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Creating some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, 7, "node3")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 8, "node3", "", "check1", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
// Try querying for all checks associated with node2
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err = s.NodeChecks(ws, "node2", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if idx != 8 {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 1 || checks[0].CheckID != "check3" {
|
|
|
|
|
t.Fatalf("bad checks: %#v", checks)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
|
|
|
|
// Changing node2 should fire the watch.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 9, "node2", "service2", "check3", api.HealthCritical)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_ServiceChecks(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Do an initial query for a service that doesn't exist.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err := s.ServiceChecks(ws, "service1", nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 0 {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create some nodes and checks.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "service1", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node1", "service1", "check2", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 4, "node2")
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service2")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node2", "service2", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Try querying for all checks associated with service1.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err = s.ServiceChecks(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 6 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 2 || checks[0].CheckID != "check1" || checks[1].CheckID != "check2" {
|
|
|
|
|
t.Fatalf("bad checks: %#v", checks)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
|
|
|
|
// Adding some unrelated service + check should not fire the watch.
|
|
|
|
|
testRegisterService(t, s, 7, "node1", "service3")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 8, "node1", "service3", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Updating a related check should fire the watch.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 9, "node1", "service1", "check2", api.HealthCritical)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 01:08:43 +00:00
|
|
|
|
func TestStateStore_ServiceChecksByNodeMeta(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 01:08:43 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Querying with no results returns nil.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, checks, err := s.ServiceChecksByNodeMeta(ws, "service1", nil, nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 0 {
|
|
|
|
|
t.Fatalf("bad: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 0 {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create some nodes and checks.
|
2017-01-14 01:08:43 +00:00
|
|
|
|
testRegisterNodeWithMeta(t, s, 0, "node1", map[string]string{"somekey": "somevalue", "common": "1"})
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "service1", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node1", "service1", "check2", api.HealthPassing)
|
2017-01-14 01:08:43 +00:00
|
|
|
|
testRegisterNodeWithMeta(t, s, 4, "node2", map[string]string{"common": "1"})
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node2", "service1", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-14 01:08:43 +00:00
|
|
|
|
|
|
|
|
|
cases := []struct {
|
|
|
|
|
filters map[string]string
|
|
|
|
|
checks []string
|
|
|
|
|
}{
|
|
|
|
|
// Basic meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue"},
|
|
|
|
|
checks: []string{"check1", "check2"},
|
|
|
|
|
},
|
|
|
|
|
// Common meta field
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"common": "1"},
|
|
|
|
|
checks: []string{"check1", "check2", "check3"},
|
|
|
|
|
},
|
|
|
|
|
// Invalid meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"invalid": "nope"},
|
|
|
|
|
checks: []string{},
|
|
|
|
|
},
|
|
|
|
|
// Multiple filters
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue", "common": "1"},
|
|
|
|
|
checks: []string{"check1", "check2"},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Try querying for all checks associated with service1.
|
|
|
|
|
idx = 7
|
2017-01-14 01:08:43 +00:00
|
|
|
|
for _, tc := range cases {
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err := s.ServiceChecksByNodeMeta(ws, "service1", tc.filters, nil, "")
|
2017-01-14 01:08:43 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != len(tc.checks) {
|
|
|
|
|
t.Fatalf("bad checks: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
for i, check := range checks {
|
|
|
|
|
if check.CheckID != types.CheckID(tc.checks[i]) {
|
|
|
|
|
t.Fatalf("bad checks: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, idx, fmt.Sprintf("nope%d", idx))
|
|
|
|
|
idx++
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Overwhelm the node tracking.
|
2020-07-22 20:38:39 +00:00
|
|
|
|
patchWatchLimit(t, 10)
|
|
|
|
|
for i := 0; i < watchLimit+2; i++ {
|
2017-01-24 07:37:21 +00:00
|
|
|
|
node := fmt.Sprintf("many%d", idx)
|
|
|
|
|
testRegisterNodeWithMeta(t, s, idx, node, map[string]string{"common": "1"})
|
|
|
|
|
idx++
|
|
|
|
|
testRegisterService(t, s, idx, node, "service1")
|
|
|
|
|
idx++
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, idx, node, "service1", "check1", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
idx++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Now get a fresh watch, which will be forced to watch the whole
|
|
|
|
|
// node table.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ServiceChecksByNodeMeta(ws, "service1", map[string]string{"common": "1"}, nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should now fire the watch.
|
|
|
|
|
testRegisterNode(t, s, idx, "nope")
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
2017-01-14 01:08:43 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_ChecksInState(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Querying with no results returns nil
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.ChecksInState(ws, api.HealthPassing, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register a node with checks in varied states
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 1, "node1", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check2", api.HealthCritical)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node1", "", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Query the state store for passing checks.
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err := s.ChecksInState(ws, api.HealthPassing, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Make sure we only get the checks which match the state
|
|
|
|
|
if n := len(checks); n != 2 {
|
|
|
|
|
t.Fatalf("expected 2 checks, got: %d", n)
|
|
|
|
|
}
|
|
|
|
|
if checks[0].CheckID != "check1" || checks[1].CheckID != "check3" {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Changing the state of a check should fire the watch.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 4, "node1", "", "check1", api.HealthCritical)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// HealthAny just returns everything.
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err = s.ChecksInState(ws, api.HealthAny, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if n := len(checks); n != 3 {
|
|
|
|
|
t.Fatalf("expected 3 checks, got: %d", n)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Adding a new check should fire the watch.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 5, "node1", "", "check4", api.HealthCritical)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 01:08:43 +00:00
|
|
|
|
func TestStateStore_ChecksInStateByNodeMeta(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-14 01:08:43 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Querying with no results returns nil.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.ChecksInStateByNodeMeta(ws, api.HealthPassing, nil, nil, "")
|
2017-01-14 01:08:43 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register a node with checks in varied states.
|
2017-01-14 01:08:43 +00:00
|
|
|
|
testRegisterNodeWithMeta(t, s, 0, "node1", map[string]string{"somekey": "somevalue", "common": "1"})
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 1, "node1", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check2", api.HealthCritical)
|
2017-01-14 01:08:43 +00:00
|
|
|
|
testRegisterNodeWithMeta(t, s, 3, "node2", map[string]string{"common": "1"})
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 4, "node2", "", "check3", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-14 01:08:43 +00:00
|
|
|
|
|
|
|
|
|
cases := []struct {
|
|
|
|
|
filters map[string]string
|
|
|
|
|
state string
|
|
|
|
|
checks []string
|
|
|
|
|
}{
|
|
|
|
|
// Basic meta filter, any status
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthAny,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check2", "check1"},
|
|
|
|
|
},
|
|
|
|
|
// Basic meta filter, only passing
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthPassing,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check1"},
|
|
|
|
|
},
|
|
|
|
|
// Common meta filter, any status
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"common": "1"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthAny,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check2", "check1", "check3"},
|
|
|
|
|
},
|
|
|
|
|
// Common meta filter, only passing
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"common": "1"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthPassing,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check1", "check3"},
|
|
|
|
|
},
|
|
|
|
|
// Invalid meta filter
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"invalid": "nope"},
|
|
|
|
|
checks: []string{},
|
|
|
|
|
},
|
|
|
|
|
// Multiple filters, any status
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue", "common": "1"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthAny,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check2", "check1"},
|
|
|
|
|
},
|
|
|
|
|
// Multiple filters, only passing
|
|
|
|
|
{
|
|
|
|
|
filters: map[string]string{"somekey": "somevalue", "common": "1"},
|
2017-04-19 23:00:11 +00:00
|
|
|
|
state: api.HealthPassing,
|
2017-01-14 01:08:43 +00:00
|
|
|
|
checks: []string{"check1"},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Try querying for all checks associated with service1.
|
|
|
|
|
idx = 5
|
2019-12-10 02:26:41 +00:00
|
|
|
|
for i, tc := range cases {
|
|
|
|
|
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err := s.ChecksInStateByNodeMeta(ws, tc.state, tc.filters, nil, "")
|
2019-12-10 02:26:41 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
var foundIDs []string
|
|
|
|
|
for _, chk := range checks {
|
|
|
|
|
foundIDs = append(foundIDs, string(chk.CheckID))
|
2017-01-14 01:08:43 +00:00
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
2019-12-10 02:26:41 +00:00
|
|
|
|
require.ElementsMatch(t, tc.checks, foundIDs)
|
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, idx, fmt.Sprintf("nope%d", idx))
|
|
|
|
|
idx++
|
|
|
|
|
require.False(t, watchFired(ws))
|
|
|
|
|
})
|
2017-01-24 07:37:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Overwhelm the node tracking.
|
2020-07-22 20:38:39 +00:00
|
|
|
|
patchWatchLimit(t, 10)
|
|
|
|
|
for i := 0; i < watchLimit+2; i++ {
|
2017-01-24 07:37:21 +00:00
|
|
|
|
node := fmt.Sprintf("many%d", idx)
|
|
|
|
|
testRegisterNodeWithMeta(t, s, idx, node, map[string]string{"common": "1"})
|
|
|
|
|
idx++
|
|
|
|
|
testRegisterService(t, s, idx, node, "service1")
|
|
|
|
|
idx++
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, idx, node, "service1", "check1", api.HealthPassing)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
idx++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Now get a fresh watch, which will be forced to watch the whole
|
|
|
|
|
// node table.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ChecksInStateByNodeMeta(ws, api.HealthPassing, map[string]string{"common": "1"}, nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Registering some unrelated node should now fire the watch.
|
|
|
|
|
testRegisterNode(t, s, idx, "nope")
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
2017-01-14 01:08:43 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_DeleteCheck(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register a node and a node-level health check.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check1", api.HealthPassing)
|
2018-03-19 13:14:03 +00:00
|
|
|
|
testRegisterService(t, s, 2, "node1", "service1")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Make sure the check is there.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err := s.NodeChecks(ws, "node1", nil, "")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 1 {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-19 13:14:03 +00:00
|
|
|
|
ensureServiceVersion(t, s, ws, "service1", 2, 1)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Delete the check.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteCheck(3, "node1", "check1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if idx, check, err := s.NodeCheck("node1", "check1", nil, ""); idx != 3 || err != nil || check != nil {
|
2018-03-22 11:41:06 +00:00
|
|
|
|
t.Fatalf("Node check should have been deleted idx=%d, node=%v, err=%s", idx, check, err)
|
|
|
|
|
}
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(3), catalogChecksMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2018-03-19 13:14:03 +00:00
|
|
|
|
// All services linked to this node should have their index updated
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service1", 3, 1)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Check is gone
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, checks, err = s.NodeChecks(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if len(checks) != 0 {
|
|
|
|
|
t.Fatalf("bad: %#v", checks)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Index tables were updated.
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(3), catalogChecksMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Deleting a nonexistent check should be idempotent and not return an
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// error.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
if err := s.DeleteCheck(4, "node1", "check1", nil, ""); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2022-06-23 15:13:25 +00:00
|
|
|
|
assert.Equal(t, uint64(3), catalogChecksMaxIndex(s.db.ReadTxn(), nil, ""))
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-02-19 17:29:22 +00:00
|
|
|
|
func ensureServiceVersion(t *testing.T, s *Store, ws memdb.WatchSet, serviceID string, expectedIdx uint64, expectedSize int) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, services, err := s.ServiceNodes(ws, serviceID, nil, "")
|
2018-02-19 18:30:25 +00:00
|
|
|
|
t.Helper()
|
2018-02-19 17:29:22 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != expectedIdx {
|
|
|
|
|
t.Fatalf("bad: %d, expected %d", idx, expectedIdx)
|
|
|
|
|
}
|
|
|
|
|
if len(services) != expectedSize {
|
|
|
|
|
t.Fatalf("expected size: %d, but was %d", expectedSize, len(services))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-01 13:09:36 +00:00
|
|
|
|
// Ensure index exist, if expectedIndex = -1, ensure the index does not exists
|
2020-06-23 17:18:22 +00:00
|
|
|
|
func ensureIndexForService(t *testing.T, s *Store, serviceName string, expectedIndex uint64) {
|
2018-03-01 13:09:36 +00:00
|
|
|
|
t.Helper()
|
|
|
|
|
tx := s.db.Txn(false)
|
|
|
|
|
defer tx.Abort()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
transaction, err := tx.First(tableIndex, "id", serviceIndexName(serviceName, nil, ""))
|
2018-03-01 13:09:36 +00:00
|
|
|
|
if err == nil {
|
|
|
|
|
if idx, ok := transaction.(*IndexEntry); ok {
|
|
|
|
|
if expectedIndex != idx.Value {
|
|
|
|
|
t.Fatalf("Expected index %d, but had %d for %s", expectedIndex, idx.Value, serviceName)
|
|
|
|
|
}
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if expectedIndex != 0 {
|
|
|
|
|
t.Fatalf("Index for %s was expected but not found", serviceName)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// TestStateStore_IndexIndependence test that changes on a given service does not impact the
|
2018-02-19 17:29:22 +00:00
|
|
|
|
// index of other services. It allows to have huge benefits for watches since
|
|
|
|
|
// watchers are notified ONLY when there are changes in the given service
|
2019-03-21 16:01:56 +00:00
|
|
|
|
func TestStateStore_IndexIndependence(t *testing.T) {
|
2018-02-19 17:29:22 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Querying with no matches gives an empty response
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.CheckServiceNodes(ws, "service1", nil, "")
|
2018-02-19 17:29:22 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register some nodes.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
|
|
|
|
|
// Register node-level checks. These should be the final result.
|
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node2", "", "check2", api.HealthPassing)
|
|
|
|
|
|
|
|
|
|
// Register a service against the nodes.
|
|
|
|
|
testRegisterService(t, s, 4, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service2")
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 5, 1)
|
|
|
|
|
|
|
|
|
|
// Register checks against the services.
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "service1", "check3", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 7, "node2", "service2", "check4", api.HealthPassing)
|
|
|
|
|
// Index must be updated when checks are updated
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service1", 6, 1)
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 7, 1)
|
|
|
|
|
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
// We ensure the idx for service2 has not been changed
|
|
|
|
|
testRegisterCheck(t, s, 8, "node2", "service2", "check4", api.HealthWarning)
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 8, 1)
|
|
|
|
|
testRegisterCheck(t, s, 9, "node2", "service2", "check4", api.HealthPassing)
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 9, 1)
|
|
|
|
|
|
|
|
|
|
// Add a new check on node1, while not on service, it should impact
|
|
|
|
|
// indexes of all services running on node1, aka service1
|
|
|
|
|
testRegisterCheck(t, s, 10, "node1", "", "check_node", api.HealthPassing)
|
|
|
|
|
|
|
|
|
|
// Service2 should not be modified
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 9, 1)
|
|
|
|
|
// Service1 should be modified
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service1", 10, 1)
|
|
|
|
|
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
testRegisterService(t, s, 11, "node1", "service_shared")
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 11, 1)
|
|
|
|
|
testRegisterService(t, s, 12, "node2", "service_shared")
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 12, 2)
|
|
|
|
|
|
|
|
|
|
testRegisterCheck(t, s, 13, "node2", "service_shared", "check_service_shared", api.HealthCritical)
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 13, 2)
|
|
|
|
|
testRegisterCheck(t, s, 14, "node2", "service_shared", "check_service_shared", api.HealthPassing)
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 14, 2)
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.DeleteCheck(15, "node2", types.CheckID("check_service_shared"), nil, "")
|
2018-02-19 17:29:22 +00:00
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 15, 2)
|
2020-06-23 17:18:22 +00:00
|
|
|
|
ensureIndexForService(t, s, "service_shared", 15)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.DeleteService(16, "node2", "service_shared", nil, "")
|
2018-02-19 17:29:22 +00:00
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 16, 1)
|
2020-06-23 17:18:22 +00:00
|
|
|
|
ensureIndexForService(t, s, "service_shared", 16)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.DeleteService(17, "node1", "service_shared", nil, "")
|
2018-02-19 17:29:22 +00:00
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 17, 0)
|
|
|
|
|
|
|
|
|
|
testRegisterService(t, s, 18, "node1", "service_new")
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
|
|
|
|
|
// Since service does not exists anymore, its index should be that of
|
|
|
|
|
// the last deleted service
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service_shared", 17, 0)
|
|
|
|
|
|
2018-03-01 13:09:36 +00:00
|
|
|
|
// No index should exist anymore, it must have been garbage collected
|
2020-06-23 17:18:22 +00:00
|
|
|
|
ensureIndexForService(t, s, "service_shared", 0)
|
2018-02-19 17:29:22 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
func TestStateStore_ConnectQueryBlocking(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
tests := []struct {
|
|
|
|
|
name string
|
|
|
|
|
setupFn func(s *Store)
|
|
|
|
|
svc string
|
|
|
|
|
wantBeforeResLen int
|
|
|
|
|
wantBeforeWatchSetSize int
|
|
|
|
|
updateFn func(s *Store)
|
|
|
|
|
shouldFire bool
|
|
|
|
|
wantAfterIndex uint64
|
|
|
|
|
wantAfterResLen int
|
|
|
|
|
wantAfterWatchSetSize int
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
name: "not affected by non-connect-enabled target service registration",
|
|
|
|
|
setupFn: nil,
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantBeforeWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterService(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: false,
|
|
|
|
|
wantAfterIndex: 4, // No results falls back to global service index
|
|
|
|
|
wantAfterResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantAfterWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "not affected by non-connect-enabled target service de-registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterService(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantBeforeWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(5, "node1", "test", nil, ""))
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
// Note that the old implementation would unblock in this case since it
|
|
|
|
|
// always watched the target service's index even though some updates
|
|
|
|
|
// there don't affect Connect result output. This doesn't matter much for
|
|
|
|
|
// correctness but it causes pointless work.
|
|
|
|
|
shouldFire: false,
|
|
|
|
|
wantAfterIndex: 5, // No results falls back to global service index
|
|
|
|
|
wantAfterResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantAfterWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on first connect-native service registration",
|
|
|
|
|
setupFn: nil,
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantBeforeWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 4,
|
|
|
|
|
wantAfterResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on subsequent connect-native service registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 5, "node2", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 5,
|
|
|
|
|
wantAfterResLen: 2,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on connect-native service de-registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterConnectNativeService(t, s, 5, "node2", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 2,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(6, "node2", "test", nil, ""))
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 6,
|
|
|
|
|
wantAfterResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on last connect-native service de-registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(6, "node1", "test", nil, ""))
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 6,
|
|
|
|
|
wantAfterResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantAfterWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on first proxy service registration",
|
|
|
|
|
setupFn: nil,
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantBeforeWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 4,
|
|
|
|
|
wantAfterResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on subsequent proxy service registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 5, "node2", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 5,
|
|
|
|
|
wantAfterResLen: 2,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on proxy service de-registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterSidecarProxy(t, s, 5, "node2", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 2,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(6, "node2", "test-sidecar-proxy", nil, ""))
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 6,
|
|
|
|
|
wantAfterResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on last proxy service de-registration",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(6, "node1", "test-sidecar-proxy", nil, ""))
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 6,
|
|
|
|
|
wantAfterResLen: 0,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// The connect index and gateway-services iterators are watched
|
|
|
|
|
wantAfterWatchSetSize: 2,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on connect-native service health check change",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "test", "check1", "passing")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterCheck(t, s, 7, "node1", "test", "check1", "critical")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 7,
|
|
|
|
|
wantAfterResLen: 1, // critical filtering doesn't happen in the state store method.
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on proxy service health check change",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "test-sidecar-proxy", "check1", "passing")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterCheck(t, s, 7, "node1", "test-sidecar-proxy", "check1", "critical")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 7,
|
|
|
|
|
wantAfterResLen: 1, // critical filtering doesn't happen in the state store method.
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on connect-native node health check change",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterConnectNativeService(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "", "check1", "passing")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterCheck(t, s, 7, "node1", "", "check1", "critical")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 7,
|
|
|
|
|
wantAfterResLen: 1, // critical filtering doesn't happen in the state store method.
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "unblocks on proxy service health check change",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "", "check1", "passing")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterCheck(t, s, 7, "node1", "", "check1", "critical")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 7,
|
|
|
|
|
wantAfterResLen: 1, // critical filtering doesn't happen in the state store method.
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
// See https://github.com/hashicorp/consul/issues/5506. The issue is cause
|
|
|
|
|
// if the target service exists and is registered meaning it has a
|
|
|
|
|
// service-specific index. This index is then used for the connect query
|
|
|
|
|
// even though it is not updated by changes to the actual proxy or it's
|
|
|
|
|
// checks. If the target service was never registered then it all appears
|
|
|
|
|
// to work because the code would not find a service index and so fall
|
|
|
|
|
// back to using the global service index which does change on any update
|
|
|
|
|
// to proxies.
|
|
|
|
|
name: "unblocks on proxy service health check change with target service present",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterService(t, s, 4, "node1", "test") // normal service
|
|
|
|
|
testRegisterSidecarProxy(t, s, 5, "node1", "test")
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "test-sidecar-proxy", "check1", "passing")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
testRegisterCheck(t, s, 7, "node1", "test-sidecar-proxy", "check1", "critical")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 7,
|
|
|
|
|
wantAfterResLen: 1, // critical filtering doesn't happen in the state store method.
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
// See https://github.com/hashicorp/consul/issues/5506. This is the edge
|
|
|
|
|
// case that the simple solution wouldn't catch.
|
|
|
|
|
name: "unblocks on different service name proxy-service registration when service is present",
|
|
|
|
|
setupFn: func(s *Store) {
|
|
|
|
|
testRegisterSidecarProxy(t, s, 4, "node1", "test")
|
|
|
|
|
},
|
|
|
|
|
svc: "test",
|
|
|
|
|
wantBeforeResLen: 1,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service index,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantBeforeWatchSetSize: 3,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
updateFn: func(s *Store) {
|
|
|
|
|
// Register a new result with a different service name could be another
|
|
|
|
|
// proxy with a different name, but a native instance works too.
|
|
|
|
|
testRegisterConnectNativeService(t, s, 5, "node2", "test")
|
|
|
|
|
},
|
|
|
|
|
shouldFire: true,
|
|
|
|
|
wantAfterIndex: 5,
|
|
|
|
|
wantAfterResLen: 2,
|
2020-04-13 17:11:35 +00:00
|
|
|
|
// Should take the optimized path where we only watch the service indexes,
|
|
|
|
|
// connect index iterator, and gateway-services iterator.
|
|
|
|
|
wantAfterWatchSetSize: 4,
|
2019-03-21 16:01:56 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
for _, tt := range tests {
|
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// Always create 3 nodes
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
testRegisterNode(t, s, 2, "node2")
|
|
|
|
|
testRegisterNode(t, s, 3, "node3")
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// Setup
|
|
|
|
|
if tt.setupFn != nil {
|
|
|
|
|
tt.setupFn(s)
|
|
|
|
|
}
|
Improve blocking queries on services that do not exist (#4810)
## Background
When making a blocking query on a missing service (was never registered, or is not registered anymore) the query returns as soon as any service is updated.
On clusters with frequent updates (5~10 updates/s in our DCs) these queries virtually do not block, and clients with no protections againt this waste ressources on the agent and server side. Clients that do protect against this get updates later than they should because of the backoff time they implement between requests.
## Implementation
While reducing the number of unnecessary updates we still want :
* Clients to be notified as soon as when the last instance of a service disapears.
* Clients to be notified whenever there's there is an update for the service.
* Clients to be notified as soon as the first instance of the requested service is added.
To reduce the number of unnecessary updates we need to block when a request to a missing service is made. However in the following case :
1. Client `client1` makes a query for service `foo`, gets back a node and X-Consul-Index 42
2. `foo` is unregistered
3. `client1` makes a query for `foo` with `index=42` -> `foo` does not exist, the query blocks and `client1` is not notified of the change on `foo`
We could store the last raft index when each service was last alive to know wether we should block on the incoming query or not, but that list could grow indefinetly.
We instead store the last raft index when a service was unregistered and use it when a query targets a service that does not exist.
When a service `srv` is unregistered this "missing service index" is always greater than any X-Consul-Index held by the clients while `srv` was up, allowing us to immediatly notify them.
1. Client `client1` makes a query for service `foo`, gets back a node and `X-Consul-Index: 42`
2. `foo` is unregistered, we set the "missing service index" to 43
3. `client1` makes a blocking query for `foo` with `index=42` -> `foo` does not exist, we check against the "missing service index" and return immediatly with `X-Consul-Index: 43`
4. `client1` makes a blocking query for `foo` with `index=43` -> we block
5. Other changes happen in the cluster, but foo still doesn't exist and "missing service index" hasn't changed, the query is still blocked
6. `foo` is registered again on index 62 -> `foo` exists and its index is greater than 43, we unblock the query
2019-01-11 14:26:14 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// Run the query
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, res, err := s.CheckConnectServiceNodes(ws, tt.svc, nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Len(t, res, tt.wantBeforeResLen)
|
|
|
|
|
require.Len(t, ws, tt.wantBeforeWatchSetSize)
|
2018-03-01 13:09:36 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// Mutate the state store
|
|
|
|
|
if tt.updateFn != nil {
|
|
|
|
|
tt.updateFn(s)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fired := watchFired(ws)
|
|
|
|
|
if tt.shouldFire {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.True(t, fired, "WatchSet should have fired")
|
2019-03-21 16:01:56 +00:00
|
|
|
|
} else {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.False(t, fired, "WatchSet should not have fired")
|
2019-03-21 16:01:56 +00:00
|
|
|
|
}
|
2018-03-01 13:09:36 +00:00
|
|
|
|
|
2019-03-21 16:01:56 +00:00
|
|
|
|
// Re-query the same result. Should return the desired index and len
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.CheckConnectServiceNodes(ws, tt.svc, nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Len(t, res, tt.wantAfterResLen)
|
|
|
|
|
require.Equal(t, tt.wantAfterIndex, idx)
|
|
|
|
|
require.Len(t, ws, tt.wantAfterWatchSetSize)
|
2019-03-21 16:01:56 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
2018-02-19 17:29:22 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_CheckServiceNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Querying with no matches gives an empty response
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, res, err := s.CheckServiceNodes(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register some nodes.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register node-level checks. These should be the final result.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 2, "node1", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 3, "node2", "", "check2", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register a service against the nodes.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
testRegisterService(t, s, 4, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service2")
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Register checks against the services.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "service1", "check3", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 7, "node2", "service2", "check4", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// At this point all the changes should have fired the watch.
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-19 17:29:22 +00:00
|
|
|
|
// We ensure the idx for service2 has not been changed
|
|
|
|
|
ensureServiceVersion(t, s, ws, "service2", 7, 1)
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Query the state store for nodes and checks which have been registered
|
|
|
|
|
// with a specific service.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
2018-02-19 17:29:22 +00:00
|
|
|
|
ensureServiceVersion(t, s, ws, "service1", 6, 1)
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, results, err := s.CheckServiceNodes(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2018-02-20 00:28:06 +00:00
|
|
|
|
// registered with ensureServiceVersion(t, s, ws, "service1", 6, 1)
|
|
|
|
|
if idx != 6 {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Make sure we get the expected result (service check + node check).
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if n := len(results); n != 1 {
|
|
|
|
|
t.Fatalf("expected 1 result, got: %d", n)
|
|
|
|
|
}
|
|
|
|
|
csn := results[0]
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if csn.Node == nil || csn.Service == nil || len(csn.Checks) != 2 ||
|
|
|
|
|
csn.Checks[0].ServiceID != "" || csn.Checks[0].CheckID != "check1" ||
|
|
|
|
|
csn.Checks[1].ServiceID != "service1" || csn.Checks[1].CheckID != "check3" {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad output: %#v", csn)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Node updates alter the returned index and fire the watch.
|
2018-10-11 11:42:39 +00:00
|
|
|
|
testRegisterNodeWithChange(t, s, 8, "node1")
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, _, err = s.CheckServiceNodes(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
2019-03-11 14:48:19 +00:00
|
|
|
|
// service1 has been updated by node on idx 8
|
|
|
|
|
if idx != 8 {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Service updates alter the returned index and fire the watch.
|
2018-10-11 11:42:39 +00:00
|
|
|
|
|
|
|
|
|
testRegisterServiceWithChange(t, s, 9, "node1", "service1", true)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, _, err = s.CheckServiceNodes(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 9 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
// Check updates alter the returned index and fire the watch.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 10, "node1", "service1", "check1", api.HealthCritical)
|
2017-01-24 07:37:21 +00:00
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, _, err = s.CheckServiceNodes(ws, "service1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 10 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
|
|
|
|
// Registering some unrelated node + service should not fire the watch.
|
|
|
|
|
testRegisterNode(t, s, 11, "nope")
|
|
|
|
|
testRegisterService(t, s, 12, "nope", "nope")
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-15 20:18:48 +00:00
|
|
|
|
// Note that we can't overwhelm chan tracking any more since we optimized it
|
|
|
|
|
// to only need to watch one chan in the happy path. The only path that does
|
|
|
|
|
// bees to watch more stuff is where there are no service instances which also
|
|
|
|
|
// means fewer than watchLimit chans too so effectively no way to trigger
|
|
|
|
|
// Fallback watch any more.
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-09 17:32:22 +00:00
|
|
|
|
func TestStateStore_CheckConnectServiceNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
2018-03-09 17:32:22 +00:00
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(12, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(14, "foo", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(15, "bar", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2018-03-09 17:32:22 +00:00
|
|
|
|
|
|
|
|
|
// Register node checks
|
|
|
|
|
testRegisterCheck(t, s, 17, "foo", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 18, "bar", "", "check2", api.HealthPassing)
|
|
|
|
|
|
|
|
|
|
// Register checks against the services.
|
|
|
|
|
testRegisterCheck(t, s, 19, "foo", "db", "check3", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 20, "bar", "proxy", "check4", api.HealthPassing)
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, nodes, 2)
|
2018-03-09 17:32:22 +00:00
|
|
|
|
|
|
|
|
|
for _, n := range nodes {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindConnectProxy, n.Service.Kind)
|
|
|
|
|
assert.Equal(t, "db", n.Service.Proxy.DestinationServiceName)
|
2018-03-09 17:32:22 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
func TestStateStore_CheckConnectServiceNodes_Gateways(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Create some nodes and services.
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Typical services
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(12, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(14, "bar", &structs.NodeService{ID: "db2", Service: "db", Tags: []string{"replica"}, Address: "", Port: 8001}))
|
|
|
|
|
assert.False(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-13 16:33:37 +00:00
|
|
|
|
// Register node and service checks
|
|
|
|
|
testRegisterCheck(t, s, 15, "foo", "", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 16, "bar", "", "check2", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 17, "foo", "db", "check3", api.HealthPassing)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.False(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-13 16:33:37 +00:00
|
|
|
|
// Watch should fire when a gateway is associated with the service, even if the gateway doesn't exist yet
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(18, &structs.TerminatingGatewayConfigEntry{
|
2020-04-08 18:37:24 +00:00
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(18))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
2020-04-13 16:33:37 +00:00
|
|
|
|
// Watch should fire when a gateway is added
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(19, "bar", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-13 16:33:37 +00:00
|
|
|
|
|
|
|
|
|
// Watch should fire when a check is added to the gateway
|
|
|
|
|
testRegisterCheck(t, s, 20, "bar", "gateway", "check4", api.HealthPassing)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-13 16:33:37 +00:00
|
|
|
|
|
|
|
|
|
// Watch should fire when a different connect service is registered for db
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(21, "foo", &structs.NodeService{Kind: structs.ServiceKindConnectProxy, ID: "proxy", Service: "proxy", Proxy: structs.ConnectProxyConfig{DestinationServiceName: "db"}, Port: 8000}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-13 16:33:37 +00:00
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(21))
|
|
|
|
|
assert.Len(t, nodes, 2)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check sidecar
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindConnectProxy, nodes[0].Service.Kind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[0].Node.Node)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].Service.Service)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].Service.ID)
|
|
|
|
|
assert.Equal(t, "db", nodes[0].Service.Proxy.DestinationServiceName)
|
|
|
|
|
assert.Equal(t, 8000, nodes[0].Service.Port)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindTerminatingGateway, nodes[1].Service.Kind)
|
|
|
|
|
assert.Equal(t, "bar", nodes[1].Node.Node)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].Service.Service)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].Service.ID)
|
|
|
|
|
assert.Equal(t, 443, nodes[1].Service.Port)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Watch should fire when another gateway instance is registered
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, s.EnsureService(22, "foo", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway-2", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(22))
|
|
|
|
|
assert.Len(t, nodes, 3)
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
2020-05-08 14:03:45 +00:00
|
|
|
|
// Watch should fire when a gateway instance is deregistered
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(23, "bar", "gateway", nil, ""))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(23))
|
|
|
|
|
assert.Len(t, nodes, 2)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Check new gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindTerminatingGateway, nodes[1].Service.Kind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[1].Node.Node)
|
|
|
|
|
assert.Equal(t, "gateway", nodes[1].Service.Service)
|
|
|
|
|
assert.Equal(t, "gateway-2", nodes[1].Service.ID)
|
|
|
|
|
assert.Equal(t, 443, nodes[1].Service.Port)
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
|
|
|
|
// Index should not slide back after deleting all instances of the gateway
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(24, "foo", "gateway-2", nil, ""))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err = s.CheckConnectServiceNodes(ws, "db", nil, "")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(24))
|
|
|
|
|
assert.Len(t, nodes, 1)
|
2020-04-27 22:25:37 +00:00
|
|
|
|
|
|
|
|
|
// Ensure that remaining node is the proxy and not a gateway
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
assert.Equal(t, structs.ServiceKindConnectProxy, nodes[0].Service.Kind)
|
|
|
|
|
assert.Equal(t, "foo", nodes[0].Node.Node)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].Service.Service)
|
|
|
|
|
assert.Equal(t, "proxy", nodes[0].Service.ID)
|
|
|
|
|
assert.Equal(t, 8000, nodes[0].Service.Port)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func BenchmarkCheckServiceNodes(b *testing.B) {
|
2020-10-23 19:21:37 +00:00
|
|
|
|
s := NewStateStore(nil)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(2, "foo", &structs.NodeService{ID: "db1", Service: "db", Tags: []string{"primary"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
check := &structs.HealthCheck{
|
|
|
|
|
Node: "foo",
|
|
|
|
|
CheckID: "db",
|
|
|
|
|
Name: "can connect",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ServiceID: "db1",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(3, check); err != nil {
|
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
check = &structs.HealthCheck{
|
|
|
|
|
Node: "foo",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "check1",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(4, check); err != nil {
|
|
|
|
|
b.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
2017-01-13 19:47:16 +00:00
|
|
|
|
for i := 0; i < b.N; i++ {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.CheckServiceNodes(ws, "db", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_CheckServiceTagNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
if err := s.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
2020-09-16 18:05:01 +00:00
|
|
|
|
if err := s.EnsureService(2, "foo", &structs.NodeService{ID: "db1", Service: "db", Tags: []string{"primary"}, Address: "", Port: 8000}); err != nil {
|
2017-01-13 19:47:16 +00:00
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
check := &structs.HealthCheck{
|
|
|
|
|
Node: "foo",
|
|
|
|
|
CheckID: "db",
|
|
|
|
|
Name: "can connect",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ServiceID: "db1",
|
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(3, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
check = &structs.HealthCheck{
|
|
|
|
|
Node: "foo",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "another check",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
if err := s.EnsureCheck(4, check); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 07:37:21 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, nodes, err := s.CheckServiceTagNodes(ws, "db", []string{"primary"}, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 4 {
|
|
|
|
|
t.Fatalf("bad: %v", idx)
|
|
|
|
|
}
|
|
|
|
|
if len(nodes) != 1 {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes)
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Node.Node != "foo" {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes[0])
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Service.ID != "db1" {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes[0])
|
|
|
|
|
}
|
|
|
|
|
if len(nodes[0].Checks) != 2 {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes[0])
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Checks[0].CheckID != "check1" {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes[0])
|
|
|
|
|
}
|
|
|
|
|
if nodes[0].Checks[1].CheckID != "db" {
|
|
|
|
|
t.Fatalf("Bad: %v", nodes[0])
|
|
|
|
|
}
|
2017-01-24 07:37:21 +00:00
|
|
|
|
|
|
|
|
|
// Changing a tag should fire the watch.
|
|
|
|
|
if err := s.EnsureService(4, "foo", &structs.NodeService{ID: "db1", Service: "db", Tags: []string{"nope"}, Address: "", Port: 8000}); err != nil {
|
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_Check_Snapshot(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create a node, a service, and a service check as well as a node check.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
|
|
|
|
checks := structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
Name: "node check",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
Name: "service check",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthCritical,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
for i, hc := range checks {
|
|
|
|
|
if err := s.EnsureCheck(uint64(i+1), hc); err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create a second node/service to make sure node filtering works. This
|
|
|
|
|
// will affect the index but not the dump.
|
|
|
|
|
testRegisterNode(t, s, 3, "node2")
|
|
|
|
|
testRegisterService(t, s, 4, "node2", "service2")
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 5, "node2", "service2", "check3", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Snapshot the checks.
|
|
|
|
|
snap := s.Snapshot()
|
|
|
|
|
defer snap.Close()
|
|
|
|
|
|
|
|
|
|
// Alter the real state store.
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node2", "service2", "check4", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Verify the snapshot.
|
|
|
|
|
if idx := snap.LastIndex(); idx != 5 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
iter, err := snap.Checks("node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
for i := 0; i < len(checks); i++ {
|
|
|
|
|
check := iter.Next().(*structs.HealthCheck)
|
|
|
|
|
if check == nil {
|
|
|
|
|
t.Fatalf("unexpected end of checks")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
checks[i].CreateIndex, checks[i].ModifyIndex = uint64(i+1), uint64(i+1)
|
|
|
|
|
if !reflect.DeepEqual(check, checks[i]) {
|
|
|
|
|
t.Fatalf("bad: %#v != %#v", check, checks[i])
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if iter.Next() != nil {
|
|
|
|
|
t.Fatalf("unexpected extra checks")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-19 16:15:37 +00:00
|
|
|
|
func TestStateStore_ServiceDump(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
type operation struct {
|
|
|
|
|
name string
|
|
|
|
|
modFn func(*testing.T)
|
|
|
|
|
allFired bool
|
|
|
|
|
kindFired bool
|
|
|
|
|
checkAll func(*testing.T, structs.CheckServiceNodes)
|
|
|
|
|
checkKind func(*testing.T, structs.CheckServiceNodes)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sortDump := func(dump structs.CheckServiceNodes) {
|
|
|
|
|
sort.Slice(dump, func(i, j int) bool {
|
|
|
|
|
if dump[i].Node.Node < dump[j].Node.Node {
|
|
|
|
|
return true
|
|
|
|
|
} else if dump[i].Node.Node > dump[j].Node.Node {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if dump[i].Service.Service < dump[j].Service.Service {
|
|
|
|
|
return true
|
|
|
|
|
} else if dump[i].Service.Service > dump[j].Service.Service {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
for i := 0; i < len(dump); i++ {
|
|
|
|
|
sort.Slice(dump[i].Checks, func(m, n int) bool {
|
|
|
|
|
return dump[i].Checks[m].CheckID < dump[i].Checks[n].CheckID
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
operations := []operation{
|
|
|
|
|
{
|
|
|
|
|
name: "register some nodes",
|
|
|
|
|
modFn: func(t *testing.T) {
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 0)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 0)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "register services against them",
|
|
|
|
|
modFn: func(t *testing.T) {
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "service1")
|
|
|
|
|
testRegisterSidecarProxy(t, s, 3, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 4, "node2", "service1")
|
|
|
|
|
testRegisterSidecarProxy(t, s, 5, "node2", "service1")
|
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 4)
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node1", dump[1].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[2].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[3].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
require.Equal(t, "service1", dump[2].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[3].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 0)
|
|
|
|
|
require.Len(t, dump[1].Checks, 0)
|
|
|
|
|
require.Len(t, dump[2].Checks, 0)
|
|
|
|
|
require.Len(t, dump[3].Checks, 0)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[1].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 0)
|
|
|
|
|
require.Len(t, dump[1].Checks, 0)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "register service-level checks",
|
|
|
|
|
modFn: func(t *testing.T) {
|
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "service1", "check1", api.HealthCritical)
|
|
|
|
|
testRegisterCheck(t, s, 7, "node2", "service1-sidecar-proxy", "check1", api.HealthCritical)
|
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 4)
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node1", dump[1].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[2].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[3].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
require.Equal(t, "service1", dump[2].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[3].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 1)
|
|
|
|
|
require.Len(t, dump[1].Checks, 0)
|
|
|
|
|
require.Len(t, dump[2].Checks, 0)
|
|
|
|
|
require.Len(t, dump[3].Checks, 1)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[3].Checks[0].Status)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[1].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 0)
|
|
|
|
|
require.Len(t, dump[1].Checks, 1)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[1].Checks[0].Status)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "register node-level checks",
|
|
|
|
|
modFn: func(t *testing.T) {
|
|
|
|
|
testRegisterCheck(t, s, 8, "node1", "", "check2", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 9, "node2", "", "check2", api.HealthPassing)
|
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 4)
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node1", dump[1].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[2].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[3].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
require.Equal(t, "service1", dump[2].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[3].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 2)
|
|
|
|
|
require.Len(t, dump[1].Checks, 1)
|
|
|
|
|
require.Len(t, dump[2].Checks, 1)
|
|
|
|
|
require.Len(t, dump[3].Checks, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[1].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[2].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[3].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[3].Checks[1].Status)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[1].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 1)
|
|
|
|
|
require.Len(t, dump[1].Checks, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthCritical, dump[1].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[1].Status)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "pass a previously failing check",
|
|
|
|
|
modFn: func(t *testing.T) {
|
|
|
|
|
testRegisterCheck(t, s, 10, "node1", "service1", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 11, "node2", "service1-sidecar-proxy", "check1", api.HealthPassing)
|
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 4)
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node1", dump[1].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[2].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[3].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
require.Equal(t, "service1", dump[2].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[3].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 2)
|
|
|
|
|
require.Len(t, dump[1].Checks, 1)
|
|
|
|
|
require.Len(t, dump[2].Checks, 1)
|
|
|
|
|
require.Len(t, dump[3].Checks, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[1].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[2].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[3].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[3].Checks[1].Status)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node2", dump[1].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 1)
|
|
|
|
|
require.Len(t, dump[1].Checks, 2)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[1].Status)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "delete a node",
|
|
|
|
|
modFn: func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
s.DeleteNode(12, "node2", nil, "")
|
2019-12-19 16:15:37 +00:00
|
|
|
|
},
|
|
|
|
|
allFired: true, // fires due to "index"
|
|
|
|
|
kindFired: true, // fires due to "index"
|
|
|
|
|
checkAll: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 2)
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
require.Equal(t, "node1", dump[1].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1", dump[0].Service.Service)
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[1].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 2)
|
|
|
|
|
require.Len(t, dump[1].Checks, 1)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[0].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[1].Status)
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[1].Checks[0].Status)
|
|
|
|
|
},
|
|
|
|
|
checkKind: func(t *testing.T, dump structs.CheckServiceNodes) {
|
|
|
|
|
require.Len(t, dump, 1)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "node1", dump[0].Node.Node)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, "service1-sidecar-proxy", dump[0].Service.Service)
|
|
|
|
|
|
|
|
|
|
require.Len(t, dump[0].Checks, 1)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, api.HealthPassing, dump[0].Checks[0].Status)
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
for _, op := range operations {
|
|
|
|
|
op := op
|
|
|
|
|
require.True(t, t.Run(op.name, func(t *testing.T) {
|
|
|
|
|
wsAll := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err := s.ServiceDump(wsAll, "", false, nil, "")
|
2019-12-19 16:15:37 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
wsKind := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, _, err = s.ServiceDump(wsKind, structs.ServiceKindConnectProxy, true, nil, "")
|
2019-12-19 16:15:37 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
op.modFn(t)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, op.allFired, watchFired(wsAll), "all dump watch firing busted")
|
|
|
|
|
require.Equal(t, op.kindFired, watchFired(wsKind), "kind dump watch firing busted")
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, dump, err := s.ServiceDump(nil, "", false, nil, "")
|
2019-12-19 16:15:37 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
sortDump(dump)
|
|
|
|
|
op.checkAll(t, dump)
|
|
|
|
|
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
_, dump, err = s.ServiceDump(nil, structs.ServiceKindConnectProxy, true, nil, "")
|
2019-12-19 16:15:37 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
sortDump(dump)
|
|
|
|
|
op.checkKind(t, dump)
|
|
|
|
|
}))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Generating a node dump that matches nothing returns empty
|
2017-01-24 17:06:51 +00:00
|
|
|
|
wsInfo := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, dump, err := s.NodeInfo(wsInfo, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || dump != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, dump, err)
|
|
|
|
|
}
|
2017-01-24 17:06:51 +00:00
|
|
|
|
wsDump := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, dump, err = s.NodeDump(wsDump, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if idx != 0 || dump != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, dump, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register some nodes
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
|
|
|
|
|
// Register services against them
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 3, "node1", "service2")
|
|
|
|
|
testRegisterService(t, s, 4, "node2", "service1")
|
|
|
|
|
testRegisterService(t, s, 5, "node2", "service2")
|
|
|
|
|
|
|
|
|
|
// Register service-level checks
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 6, "node1", "service1", "check1", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 7, "node2", "service1", "check1", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Register node-level checks
|
2017-04-19 23:00:11 +00:00
|
|
|
|
testRegisterCheck(t, s, 8, "node1", "", "check2", api.HealthPassing)
|
|
|
|
|
testRegisterCheck(t, s, 9, "node2", "", "check2", api.HealthPassing)
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
2017-01-24 17:06:51 +00:00
|
|
|
|
// Both watches should have fired due to the changes above.
|
|
|
|
|
if !watchFired(wsInfo) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
if !watchFired(wsDump) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-13 19:47:16 +00:00
|
|
|
|
// Check that our result matches what we expect.
|
|
|
|
|
expect := structs.NodeDump{
|
|
|
|
|
&structs.NodeInfo{
|
2021-08-17 18:29:39 +00:00
|
|
|
|
Node: "node1",
|
|
|
|
|
Partition: structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Checks: structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
ServiceName: "service1",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 6,
|
|
|
|
|
ModifyIndex: 6,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node1",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
ServiceID: "",
|
|
|
|
|
ServiceName: "",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 8,
|
|
|
|
|
ModifyIndex: 8,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Services: []*structs.NodeService{
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "service1",
|
|
|
|
|
Address: "1.1.1.1",
|
2018-10-11 11:42:39 +00:00
|
|
|
|
Meta: make(map[string]string),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Port: 1111,
|
2018-09-07 14:30:47 +00:00
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 2,
|
|
|
|
|
ModifyIndex: 2,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ID: "service2",
|
|
|
|
|
Service: "service2",
|
|
|
|
|
Address: "1.1.1.1",
|
2018-10-11 11:42:39 +00:00
|
|
|
|
Meta: make(map[string]string),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Port: 1111,
|
2018-09-07 14:30:47 +00:00
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 3,
|
|
|
|
|
ModifyIndex: 3,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
&structs.NodeInfo{
|
2021-08-17 18:29:39 +00:00
|
|
|
|
Node: "node2",
|
|
|
|
|
Partition: structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
Checks: structs.HealthChecks{
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node2",
|
|
|
|
|
CheckID: "check1",
|
|
|
|
|
ServiceID: "service1",
|
|
|
|
|
ServiceName: "service1",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 7,
|
|
|
|
|
ModifyIndex: 7,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
&structs.HealthCheck{
|
|
|
|
|
Node: "node2",
|
|
|
|
|
CheckID: "check2",
|
|
|
|
|
ServiceID: "",
|
|
|
|
|
ServiceName: "",
|
2017-04-19 23:00:11 +00:00
|
|
|
|
Status: api.HealthPassing,
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 9,
|
|
|
|
|
ModifyIndex: 9,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Services: []*structs.NodeService{
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ID: "service1",
|
|
|
|
|
Service: "service1",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
2018-10-11 11:42:39 +00:00
|
|
|
|
Meta: make(map[string]string),
|
2018-09-07 14:30:47 +00:00
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
2020-06-16 17:19:31 +00:00
|
|
|
|
{
|
2017-01-13 19:47:16 +00:00
|
|
|
|
ID: "service2",
|
|
|
|
|
Service: "service2",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
2018-10-11 11:42:39 +00:00
|
|
|
|
Meta: make(map[string]string),
|
2018-09-07 14:30:47 +00:00
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
2017-01-13 19:47:16 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 5,
|
|
|
|
|
ModifyIndex: 5,
|
|
|
|
|
},
|
2021-07-22 18:20:45 +00:00
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
2017-01-13 19:47:16 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get a dump of just a single node
|
2017-01-24 17:06:51 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, dump, err = s.NodeInfo(ws, "node1", nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 9 {
|
|
|
|
|
t.Fatalf("bad index: %d", idx)
|
|
|
|
|
}
|
2019-12-10 02:26:41 +00:00
|
|
|
|
require.Len(t, dump, 1)
|
|
|
|
|
require.Equal(t, expect[0], dump[0])
|
2017-01-13 19:47:16 +00:00
|
|
|
|
|
|
|
|
|
// Generate a dump of all the nodes
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
idx, dump, err = s.NodeDump(nil, nil, "")
|
2017-01-13 19:47:16 +00:00
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("err: %s", err)
|
|
|
|
|
}
|
|
|
|
|
if idx != 9 {
|
|
|
|
|
t.Fatalf("bad index: %d", 9)
|
|
|
|
|
}
|
|
|
|
|
if !reflect.DeepEqual(dump, expect) {
|
|
|
|
|
t.Fatalf("bad: %#v", dump[0].Services[0])
|
|
|
|
|
}
|
2017-01-24 17:06:51 +00:00
|
|
|
|
|
|
|
|
|
// Registering some unrelated node + service + check should not fire the
|
|
|
|
|
// watch.
|
|
|
|
|
testRegisterNode(t, s, 10, "nope")
|
|
|
|
|
testRegisterService(t, s, 11, "nope", "nope")
|
|
|
|
|
if watchFired(ws) {
|
|
|
|
|
t.Fatalf("bad")
|
|
|
|
|
}
|
2017-01-13 19:47:16 +00:00
|
|
|
|
}
|
2019-03-11 14:48:19 +00:00
|
|
|
|
|
|
|
|
|
func TestStateStore_ServiceIdxUpdateOnNodeUpdate(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create a service on a node
|
|
|
|
|
err := s.EnsureNode(10, &structs.Node{Node: "node", Address: "127.0.0.1"})
|
|
|
|
|
require.Nil(t, err)
|
|
|
|
|
err = s.EnsureService(12, "node", &structs.NodeService{ID: "srv", Service: "srv", Tags: nil, Address: "", Port: 5000})
|
|
|
|
|
require.Nil(t, err)
|
|
|
|
|
|
|
|
|
|
// Store the current service index
|
|
|
|
|
ws := memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
lastIdx, _, err := s.ServiceNodes(ws, "srv", nil, "")
|
2019-03-11 14:48:19 +00:00
|
|
|
|
require.Nil(t, err)
|
|
|
|
|
|
|
|
|
|
// Update the node with some meta
|
|
|
|
|
err = s.EnsureNode(14, &structs.Node{Node: "node", Address: "127.0.0.1", Meta: map[string]string{"foo": "bar"}})
|
|
|
|
|
require.Nil(t, err)
|
|
|
|
|
|
|
|
|
|
// Read the new service index
|
|
|
|
|
ws = memdb.NewWatchSet()
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
newIdx, _, err := s.ServiceNodes(ws, "srv", nil, "")
|
2019-03-11 14:48:19 +00:00
|
|
|
|
require.Nil(t, err)
|
|
|
|
|
|
|
|
|
|
require.True(t, newIdx > lastIdx)
|
|
|
|
|
}
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
|
|
|
|
func TestStateStore_ensureServiceCASTxn(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
testRegisterNode(t, s, 1, "node1")
|
|
|
|
|
|
|
|
|
|
// Register a service
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "foo")
|
|
|
|
|
|
|
|
|
|
ns := structs.NodeService{
|
|
|
|
|
ID: "foo",
|
|
|
|
|
Service: "foo",
|
|
|
|
|
// the testRegisterServices registers it with 111 as a port
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
ModifyIndex: 0,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// attempt to update with a 0 index
|
2020-03-19 13:11:20 +00:00
|
|
|
|
tx := s.db.WriteTxnRestore()
|
2020-07-10 00:56:43 +00:00
|
|
|
|
err := ensureServiceCASTxn(tx, 3, "node1", &ns)
|
2020-05-20 16:43:33 +00:00
|
|
|
|
require.Equal(t, err, errCASCompareFailed)
|
2020-06-02 20:34:56 +00:00
|
|
|
|
require.NoError(t, tx.Commit())
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
|
|
|
|
// ensure no update happened
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn := s.db.Txn(false)
|
2022-05-27 11:38:52 +00:00
|
|
|
|
_, nsRead, err := s.NodeService(nil, "node1", "foo", nil, "")
|
2019-06-17 14:41:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, nsRead)
|
|
|
|
|
require.Equal(t, uint64(2), nsRead.ModifyIndex)
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn.Commit()
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
|
|
|
|
ns.ModifyIndex = 99
|
|
|
|
|
// attempt to update with a non-matching index
|
2020-03-19 13:11:20 +00:00
|
|
|
|
tx = s.db.WriteTxnRestore()
|
2020-07-10 00:56:43 +00:00
|
|
|
|
err = ensureServiceCASTxn(tx, 4, "node1", &ns)
|
2020-05-20 16:43:33 +00:00
|
|
|
|
require.Equal(t, err, errCASCompareFailed)
|
2020-06-02 20:34:56 +00:00
|
|
|
|
require.NoError(t, tx.Commit())
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
2019-07-19 11:54:53 +00:00
|
|
|
|
// ensure no update happened
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn = s.db.Txn(false)
|
2022-05-27 11:38:52 +00:00
|
|
|
|
_, nsRead, err = s.NodeService(nil, "node1", "foo", nil, "")
|
2019-06-17 14:41:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, nsRead)
|
|
|
|
|
require.Equal(t, uint64(2), nsRead.ModifyIndex)
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn.Commit()
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
|
|
|
|
ns.ModifyIndex = 2
|
|
|
|
|
// update with the matching modify index
|
2020-03-19 13:11:20 +00:00
|
|
|
|
tx = s.db.WriteTxnRestore()
|
2020-07-10 00:56:43 +00:00
|
|
|
|
err = ensureServiceCASTxn(tx, 7, "node1", &ns)
|
2019-06-17 14:41:04 +00:00
|
|
|
|
require.NoError(t, err)
|
2020-06-02 20:34:56 +00:00
|
|
|
|
require.NoError(t, tx.Commit())
|
2019-06-17 14:41:04 +00:00
|
|
|
|
|
|
|
|
|
// ensure the update happened
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn = s.db.Txn(false)
|
2022-05-27 11:38:52 +00:00
|
|
|
|
_, nsRead, err = s.NodeService(nil, "node1", "foo", nil, "")
|
2019-06-17 14:41:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.NotNil(t, nsRead)
|
|
|
|
|
require.Equal(t, uint64(7), nsRead.ModifyIndex)
|
2020-09-03 23:38:03 +00:00
|
|
|
|
roTxn.Commit()
|
2019-06-17 14:41:04 +00:00
|
|
|
|
}
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
func TestStateStore_GatewayServices_Terminating(t *testing.T) {
|
2020-04-08 18:37:24 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, nodes, err := s.GatewayServices(ws, "db", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
|
|
|
|
|
|
|
|
|
// Create some nodes
|
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(12, &structs.Node{Node: "baz", Address: "127.0.0.2"}))
|
|
|
|
|
|
|
|
|
|
// Typical services and some consul services spread across two nodes
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(15, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(17, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
|
|
|
|
|
// Add ingress gateway and a connect proxy, neither should get picked up by terminating gateway
|
|
|
|
|
ingressNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
ID: "ingress",
|
|
|
|
|
Service: "ingress",
|
|
|
|
|
Port: 8443,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(18, "baz", ingressNS))
|
|
|
|
|
|
|
|
|
|
proxyNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "db proxy",
|
|
|
|
|
Service: "db proxy",
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "db",
|
|
|
|
|
},
|
|
|
|
|
Port: 8000,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(19, "foo", proxyNS))
|
|
|
|
|
|
|
|
|
|
// Register a gateway
|
|
|
|
|
assert.Nil(t, s.EnsureService(20, "baz", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
|
|
|
|
|
// Associate gateway with db and api
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err := s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(21))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
2020-05-11 17:38:04 +00:00
|
|
|
|
// Check that we don't update on same exact config
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-05-11 17:38:04 +00:00
|
|
|
|
assert.False(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(21))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-05-11 17:38:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-05-11 17:38:04 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-05-11 17:38:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-05-11 17:38:04 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
2020-04-08 18:37:24 +00:00
|
|
|
|
// Associate gateway with a wildcard and add TLS config
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(22, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-domain",
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-alt-domain",
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(22))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-domain",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Add a service covered by wildcard
|
|
|
|
|
assert.Nil(t, s.EnsureService(23, "bar", &structs.NodeService{ID: "redis", Service: "redis", Tags: nil, Address: "", Port: 6379}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(23))
|
|
|
|
|
assert.Len(t, out, 3)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-domain",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("redis", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-alt-domain",
|
2020-04-17 00:51:27 +00:00
|
|
|
|
FromWildcard: true,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 23,
|
|
|
|
|
ModifyIndex: 23,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Delete a service covered by wildcard
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(24, "bar", "redis", nil, ""))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(24))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
2020-04-27 22:25:37 +00:00
|
|
|
|
SNI: "my-domain",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
// Update the entry that only leaves one service
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(25, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(25))
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
// previously associated services should not be present
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-08 18:37:24 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 25,
|
|
|
|
|
ModifyIndex: 25,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-08 18:37:24 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Attempt to associate a different gateway with services that include db
|
2020-04-16 21:00:48 +00:00
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(26, &structs.TerminatingGatewayConfigEntry{
|
2020-04-08 18:37:24 +00:00
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway2",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway2", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(26))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway2", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
FromWildcard: true,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway2", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
FromWildcard: true,
|
2020-04-16 21:00:48 +00:00
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
|
|
|
|
|
// Deleting the config entry should remove existing mappings
|
2020-04-16 21:00:48 +00:00
|
|
|
|
assert.Nil(t, s.DeleteConfigEntry(27, "terminating-gateway", "gateway", nil))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Nil(t, err)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
assert.Equal(t, idx, uint64(27))
|
2020-04-08 18:37:24 +00:00
|
|
|
|
assert.Len(t, out, 0)
|
|
|
|
|
}
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
2022-07-14 18:45:51 +00:00
|
|
|
|
func TestStateStore_ServiceGateways_Terminating(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
idx, nodes, err := s.GatewayServices(ws, "db", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(0), idx)
|
|
|
|
|
assert.Len(t, nodes, 0)
|
|
|
|
|
|
|
|
|
|
// Create some nodes
|
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(12, &structs.Node{Node: "baz", Address: "127.0.0.2"}))
|
|
|
|
|
|
|
|
|
|
// Typical services and some consul services spread across two nodes
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(15, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(17, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
|
|
|
|
|
// Add ingress gateway and a connect proxy, neither should get picked up by terminating gateway
|
|
|
|
|
ingressNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
ID: "ingress",
|
|
|
|
|
Service: "ingress",
|
|
|
|
|
Port: 8443,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(18, "baz", ingressNS))
|
|
|
|
|
|
|
|
|
|
proxyNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "db proxy",
|
|
|
|
|
Service: "db proxy",
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "db",
|
|
|
|
|
},
|
|
|
|
|
Port: 8000,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(19, "foo", proxyNS))
|
|
|
|
|
|
|
|
|
|
// Register a gateway
|
|
|
|
|
assert.Nil(t, s.EnsureService(20, "baz", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
|
|
|
|
|
// Associate gateway with db and api
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.ServiceGateways(ws, "db", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(21), idx)
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect := structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Check that we don't update on same exact config
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}))
|
|
|
|
|
assert.False(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "api", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(21), idx)
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect = structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Associate gateway with a wildcard and add TLS config
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(22, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
|
|
|
|
SNI: "my-alt-domain",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "db", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(22), idx)
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect = structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Add a service covered by wildcard
|
|
|
|
|
assert.Nil(t, s.EnsureService(23, "bar", &structs.NodeService{ID: "redis", Service: "redis", Tags: nil, Address: "", Port: 6379}))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "redis", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(23), idx)
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect = structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Delete a service covered by wildcard
|
|
|
|
|
assert.Nil(t, s.DeleteService(24, "bar", "redis", structs.DefaultEnterpriseMetaInDefaultPartition(), ""))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "redis", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
// TODO: wildcards don't keep the same extinction index
|
|
|
|
|
assert.Equal(t, uint64(0), idx)
|
|
|
|
|
assert.Len(t, out, 0)
|
|
|
|
|
|
|
|
|
|
// Update the entry that only leaves one service
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(25, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "db", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(25), idx)
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
// previously associated services should not be present
|
|
|
|
|
expect = structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Attempt to associate a different gateway with services that include db
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(26, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway2",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
// check that watchset fired for new terminating gateway node service
|
|
|
|
|
assert.Nil(t, s.EnsureService(20, "baz", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway2", Service: "gateway2", Port: 443}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "db", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(26), idx)
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.CheckServiceNodes{
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Node: &structs.Node{
|
|
|
|
|
ID: "",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Node: "baz",
|
|
|
|
|
Partition: acl.DefaultPartitionName,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Service: "gateway2",
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway2",
|
|
|
|
|
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
|
|
|
|
|
Weights: &structs.Weights{Passing: 1, Warning: 1},
|
|
|
|
|
Port: 443,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Deleting the all gateway's node services should trigger the watch and keep the raft index stable
|
|
|
|
|
assert.Nil(t, s.DeleteService(27, "baz", "gateway", structs.DefaultEnterpriseMetaInDefaultPartition(), structs.DefaultPeerKeyword))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
assert.Nil(t, s.DeleteService(28, "baz", "gateway2", structs.DefaultEnterpriseMetaInDefaultPartition(), structs.DefaultPeerKeyword))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "db", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, uint64(28), idx)
|
|
|
|
|
assert.Len(t, out, 0)
|
|
|
|
|
|
|
|
|
|
// Deleting the config entry even with a node service should remove existing mappings
|
|
|
|
|
assert.Nil(t, s.EnsureService(29, "baz", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.Nil(t, s.DeleteConfigEntry(30, "terminating-gateway", "gateway", nil))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err = s.ServiceGateways(ws, "api", structs.ServiceKindTerminatingGateway, *structs.DefaultEnterpriseMetaInDefaultPartition())
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
// TODO: similar to ingress, the index can backslide if the config is deleted.
|
|
|
|
|
assert.Equal(t, uint64(28), idx)
|
|
|
|
|
assert.Len(t, out, 0)
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-17 00:51:27 +00:00
|
|
|
|
func TestStateStore_GatewayServices_ServiceDeletion(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create some nodes
|
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(12, &structs.Node{Node: "baz", Address: "127.0.0.2"}))
|
|
|
|
|
|
|
|
|
|
// Typical services and some consul services spread across two nodes
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(14, "foo", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
|
|
|
|
|
// Register two gateways
|
|
|
|
|
assert.Nil(t, s.EnsureService(17, "bar", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(18, "baz", &structs.NodeService{Kind: structs.ServiceKindTerminatingGateway, ID: "other-gateway", Service: "other-gateway", Port: 443}))
|
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
idx, nodes, err := s.GatewayServices(ws, "gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
|
|
|
|
|
2020-04-17 00:51:27 +00:00
|
|
|
|
// Associate the first gateway with db
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(19, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
CAFile: "my_ca.pem",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-17 00:51:27 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-29 22:52:27 +00:00
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
otherWS := memdb.NewWatchSet()
|
|
|
|
|
idx, _, err = s.GatewayServices(otherWS, "other-gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(19))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
|
|
|
|
|
|
|
|
|
// Associate the second gateway with wildcard
|
2020-04-17 00:51:27 +00:00
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(20, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "other-gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-04-17 00:51:27 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back for first gateway.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.GatewayServices(ws, "gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "my_ca.pem",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 19,
|
|
|
|
|
ModifyIndex: 19,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-04-17 00:51:27 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Read everything back for other gateway.
|
2020-04-29 22:52:27 +00:00
|
|
|
|
otherWS = memdb.NewWatchSet()
|
2020-04-17 00:51:27 +00:00
|
|
|
|
idx, out, err = s.GatewayServices(otherWS, "other-gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("other-gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("other-gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// Delete a service specified directly.
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(20, "foo", "db", nil, ""))
|
2020-04-17 00:51:27 +00:00
|
|
|
|
|
2022-05-31 20:20:12 +00:00
|
|
|
|
// The watch will fire because we need to update the gateway-services kind
|
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-17 00:51:27 +00:00
|
|
|
|
assert.True(t, watchFired(otherWS))
|
|
|
|
|
|
|
|
|
|
// db should remain in the original gateway
|
|
|
|
|
idx, out, err = s.GatewayServices(ws, "gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "my_ca.pem",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 19,
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ModifyIndex: 20,
|
2020-04-17 00:51:27 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
|
|
|
|
|
// db should not have been deleted from the other gateway
|
|
|
|
|
idx, out, err = s.GatewayServices(ws, "other-gateway", nil)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(20))
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
expect = structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("other-gateway", nil),
|
2020-04-17 00:51:27 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 20,
|
|
|
|
|
ModifyIndex: 20,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
func TestStateStore_CheckIngressServiceNodes(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
ws := setupIngressState(t, s)
|
|
|
|
|
|
|
|
|
|
t.Run("check service1 ingress gateway", func(t *testing.T) {
|
|
|
|
|
idx, results, err := s.CheckIngressServiceNodes(ws, "service1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
// Multiple instances of the ingress2 service
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Len(t, results, 4)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
ids := make(map[string]struct{})
|
|
|
|
|
for _, n := range results {
|
|
|
|
|
ids[n.Service.ID] = struct{}{}
|
|
|
|
|
}
|
|
|
|
|
expectedIds := map[string]struct{}{
|
2020-06-16 17:19:31 +00:00
|
|
|
|
"ingress1": {},
|
|
|
|
|
"ingress2": {},
|
|
|
|
|
"wildcardIngress": {},
|
2020-04-16 21:00:48 +00:00
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Equal(t, expectedIds, ids)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("check service2 ingress gateway", func(t *testing.T) {
|
|
|
|
|
idx, results, err := s.CheckIngressServiceNodes(ws, "service2", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
|
|
|
|
require.Len(t, results, 2)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
ids := make(map[string]struct{})
|
|
|
|
|
for _, n := range results {
|
|
|
|
|
ids[n.Service.ID] = struct{}{}
|
|
|
|
|
}
|
|
|
|
|
expectedIds := map[string]struct{}{
|
2020-06-16 17:19:31 +00:00
|
|
|
|
"ingress1": {},
|
|
|
|
|
"wildcardIngress": {},
|
2020-04-16 21:00:48 +00:00
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Equal(t, expectedIds, ids)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("check service3 ingress gateway", func(t *testing.T) {
|
2020-04-29 22:52:27 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.CheckIngressServiceNodes(ws, "service3", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
|
|
|
|
require.Len(t, results, 1)
|
|
|
|
|
require.Equal(t, "wildcardIngress", results[0].Service.ID)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("delete a wildcard entry", func(t *testing.T) {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Nil(t, s.DeleteConfigEntry(19, "ingress-gateway", "wildcardIngress", nil))
|
|
|
|
|
require.True(t, watchFired(ws))
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.CheckIngressServiceNodes(ws, "service1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
idx, results, err = s.CheckIngressServiceNodes(ws, "service2", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
|
|
|
|
require.Len(t, results, 1)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
idx, results, err = s.CheckIngressServiceNodes(ws, "service3", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(15), idx)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
// TODO(ingress): index goes backward when deleting last config entry
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
// require.Equal(t,uint64(11), idx)
|
|
|
|
|
require.Len(t, results, 0)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestStateStore_GatewayServices_Ingress(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
ws := setupIngressState(t, s)
|
|
|
|
|
|
|
|
|
|
t.Run("ingress1 gateway services", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Hosts: []string{"test.example.com"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 13,
|
|
|
|
|
ModifyIndex: 13,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 13,
|
|
|
|
|
ModifyIndex: 13,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress1", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("ingress2 gateway services", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress2", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 14,
|
|
|
|
|
ModifyIndex: 14,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress2", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("No gatway services associated", func(t *testing.T) {
|
|
|
|
|
idx, results, err := s.GatewayServices(ws, "nothingIngress", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 0)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("wildcard gateway services", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("wildcardIngress", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("wildcardIngress", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("wildcardIngress", nil),
|
|
|
|
|
Service: structs.NewServiceName("service3", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 12,
|
|
|
|
|
ModifyIndex: 12,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
2020-04-21 21:06:23 +00:00
|
|
|
|
t.Run("gateway with duplicate service", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress3", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 5555,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 15,
|
|
|
|
|
ModifyIndex: 15,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress3", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 5555,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 15,
|
|
|
|
|
ModifyIndex: 15,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress3", nil),
|
|
|
|
|
Service: structs.NewServiceName("service3", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 5555,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 15,
|
|
|
|
|
ModifyIndex: 15,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress3", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 6666,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 15,
|
|
|
|
|
ModifyIndex: 15,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2020-04-21 21:06:23 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress3", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-21 21:06:23 +00:00
|
|
|
|
})
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
t.Run("deregistering a service", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.Nil(t, s.DeleteService(18, "node1", "service1", nil, ""))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.True(t, watchFired(ws))
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(18), idx)
|
|
|
|
|
require.Len(t, results, 2)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
2020-05-11 17:38:04 +00:00
|
|
|
|
t.Run("check ingress2 gateway services again", func(t *testing.T) {
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress2", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-05-11 17:38:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 14,
|
|
|
|
|
ModifyIndex: 14,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress2", nil)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(18), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
|
|
|
|
})
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
t.Run("deleting a wildcard config entry", func(t *testing.T) {
|
2020-05-11 17:38:04 +00:00
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
_, _, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.Nil(t, s.DeleteConfigEntry(19, "ingress-gateway", "wildcardIngress", nil))
|
|
|
|
|
require.True(t, watchFired(ws))
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(19), idx)
|
|
|
|
|
require.Len(t, results, 0)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
|
2020-05-11 17:38:04 +00:00
|
|
|
|
t.Run("update ingress1 with exact same config entry", func(t *testing.T) {
|
|
|
|
|
ingress1 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress1",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "service1",
|
|
|
|
|
Hosts: []string{"test.example.com"},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "service2",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
_, _, err := s.GatewayServices(ws, "ingress1", nil)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.Nil(t, s.EnsureConfigEntry(20, ingress1))
|
2020-05-11 17:38:04 +00:00
|
|
|
|
require.False(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-05-11 17:38:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Hosts: []string{"test.example.com"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 13,
|
|
|
|
|
ModifyIndex: 13,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-05-11 17:38:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 13,
|
|
|
|
|
ModifyIndex: 13,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress1", nil)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(19), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
|
|
|
|
})
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
t.Run("updating a config entry with zero listeners", func(t *testing.T) {
|
|
|
|
|
ingress1 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress1",
|
|
|
|
|
Listeners: []structs.IngressListener{},
|
|
|
|
|
}
|
2020-05-11 17:38:04 +00:00
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
_, _, err := s.GatewayServices(ws, "ingress1", nil)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.Nil(t, s.EnsureConfigEntry(20, ingress1))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.True(t, watchFired(ws))
|
2020-04-29 22:52:27 +00:00
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "ingress1", nil)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(20), idx)
|
|
|
|
|
require.Len(t, results, 0)
|
2020-04-16 21:00:48 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-17 16:24:34 +00:00
|
|
|
|
func TestStateStore_GatewayServices_WildcardAssociation(t *testing.T) {
|
2020-12-07 18:42:55 +00:00
|
|
|
|
if testing.Short() {
|
|
|
|
|
t.Skip("too slow for testing.Short")
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-17 16:24:34 +00:00
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
setupIngressState(t, s)
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
|
|
|
|
|
t.Run("base case for wildcard", func(t *testing.T) {
|
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-17 16:24:34 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("do not associate ingress services with gateway", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
testRegisterIngressService(t, s, 17, "node1", "testIngress")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.False(t, watchFired(ws))
|
2020-04-17 16:24:34 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-17 16:24:34 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("do not associate terminating-gateway services with gateway", func(t *testing.T) {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Nil(t, s.EnsureService(18, "node1",
|
2020-04-17 16:24:34 +00:00
|
|
|
|
&structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway, ID: "gateway", Service: "gateway", Port: 443,
|
|
|
|
|
},
|
|
|
|
|
))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.False(t, watchFired(ws))
|
2020-04-17 16:24:34 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-17 16:24:34 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("do not associate connect-proxy services with gateway", func(t *testing.T) {
|
2020-04-23 23:16:04 +00:00
|
|
|
|
testRegisterSidecarProxy(t, s, 19, "node1", "web")
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.False(t, watchFired(ws))
|
2020-04-17 16:24:34 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-17 16:24:34 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("do not associate consul services with gateway", func(t *testing.T) {
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.Nil(t, s.EnsureService(20, "node1",
|
2020-04-17 16:24:34 +00:00
|
|
|
|
&structs.NodeService{ID: "consul", Service: "consul", Tags: nil},
|
|
|
|
|
))
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.False(t, watchFired(ws))
|
2020-04-17 16:24:34 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(ws, "wildcardIngress", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(16), idx)
|
|
|
|
|
require.Len(t, results, 3)
|
2020-04-17 16:24:34 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-23 23:16:04 +00:00
|
|
|
|
func TestStateStore_GatewayServices_IngressProtocolFiltering(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
t.Run("setup", func(t *testing.T) {
|
|
|
|
|
ingress1 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress1",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterService(t, s, 1, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 2, "node1", "service2")
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(4, ingress1))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("no services from default tcp protocol", func(t *testing.T) {
|
|
|
|
|
idx, results, err := s.GatewayServices(nil, "ingress1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(4), idx)
|
|
|
|
|
require.Len(t, results, 0)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("service-defaults", func(t *testing.T) {
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
svcDefaults := &structs.ServiceConfigEntry{
|
|
|
|
|
Name: "service1",
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(5, svcDefaults))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
idx, results, err := s.GatewayServices(nil, "ingress1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(5), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("proxy-defaults", func(t *testing.T) {
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
proxyDefaults := &structs.ProxyConfigEntry{
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(6, proxyDefaults))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
|
|
|
|
|
idx, results, err := s.GatewayServices(nil, "ingress1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(6), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("service-defaults overrides proxy-defaults", func(t *testing.T) {
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service2", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 4,
|
|
|
|
|
ModifyIndex: 4,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
svcDefaults := &structs.ServiceConfigEntry{
|
|
|
|
|
Name: "service1",
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(7, svcDefaults))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
|
|
|
|
|
idx, results, err := s.GatewayServices(nil, "ingress1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(7), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("change listener protocol and expect different filter", func(t *testing.T) {
|
|
|
|
|
expected := structs.GatewayServices{
|
|
|
|
|
{
|
2020-06-12 14:57:41 +00:00
|
|
|
|
Gateway: structs.NewServiceName("ingress1", nil),
|
|
|
|
|
Service: structs.NewServiceName("service1", nil),
|
2020-04-23 23:16:04 +00:00
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 8,
|
|
|
|
|
ModifyIndex: 8,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ingress1 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress1",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 4444,
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(8, ingress1))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
|
|
|
|
|
idx, results, err := s.GatewayServices(nil, "ingress1", nil)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(8), idx)
|
|
|
|
|
require.ElementsMatch(t, results, expected)
|
2020-04-23 23:16:04 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
func setupIngressState(t *testing.T, s *Store) memdb.WatchSet {
|
|
|
|
|
// Querying with no matches gives an empty response
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
idx, res, err := s.GatewayServices(ws, "ingress1", nil)
|
|
|
|
|
if idx != 0 || res != nil || err != nil {
|
|
|
|
|
t.Fatalf("expected (0, nil, nil), got: (%d, %#v, %#v)", idx, res, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register some nodes.
|
|
|
|
|
testRegisterNode(t, s, 0, "node1")
|
|
|
|
|
testRegisterNode(t, s, 1, "node2")
|
|
|
|
|
|
|
|
|
|
// Register a service against the nodes.
|
|
|
|
|
testRegisterIngressService(t, s, 3, "node1", "wildcardIngress")
|
|
|
|
|
testRegisterIngressService(t, s, 4, "node1", "ingress1")
|
|
|
|
|
testRegisterIngressService(t, s, 5, "node1", "ingress2")
|
|
|
|
|
testRegisterIngressService(t, s, 6, "node2", "ingress2")
|
|
|
|
|
testRegisterIngressService(t, s, 7, "node1", "nothingIngress")
|
|
|
|
|
testRegisterService(t, s, 8, "node1", "service1")
|
|
|
|
|
testRegisterService(t, s, 9, "node2", "service2")
|
|
|
|
|
testRegisterService(t, s, 10, "node2", "service3")
|
|
|
|
|
|
2020-04-23 23:16:04 +00:00
|
|
|
|
// Default protocol to http
|
|
|
|
|
proxyDefaults := &structs.ProxyConfigEntry{
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(11, proxyDefaults))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
// Register some ingress config entries.
|
|
|
|
|
wildcardIngress := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "wildcardIngress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 4444,
|
2020-04-23 23:16:04 +00:00
|
|
|
|
Protocol: "http",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(12, wildcardIngress))
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
ingress1 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress1",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
2020-04-23 23:16:04 +00:00
|
|
|
|
Protocol: "http",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
2020-04-23 15:06:19 +00:00
|
|
|
|
Name: "service1",
|
|
|
|
|
Hosts: []string{"test.example.com"},
|
2020-04-16 21:00:48 +00:00
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
2020-04-23 23:16:04 +00:00
|
|
|
|
Protocol: "http",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "service2",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(13, ingress1))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
ingress2 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress2",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 3333,
|
2020-04-23 23:16:04 +00:00
|
|
|
|
Protocol: "http",
|
2020-04-16 21:00:48 +00:00
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "service1",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(14, ingress2))
|
2020-04-23 23:16:04 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
2020-04-21 21:06:23 +00:00
|
|
|
|
ingress3 := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress3",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 5555,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 6666,
|
2020-04-23 23:16:04 +00:00
|
|
|
|
Protocol: "http",
|
2020-04-21 21:06:23 +00:00
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "service1",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(15, ingress3))
|
2020-04-21 21:06:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-04-16 21:00:48 +00:00
|
|
|
|
nothingIngress := &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "nothingIngress",
|
|
|
|
|
Listeners: []structs.IngressListener{},
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(16, nothingIngress))
|
2020-04-21 21:06:23 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
2020-04-16 21:00:48 +00:00
|
|
|
|
|
|
|
|
|
return ws
|
|
|
|
|
}
|
2020-08-05 22:07:11 +00:00
|
|
|
|
|
2022-02-04 19:04:12 +00:00
|
|
|
|
func TestStore_EnsureService_DoesNotPanicOnIngressGateway(t *testing.T) {
|
|
|
|
|
store := NewStateStore(nil)
|
|
|
|
|
|
|
|
|
|
err := store.EnsureConfigEntry(1, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: structs.IngressGateway,
|
|
|
|
|
Name: "the-ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 12345,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{{Name: "the-service"}},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
err = store.EnsureRegistration(2, &structs.RegisterRequest{
|
|
|
|
|
Node: "the-node",
|
|
|
|
|
Service: &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
Service: "the-proxy",
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "the-ingress",
|
|
|
|
|
Upstreams: []structs.Upstream{
|
|
|
|
|
{
|
|
|
|
|
DestinationName: "the-service",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-05 22:07:11 +00:00
|
|
|
|
func TestStateStore_DumpGatewayServices(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Listing with no results returns an empty list.
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
idx, nodes, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(0))
|
|
|
|
|
assert.Len(t, nodes, 0)
|
|
|
|
|
|
|
|
|
|
// Create some nodes
|
|
|
|
|
assert.Nil(t, s.EnsureNode(10, &structs.Node{Node: "foo", Address: "127.0.0.1"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(11, &structs.Node{Node: "bar", Address: "127.0.0.2"}))
|
|
|
|
|
assert.Nil(t, s.EnsureNode(12, &structs.Node{Node: "baz", Address: "127.0.0.2"}))
|
|
|
|
|
|
|
|
|
|
// Typical services and some consul services spread across two nodes
|
|
|
|
|
assert.Nil(t, s.EnsureService(13, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(15, "bar", &structs.NodeService{ID: "api", Service: "api", Tags: nil, Address: "", Port: 5000}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(16, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
assert.Nil(t, s.EnsureService(17, "bar", &structs.NodeService{ID: "consul", Service: "consul", Tags: nil}))
|
|
|
|
|
|
|
|
|
|
ingressNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
ID: "ingress",
|
|
|
|
|
Service: "ingress",
|
|
|
|
|
Port: 8443,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(18, "baz", ingressNS))
|
|
|
|
|
|
|
|
|
|
// Register a gateway
|
|
|
|
|
terminatingNS := &structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "gateway",
|
|
|
|
|
Service: "gateway",
|
|
|
|
|
Port: 443,
|
|
|
|
|
}
|
|
|
|
|
assert.Nil(t, s.EnsureService(20, "baz", terminatingNS))
|
|
|
|
|
|
|
|
|
|
t.Run("add-tgw-config", func(t *testing.T) {
|
|
|
|
|
// Associate gateway with db and api
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
|
|
|
|
SNI: "my-alt-domain",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(21))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("no-op", func(t *testing.T) {
|
|
|
|
|
// Check watch doesn't fire on same exact config
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(21, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
|
|
|
|
SNI: "my-alt-domain",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
assert.False(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(21))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Add a service covered by wildcard
|
|
|
|
|
t.Run("add-wc-service", func(t *testing.T) {
|
|
|
|
|
assert.Nil(t, s.EnsureService(22, "bar", &structs.NodeService{ID: "redis", Service: "redis", Tags: nil, Address: "", Port: 6379}))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(22))
|
|
|
|
|
assert.Len(t, out, 3)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("redis", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "ca.crt",
|
|
|
|
|
CertFile: "client.crt",
|
|
|
|
|
KeyFile: "client.key",
|
|
|
|
|
SNI: "my-alt-domain",
|
|
|
|
|
FromWildcard: true,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 22,
|
|
|
|
|
ModifyIndex: 22,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// Delete a service covered by wildcard
|
|
|
|
|
t.Run("delete-wc-service", func(t *testing.T) {
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
assert.Nil(t, s.DeleteService(23, "bar", "redis", nil, ""))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(23))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
CAFile: "api/ca.crt",
|
|
|
|
|
CertFile: "api/client.crt",
|
|
|
|
|
KeyFile: "api/client.key",
|
|
|
|
|
SNI: "my-domain",
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 21,
|
|
|
|
|
ModifyIndex: 21,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("delete-config-entry-svc", func(t *testing.T) {
|
|
|
|
|
// Update the entry that only leaves one service
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(24, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "gateway",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(24))
|
|
|
|
|
assert.Len(t, out, 1)
|
|
|
|
|
|
|
|
|
|
// previously associated service (api) should not be present
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 24,
|
|
|
|
|
ModifyIndex: 24,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("add-ingress-config", func(t *testing.T) {
|
|
|
|
|
svcDefault := &structs.ServiceConfigEntry{
|
|
|
|
|
Name: "web",
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
}
|
2021-02-03 23:10:38 +00:00
|
|
|
|
assert.NoError(t, s.EnsureConfigEntry(25, svcDefault))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
|
|
|
|
|
// Associate gateway with db and api
|
|
|
|
|
assert.Nil(t, s.EnsureConfigEntry(26, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "web",
|
|
|
|
|
Hosts: []string{"web.example.com"},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-08-05 22:07:11 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Read everything back.
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(26))
|
|
|
|
|
assert.Len(t, out, 3)
|
|
|
|
|
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("db", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("gateway", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 24,
|
|
|
|
|
ModifyIndex: 24,
|
|
|
|
|
},
|
2022-05-31 20:20:12 +00:00
|
|
|
|
ServiceKind: structs.GatewayServiceKindService,
|
2020-08-05 22:07:11 +00:00
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("ingress", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("web", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("ingress", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Hosts: []string{"web.example.com"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("delete-tgw-entry", func(t *testing.T) {
|
|
|
|
|
// Deleting the config entry should remove existing mappings
|
|
|
|
|
assert.Nil(t, s.DeleteConfigEntry(27, "terminating-gateway", "gateway", nil))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(27))
|
|
|
|
|
assert.Len(t, out, 2)
|
|
|
|
|
|
|
|
|
|
// Only ingress entries should remain
|
|
|
|
|
expect := structs.GatewayServices{
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("api", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("ingress", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Service: structs.NewServiceName("web", nil),
|
|
|
|
|
Gateway: structs.NewServiceName("ingress", nil),
|
|
|
|
|
GatewayKind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Hosts: []string{"web.example.com"},
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 26,
|
|
|
|
|
ModifyIndex: 26,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
assert.Equal(t, expect, out)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t.Run("delete-ingress-entry", func(t *testing.T) {
|
|
|
|
|
// Deleting the config entry should remove existing mappings
|
|
|
|
|
assert.Nil(t, s.DeleteConfigEntry(28, "ingress-gateway", "ingress", nil))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
idx, out, err := s.DumpGatewayServices(ws)
|
|
|
|
|
assert.Nil(t, err)
|
|
|
|
|
assert.Equal(t, idx, uint64(28))
|
|
|
|
|
assert.Len(t, out, 0)
|
|
|
|
|
})
|
|
|
|
|
}
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
func TestCatalog_catalogDownstreams_Watches(t *testing.T) {
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
admin := structs.NewServiceName("admin", defaultMeta)
|
|
|
|
|
cache := structs.NewServiceName("cache", defaultMeta)
|
|
|
|
|
|
|
|
|
|
// Watch should fire since the admin <-> web-proxy pairing was inserted into the topology table
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
tx := s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err := downstreamsFromRegistrationTxn(tx, ws, admin)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
assert.Zero(t, idx)
|
|
|
|
|
assert.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
svc := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(1, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = downstreamsFromRegistrationTxn(tx, ws, admin)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp := expect{
|
|
|
|
|
idx: 1,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now replace the admin upstream to verify watch fires and mapping is removed
|
|
|
|
|
svc.Proxy.Upstreams = structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "not-admin",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(2, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, _, err = downstreamsFromRegistrationTxn(tx, ws, admin)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect index where the upstream was replaced
|
|
|
|
|
idx: 2,
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.Empty(t, exp.names)
|
|
|
|
|
|
|
|
|
|
// Should still be able to get downstream for one of the other upstreams
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = downstreamsFromRegistrationTxn(tx, ws, cache)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
idx: 2,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now delete the web-proxy service and the result should be empty
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(3, "foo", "web-proxy", defaultMeta, ""))
|
2020-09-27 18:38:32 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, _, err = downstreamsFromRegistrationTxn(tx, ws, cache)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect deletion index
|
|
|
|
|
idx: 3,
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.Empty(t, exp.names)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestCatalog_catalogDownstreams(t *testing.T) {
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
tt := []struct {
|
|
|
|
|
name string
|
|
|
|
|
services []*structs.NodeService
|
|
|
|
|
expect expect
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
name: "single proxy with multiple upstreams",
|
|
|
|
|
services: []*structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: expect{
|
|
|
|
|
idx: 1,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "multiple proxies with multiple upstreams",
|
|
|
|
|
services: []*structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: expect{
|
|
|
|
|
idx: 2,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
var i uint64 = 1
|
|
|
|
|
for _, svc := range tc.services {
|
|
|
|
|
require.NoError(t, s.EnsureService(i, "foo", svc))
|
|
|
|
|
i++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tx := s.db.ReadTxn()
|
2021-07-22 18:20:45 +00:00
|
|
|
|
idx, names, err := downstreamsFromRegistrationTxn(tx, ws, structs.NewServiceName("admin", structs.DefaultEnterpriseMetaInDefaultPartition()))
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, tc.expect.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, tc.expect.names, names)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestCatalog_upstreamsFromRegistration(t *testing.T) {
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
tt := []struct {
|
|
|
|
|
name string
|
|
|
|
|
services []*structs.NodeService
|
|
|
|
|
expect expect
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
name: "single proxy with multiple upstreams",
|
|
|
|
|
services: []*structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: expect{
|
|
|
|
|
idx: 1,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "cache", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "multiple proxies with multiple upstreams",
|
|
|
|
|
services: []*structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy-2",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "new-admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "different-api-proxy",
|
|
|
|
|
Service: "different-api-proxy",
|
|
|
|
|
Address: "127.0.0.4",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "elasticache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.3",
|
|
|
|
|
Port: 80,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "billing",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: expect{
|
|
|
|
|
idx: 4,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "cache", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "new-admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "elasticache", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
var i uint64 = 1
|
|
|
|
|
for _, svc := range tc.services {
|
|
|
|
|
require.NoError(t, s.EnsureService(i, "foo", svc))
|
|
|
|
|
i++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tx := s.db.ReadTxn()
|
2021-07-22 18:20:45 +00:00
|
|
|
|
idx, names, err := upstreamsFromRegistrationTxn(tx, ws, structs.NewServiceName("api", structs.DefaultEnterpriseMetaInDefaultPartition()))
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, tc.expect.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, tc.expect.names, names)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestCatalog_upstreamsFromRegistration_Watches(t *testing.T) {
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-09-27 18:38:32 +00:00
|
|
|
|
web := structs.NewServiceName("web", defaultMeta)
|
|
|
|
|
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
tx := s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err := upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
assert.Zero(t, idx)
|
|
|
|
|
assert.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
// Watch should fire since the admin <-> web pairing was inserted into the topology table
|
|
|
|
|
svc := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(1, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp := expect{
|
|
|
|
|
idx: 1,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now edit the upstreams list to verify watch fires and mapping is removed
|
|
|
|
|
svc.Proxy.Upstreams = structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "not-admin",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(2, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect index where the upstream was replaced
|
|
|
|
|
idx: 2,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "not-admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Adding a new instance with distinct upstreams should result in a list that joins both
|
|
|
|
|
svc = structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy-2",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.3",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "also-not-admin",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(3, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
idx: 3,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "not-admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "also-not-admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "cache", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now delete the web-proxy service and the result should mirror the one of the remaining instance
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(4, "foo", "web-proxy", defaultMeta, ""))
|
2020-09-27 18:38:32 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
idx: 4,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "also-not-admin", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "cache", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now delete the last web-proxy instance and the mappings should be cleared
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(5, "foo", "web-proxy-2", defaultMeta, ""))
|
2020-09-27 18:38:32 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
2021-01-20 15:17:26 +00:00
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, web)
|
2020-09-27 18:38:32 +00:00
|
|
|
|
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect deletion index
|
|
|
|
|
idx: 5,
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
2021-01-20 15:17:26 +00:00
|
|
|
|
require.Equal(t, exp.names, names)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestCatalog_topologyCleanupPanic(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2021-01-20 15:17:26 +00:00
|
|
|
|
web := structs.NewServiceName("web", defaultMeta)
|
|
|
|
|
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
tx := s.db.ReadTxn()
|
|
|
|
|
idx, names, err := upstreamsFromRegistrationTxn(tx, ws, web)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
assert.Zero(t, idx)
|
|
|
|
|
assert.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
svc := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy-1",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(1, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
svc = structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy-2",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(2, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Now delete the node Foo, and this would panic because of the deletion within an iterator
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteNode(3, "foo", nil, ""))
|
2021-01-20 15:17:26 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
2020-09-27 18:38:32 +00:00
|
|
|
|
}
|
2020-09-27 20:24:42 +00:00
|
|
|
|
|
2020-10-08 15:47:09 +00:00
|
|
|
|
func TestCatalog_upstreamsFromRegistration_Ingress(t *testing.T) {
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-10-08 15:47:09 +00:00
|
|
|
|
ingress := structs.NewServiceName("ingress", defaultMeta)
|
|
|
|
|
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
tx := s.db.ReadTxn()
|
|
|
|
|
idx, names, err := upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
assert.Zero(t, idx)
|
|
|
|
|
assert.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
// Watch should fire since the ingress -> [web, api] mappings were inserted into the topology table
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(2, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Name: "web",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp := expect{
|
|
|
|
|
idx: 2,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now delete a gateway service and topology table should be updated
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(3, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect index where the upstream was replaced
|
|
|
|
|
idx: 3,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Now replace api with a wildcard and no services should be returned because none are registered
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(4, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(4), idx)
|
|
|
|
|
require.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
// Adding a service will be covered by the ingress wildcard and added to the topology
|
|
|
|
|
svc := structs.NodeService{
|
|
|
|
|
ID: "db",
|
|
|
|
|
Service: "db",
|
|
|
|
|
Address: "127.0.0.3",
|
|
|
|
|
Port: 443,
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(5, "foo", &svc))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect index where the upstream was replaced
|
|
|
|
|
idx: 5,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "db", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Deleting a service covered by a wildcard should delete its mapping
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(6, "foo", svc.ID, &svc.EnterpriseMeta, ""))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(6), idx)
|
|
|
|
|
require.Len(t, names, 0)
|
|
|
|
|
|
|
|
|
|
// Now add a service again, to test the effect of deleting the config entry itself
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(7, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "api",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2020-10-08 15:47:09 +00:00
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
exp = expect{
|
|
|
|
|
// Expect index where the upstream was replaced
|
|
|
|
|
idx: 7,
|
|
|
|
|
names: []structs.ServiceName{
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, exp.idx, idx)
|
|
|
|
|
require.ElementsMatch(t, exp.names, names)
|
|
|
|
|
|
|
|
|
|
// Deleting the config entry should remove the mapping
|
|
|
|
|
require.NoError(t, s.DeleteConfigEntry(8, "ingress-gateway", "ingress", defaultMeta))
|
|
|
|
|
assert.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = upstreamsFromRegistrationTxn(tx, ws, ingress)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(8), idx)
|
|
|
|
|
require.Len(t, names, 0)
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-20 15:17:26 +00:00
|
|
|
|
func TestCatalog_cleanupGatewayWildcards_panic(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(1, &structs.ProxyConfigEntry{
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2021-01-20 15:17:26 +00:00
|
|
|
|
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2021-01-20 15:17:26 +00:00
|
|
|
|
|
|
|
|
|
// Register two different gateways that target services via wildcard
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(2, &structs.TerminatingGatewayConfigEntry{
|
|
|
|
|
Kind: "terminating-gateway",
|
|
|
|
|
Name: "my-gateway-1-terminating",
|
|
|
|
|
Services: []structs.LinkedService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2021-01-20 15:17:26 +00:00
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(3, &structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: "ingress-gateway",
|
|
|
|
|
Name: "my-gateway-2-ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "*",
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
2021-02-03 23:10:38 +00:00
|
|
|
|
}))
|
2021-01-20 15:17:26 +00:00
|
|
|
|
|
|
|
|
|
// Register two services that share a prefix, both will be covered by gateway wildcards above
|
|
|
|
|
api := structs.NodeService{
|
|
|
|
|
ID: "api",
|
|
|
|
|
Service: "api",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(4, "foo", &api))
|
|
|
|
|
|
|
|
|
|
api2 := structs.NodeService{
|
|
|
|
|
ID: "api-2",
|
|
|
|
|
Service: "api-2",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(5, "foo", &api2))
|
|
|
|
|
|
|
|
|
|
// Now delete the node "foo", and this would panic because of the deletion within an iterator
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteNode(6, "foo", nil, ""))
|
2021-01-20 15:17:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-09-27 20:24:42 +00:00
|
|
|
|
func TestCatalog_DownstreamsForService(t *testing.T) {
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-09-27 20:24:42 +00:00
|
|
|
|
|
|
|
|
|
type expect struct {
|
|
|
|
|
idx uint64
|
|
|
|
|
names []structs.ServiceName
|
|
|
|
|
}
|
|
|
|
|
tt := []struct {
|
|
|
|
|
name string
|
|
|
|
|
services []*structs.NodeService
|
|
|
|
|
entries []structs.ConfigEntry
|
|
|
|
|
expect expect
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
name: "kitchen sink",
|
|
|
|
|
services: []*structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "old-admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
|
&structs.ProxyConfigEntry{
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
&structs.ServiceRouterConfigEntry{
|
|
|
|
|
Kind: structs.ServiceRouter,
|
|
|
|
|
Name: "old-admin",
|
|
|
|
|
Routes: []structs.ServiceRoute{
|
|
|
|
|
{
|
|
|
|
|
Match: &structs.ServiceRouteMatch{
|
|
|
|
|
HTTP: &structs.ServiceRouteHTTPMatch{
|
|
|
|
|
PathExact: "/v2",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Destination: &structs.ServiceRouteDestination{
|
|
|
|
|
Service: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: expect{
|
|
|
|
|
idx: 4,
|
|
|
|
|
names: []structs.ServiceName{
|
2020-10-02 00:10:49 +00:00
|
|
|
|
// get web from listing admin directly as an upstream
|
2020-09-27 20:24:42 +00:00
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
2020-10-02 00:10:49 +00:00
|
|
|
|
// get api from old-admin routing to admin and web listing old-admin as an upstream
|
2020-09-27 20:24:42 +00:00
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(0, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
var i uint64 = 1
|
|
|
|
|
for _, svc := range tc.services {
|
|
|
|
|
require.NoError(t, s.EnsureService(i, "foo", svc))
|
|
|
|
|
i++
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ca := &structs.CAConfiguration{
|
|
|
|
|
Provider: "consul",
|
|
|
|
|
}
|
|
|
|
|
err := s.CASetConfig(0, ca)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
for _, entry := range tc.entries {
|
|
|
|
|
require.NoError(t, entry.Normalize())
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(i, entry))
|
2020-09-27 20:24:42 +00:00
|
|
|
|
i++
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-02 00:10:49 +00:00
|
|
|
|
tx := s.db.ReadTxn()
|
|
|
|
|
defer tx.Abort()
|
|
|
|
|
|
2020-09-27 20:24:42 +00:00
|
|
|
|
ws := memdb.NewWatchSet()
|
2021-07-22 18:20:45 +00:00
|
|
|
|
sn := structs.NewServiceName("admin", structs.DefaultEnterpriseMetaInDefaultPartition())
|
2020-10-02 00:10:49 +00:00
|
|
|
|
idx, names, err := s.downstreamsForServiceTxn(tx, ws, "dc1", sn)
|
2020-09-27 20:24:42 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
require.Equal(t, tc.expect.idx, idx)
|
2020-09-29 01:41:24 +00:00
|
|
|
|
require.ElementsMatch(t, tc.expect.names, names)
|
2020-09-27 20:24:42 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-10-02 00:10:49 +00:00
|
|
|
|
|
|
|
|
|
func TestCatalog_DownstreamsForService_Updates(t *testing.T) {
|
|
|
|
|
var (
|
2021-07-22 18:20:45 +00:00
|
|
|
|
defaultMeta = structs.DefaultEnterpriseMetaInDefaultPartition()
|
2020-10-02 00:10:49 +00:00
|
|
|
|
target = structs.NewServiceName("admin", defaultMeta)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
ca := &structs.CAConfiguration{
|
|
|
|
|
Provider: "consul",
|
|
|
|
|
}
|
|
|
|
|
err := s.CASetConfig(1, ca)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, s.EnsureNode(2, &structs.Node{
|
|
|
|
|
ID: "c73b8fdf-4ef8-4e43-9aa2-59e85cc6a70c",
|
|
|
|
|
Node: "foo",
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
// Register a service with our target as an upstream, and it should show up as a downstream
|
|
|
|
|
web := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "web-proxy",
|
|
|
|
|
Service: "web-proxy",
|
|
|
|
|
Address: "127.0.0.2",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "web",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(3, "foo", &web))
|
|
|
|
|
|
|
|
|
|
ws := memdb.NewWatchSet()
|
|
|
|
|
tx := s.db.ReadTxn()
|
|
|
|
|
idx, names, err := s.downstreamsForServiceTxn(tx, ws, "dc1", target)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
tx.Abort()
|
|
|
|
|
|
|
|
|
|
expect := []structs.ServiceName{
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, uint64(3), idx)
|
|
|
|
|
require.ElementsMatch(t, expect, names)
|
|
|
|
|
|
|
|
|
|
// Register a service WITHOUT our target as an upstream, and the watch should not fire
|
|
|
|
|
api := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "api-proxy",
|
|
|
|
|
Service: "api-proxy",
|
|
|
|
|
Address: "127.0.0.1",
|
|
|
|
|
Port: 443,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{
|
|
|
|
|
DestinationServiceName: "api",
|
|
|
|
|
Upstreams: structs.Upstreams{
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "cache",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "db",
|
|
|
|
|
},
|
|
|
|
|
structs.Upstream{
|
|
|
|
|
DestinationName: "old-admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
EnterpriseMeta: *defaultMeta,
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, s.EnsureService(4, "foo", &api))
|
|
|
|
|
require.False(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
// Update the routing so that api's upstream routes to our target and watches should fire
|
|
|
|
|
defaults := structs.ProxyConfigEntry{
|
|
|
|
|
Kind: structs.ProxyDefaults,
|
|
|
|
|
Name: structs.ProxyConfigGlobal,
|
|
|
|
|
Config: map[string]interface{}{
|
|
|
|
|
"protocol": "http",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, defaults.Normalize())
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(5, &defaults))
|
2020-10-02 00:10:49 +00:00
|
|
|
|
|
|
|
|
|
router := structs.ServiceRouterConfigEntry{
|
|
|
|
|
Kind: structs.ServiceRouter,
|
|
|
|
|
Name: "old-admin",
|
|
|
|
|
Routes: []structs.ServiceRoute{
|
|
|
|
|
{
|
|
|
|
|
Match: &structs.ServiceRouteMatch{
|
|
|
|
|
HTTP: &structs.ServiceRouteHTTPMatch{
|
|
|
|
|
PathExact: "/v2",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
Destination: &structs.ServiceRouteDestination{
|
|
|
|
|
Service: "admin",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.NoError(t, router.Normalize())
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(6, &router))
|
2020-10-02 00:10:49 +00:00
|
|
|
|
|
|
|
|
|
// We updated a relevant config entry
|
|
|
|
|
require.True(t, watchFired(ws))
|
|
|
|
|
|
|
|
|
|
ws = memdb.NewWatchSet()
|
|
|
|
|
tx = s.db.ReadTxn()
|
|
|
|
|
idx, names, err = s.downstreamsForServiceTxn(tx, ws, "dc1", target)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
tx.Abort()
|
|
|
|
|
|
|
|
|
|
expect = []structs.ServiceName{
|
|
|
|
|
// get web from listing admin directly as an upstream
|
|
|
|
|
{Name: "web", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
// get api from old-admin routing to admin and web listing old-admin as an upstream
|
|
|
|
|
{Name: "api", EnterpriseMeta: *defaultMeta},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, uint64(6), idx)
|
|
|
|
|
require.ElementsMatch(t, expect, names)
|
|
|
|
|
}
|
2020-10-08 23:31:54 +00:00
|
|
|
|
|
|
|
|
|
func TestProtocolForIngressGateway(t *testing.T) {
|
|
|
|
|
tt := []struct {
|
|
|
|
|
name string
|
|
|
|
|
idx uint64
|
|
|
|
|
entries []structs.ConfigEntry
|
|
|
|
|
expect string
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
name: "all http like",
|
|
|
|
|
idx: uint64(5),
|
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Name: "h1-svc",
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
},
|
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Name: "h2-svc",
|
|
|
|
|
Protocol: "http2",
|
|
|
|
|
},
|
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Name: "g-svc",
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
},
|
|
|
|
|
&structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: structs.IngressGateway,
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "h1-svc",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "http2",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "h2-svc",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "g-svc",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: "http",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "all tcp",
|
|
|
|
|
idx: uint64(6),
|
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
|
&structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: structs.IngressGateway,
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "zip",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "zop",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "zap",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: "tcp",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "mix of both",
|
|
|
|
|
idx: uint64(7),
|
|
|
|
|
entries: []structs.ConfigEntry{
|
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Name: "h1-svc",
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
},
|
|
|
|
|
&structs.ServiceConfigEntry{
|
|
|
|
|
Kind: structs.ServiceDefaults,
|
|
|
|
|
Name: "g-svc",
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
},
|
|
|
|
|
&structs.IngressGatewayConfigEntry{
|
|
|
|
|
Kind: structs.IngressGateway,
|
|
|
|
|
Name: "ingress",
|
|
|
|
|
Listeners: []structs.IngressListener{
|
|
|
|
|
{
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Protocol: "http",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "h1-svc",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 2222,
|
|
|
|
|
Protocol: "tcp",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "zop",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Port: 3333,
|
|
|
|
|
Protocol: "grpc",
|
|
|
|
|
Services: []structs.IngressService{
|
|
|
|
|
{
|
|
|
|
|
Name: "g-svc",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
expect: "tcp",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, tc := range tt {
|
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
for _, entry := range tc.entries {
|
|
|
|
|
require.NoError(t, entry.Normalize())
|
|
|
|
|
require.NoError(t, entry.Validate())
|
|
|
|
|
|
2021-02-03 23:10:38 +00:00
|
|
|
|
require.NoError(t, s.EnsureConfigEntry(tc.idx, entry))
|
2020-10-08 23:31:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tx := s.db.ReadTxn()
|
|
|
|
|
defer tx.Abort()
|
|
|
|
|
|
|
|
|
|
ws := memdb.NewWatchSet()
|
2021-07-22 18:20:45 +00:00
|
|
|
|
sn := structs.NewServiceName("ingress", structs.DefaultEnterpriseMetaInDefaultPartition())
|
2020-10-08 23:31:54 +00:00
|
|
|
|
|
|
|
|
|
idx, protocol, err := metricsProtocolForIngressGateway(tx, ws, sn)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, tc.idx, idx)
|
|
|
|
|
require.Equal(t, tc.expect, protocol)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-08-17 18:29:39 +00:00
|
|
|
|
|
2021-12-02 00:44:13 +00:00
|
|
|
|
func TestStateStore_EnsureService_ServiceNames(t *testing.T) {
|
|
|
|
|
s := testStateStore(t)
|
|
|
|
|
|
|
|
|
|
// Create the service registration.
|
|
|
|
|
entMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
|
|
|
|
|
|
|
|
|
|
services := []structs.NodeService{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
ID: "ingress-gateway",
|
|
|
|
|
Service: "ingress-gateway",
|
|
|
|
|
Address: "2.2.2.2",
|
|
|
|
|
Port: 2222,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindMeshGateway,
|
|
|
|
|
ID: "mesh-gateway",
|
|
|
|
|
Service: "mesh-gateway",
|
|
|
|
|
Address: "4.4.4.4",
|
|
|
|
|
Port: 4444,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindConnectProxy,
|
|
|
|
|
ID: "connect-proxy",
|
|
|
|
|
Service: "connect-proxy",
|
|
|
|
|
Address: "1.1.1.1",
|
|
|
|
|
Port: 1111,
|
|
|
|
|
Proxy: structs.ConnectProxyConfig{DestinationServiceName: "foo"},
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindTerminatingGateway,
|
|
|
|
|
ID: "terminating-gateway",
|
|
|
|
|
Service: "terminating-gateway",
|
|
|
|
|
Address: "3.3.3.3",
|
|
|
|
|
Port: 3333,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindTypical,
|
|
|
|
|
ID: "web",
|
|
|
|
|
Service: "web",
|
|
|
|
|
Address: "5.5.5.5",
|
|
|
|
|
Port: 5555,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var idx uint64
|
|
|
|
|
testRegisterNode(t, s, idx, "node1")
|
|
|
|
|
|
|
|
|
|
for _, svc := range services {
|
|
|
|
|
idx++
|
|
|
|
|
require.NoError(t, s.EnsureService(idx, "node1", &svc))
|
|
|
|
|
|
|
|
|
|
// Ensure the service name was stored for all of them under the appropriate kind
|
2021-12-02 16:06:39 +00:00
|
|
|
|
gotIdx, gotNames, err := s.ServiceNamesOfKind(nil, svc.Kind)
|
2021-12-02 00:44:13 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, idx, gotIdx)
|
|
|
|
|
require.Len(t, gotNames, 1)
|
|
|
|
|
require.Equal(t, svc.CompoundServiceName(), gotNames[0].Service)
|
|
|
|
|
require.Equal(t, svc.Kind, gotNames[0].Kind)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register another ingress gateway and there should be two names under the kind index
|
|
|
|
|
newIngress := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
ID: "new-ingress-gateway",
|
|
|
|
|
Service: "new-ingress-gateway",
|
|
|
|
|
Address: "6.6.6.6",
|
|
|
|
|
Port: 6666,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
idx++
|
|
|
|
|
require.NoError(t, s.EnsureService(idx, "node1", &newIngress))
|
|
|
|
|
|
2021-12-02 16:06:39 +00:00
|
|
|
|
gotIdx, got, err := s.ServiceNamesOfKind(nil, structs.ServiceKindIngressGateway)
|
2021-12-02 00:44:13 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, idx, gotIdx)
|
|
|
|
|
|
|
|
|
|
expect := []*KindServiceName{
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Service: structs.NewServiceName("ingress-gateway", nil),
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: 1,
|
|
|
|
|
ModifyIndex: 1,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Kind: structs.ServiceKindIngressGateway,
|
|
|
|
|
Service: structs.NewServiceName("new-ingress-gateway", nil),
|
|
|
|
|
RaftIndex: structs.RaftIndex{
|
|
|
|
|
CreateIndex: idx,
|
|
|
|
|
ModifyIndex: idx,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
require.Equal(t, expect, got)
|
|
|
|
|
|
|
|
|
|
// Deregister an ingress gateway and the index should not slide back
|
|
|
|
|
idx++
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(idx, "node1", "new-ingress-gateway", entMeta, ""))
|
2021-12-02 00:44:13 +00:00
|
|
|
|
|
|
|
|
|
gotIdx, got, err = s.ServiceNamesOfKind(nil, structs.ServiceKindIngressGateway)
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, idx, gotIdx)
|
|
|
|
|
require.Equal(t, expect[:1], got)
|
|
|
|
|
|
|
|
|
|
// Registering another instance of a known service should not bump the kind index
|
|
|
|
|
newMGW := structs.NodeService{
|
|
|
|
|
Kind: structs.ServiceKindMeshGateway,
|
|
|
|
|
ID: "mesh-gateway-1",
|
|
|
|
|
Service: "mesh-gateway",
|
|
|
|
|
Address: "7.7.7.7",
|
|
|
|
|
Port: 7777,
|
|
|
|
|
EnterpriseMeta: *entMeta,
|
|
|
|
|
}
|
|
|
|
|
idx++
|
|
|
|
|
require.NoError(t, s.EnsureService(idx, "node1", &newMGW))
|
|
|
|
|
|
2021-12-02 16:06:39 +00:00
|
|
|
|
gotIdx, _, err = s.ServiceNamesOfKind(nil, structs.ServiceKindMeshGateway)
|
2021-12-02 00:44:13 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, uint64(2), gotIdx)
|
|
|
|
|
|
|
|
|
|
// Deregister the single typical service and the service name should also be dropped
|
|
|
|
|
idx++
|
peering: initial sync (#12842)
- Add endpoints related to peering: read, list, generate token, initiate peering
- Update node/service/check table indexing to account for peers
- Foundational changes for pushing service updates to a peer
- Plumb peer name through Health.ServiceNodes path
see: ENT-1765, ENT-1280, ENT-1283, ENT-1283, ENT-1756, ENT-1739, ENT-1750, ENT-1679,
ENT-1709, ENT-1704, ENT-1690, ENT-1689, ENT-1702, ENT-1701, ENT-1683, ENT-1663,
ENT-1650, ENT-1678, ENT-1628, ENT-1658, ENT-1640, ENT-1637, ENT-1597, ENT-1634,
ENT-1613, ENT-1616, ENT-1617, ENT-1591, ENT-1588, ENT-1596, ENT-1572, ENT-1555
Co-authored-by: R.B. Boyer <rb@hashicorp.com>
Co-authored-by: freddygv <freddy@hashicorp.com>
Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Evan Culver <eculver@hashicorp.com>
Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
2022-04-21 22:34:40 +00:00
|
|
|
|
require.NoError(t, s.DeleteService(idx, "node1", "web", entMeta, ""))
|
2021-12-02 00:44:13 +00:00
|
|
|
|
|
2021-12-02 16:06:39 +00:00
|
|
|
|
gotIdx, got, err = s.ServiceNamesOfKind(nil, structs.ServiceKindTypical)
|
2021-12-02 00:44:13 +00:00
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
require.Equal(t, idx, gotIdx)
|
|
|
|
|
require.Empty(t, got)
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 18:29:39 +00:00
|
|
|
|
func assertMaxIndexes(t *testing.T, tx ReadTxn, expect map[string]uint64, skip ...string) {
|
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
|
|
all := dumpMaxIndexes(t, tx)
|
|
|
|
|
|
|
|
|
|
for _, index := range skip {
|
|
|
|
|
if _, ok := all[index]; ok {
|
|
|
|
|
delete(all, index)
|
|
|
|
|
} else {
|
|
|
|
|
t.Logf("index %q isn't even set; probably test assertion isn't relevant anymore", index)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.Equal(t, expect, all)
|
|
|
|
|
|
|
|
|
|
// TODO
|
|
|
|
|
// for _, index := range indexes {
|
|
|
|
|
// require.Equal(t, expectIndex, maxIndexTxn(tx, index),
|
|
|
|
|
// "index %s has the wrong value", index)
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func dumpMaxIndexes(t *testing.T, tx ReadTxn) map[string]uint64 {
|
|
|
|
|
out := make(map[string]uint64)
|
|
|
|
|
|
|
|
|
|
iter, err := tx.Get(tableIndex, "id")
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
for entry := iter.Next(); entry != nil; entry = iter.Next() {
|
|
|
|
|
if idx, ok := entry.(*IndexEntry); ok {
|
|
|
|
|
out[idx.Key] = idx.Value
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return out
|
|
|
|
|
}
|
2021-08-19 21:17:59 +00:00
|
|
|
|
|
|
|
|
|
func generateUUID() ([]byte, string) {
|
|
|
|
|
buf := make([]byte, 16)
|
|
|
|
|
if _, err := crand.Read(buf); err != nil {
|
|
|
|
|
panic(fmt.Errorf("failed to read random bytes: %v", err))
|
|
|
|
|
}
|
|
|
|
|
uuid := fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
|
|
|
|
|
buf[0:4],
|
|
|
|
|
buf[4:6],
|
|
|
|
|
buf[6:8],
|
|
|
|
|
buf[8:10],
|
|
|
|
|
buf[10:16])
|
|
|
|
|
return buf, uuid
|
|
|
|
|
}
|
2022-01-12 20:08:49 +00:00
|
|
|
|
|
|
|
|
|
func setVirtualIPFlags(t *testing.T, s *Store) {
|
|
|
|
|
require.NoError(t, s.SystemMetadataSet(0, &structs.SystemMetadataEntry{
|
|
|
|
|
Key: structs.SystemMetadataVirtualIPsEnabled,
|
|
|
|
|
Value: "true",
|
|
|
|
|
}))
|
|
|
|
|
require.NoError(t, s.SystemMetadataSet(0, &structs.SystemMetadataEntry{
|
|
|
|
|
Key: structs.SystemMetadataTermGatewayVirtualIPsEnabled,
|
|
|
|
|
Value: "true",
|
|
|
|
|
}))
|
|
|
|
|
}
|