status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-18 00:27:04 +00:00
Code Issues Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
freddygv 2022-08-08 08:31:47 -06:00
parent c04515a844
commit 0ea4bfae94
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/consul/fsm/snapshot_oss_test.go
View File

@ -485,9 +485,9 @@ func TestFSM_SnapshotRestore_OSS(t *testing.T) {
}, },
SecretsRequest: &pbpeering.SecretsWriteRequest{ SecretsRequest: &pbpeering.SecretsWriteRequest{
PeerID: "1fabcd52-1d46-49b0-b1d8-71559aee47f5", PeerID: "1fabcd52-1d46-49b0-b1d8-71559aee47f5",
Request: &pbpeering.SecretsWriteRequest_PromotePending{ Request: &pbpeering.SecretsWriteRequest_GenerateToken{
PromotePending: &pbpeering.SecretsWriteRequest_PromotePendingRequest{ GenerateToken: &pbpeering.SecretsWriteRequest_GenerateTokenRequest{
ActiveStreamSecret: "baaeea83-8419-4aa8-ac89-14e7246a3d2f", EstablishmentSecret: "baaeea83-8419-4aa8-ac89-14e7246a3d2f",
}, },
}, },
}, },
@ -503,7 +503,6 @@ func TestFSM_SnapshotRestore_OSS(t *testing.T) {
// Issue two more secrets writes so that there are three secrets associated with the peering: // Issue two more secrets writes so that there are three secrets associated with the peering:
// - Establishment: "389bbcdf-1c31-47d6-ae96-f2a3f4c45f84" // - Establishment: "389bbcdf-1c31-47d6-ae96-f2a3f4c45f84"
// - Pending: "0b7812d4-32d9-4e54-b1b3-4d97084982a0" // - Pending: "0b7812d4-32d9-4e54-b1b3-4d97084982a0"
// - Active: "baaeea83-8419-4aa8-ac89-14e7246a3d2f"
require.NoError(t, fsm.state.PeeringSecretsWrite(34, &pbpeering.SecretsWriteRequest{ require.NoError(t, fsm.state.PeeringSecretsWrite(34, &pbpeering.SecretsWriteRequest{
PeerID: "1fabcd52-1d46-49b0-b1d8-71559aee47f5", PeerID: "1fabcd52-1d46-49b0-b1d8-71559aee47f5",
Request: &pbpeering.SecretsWriteRequest_ExchangeSecret{ Request: &pbpeering.SecretsWriteRequest_ExchangeSecret{
@ -837,12 +836,11 @@ func TestFSM_SnapshotRestore_OSS(t *testing.T) {
}, },
Stream: &pbpeering.PeeringSecrets_Stream{ Stream: &pbpeering.PeeringSecrets_Stream{
PendingSecretID: "0b7812d4-32d9-4e54-b1b3-4d97084982a0", PendingSecretID: "0b7812d4-32d9-4e54-b1b3-4d97084982a0",
ActiveSecretID: "baaeea83-8419-4aa8-ac89-14e7246a3d2f",
}, },
} }
prototest.AssertDeepEqual(t, expectSecrets, secretsRestored) prototest.AssertDeepEqual(t, expectSecrets, secretsRestored)
uuids := []string{"389bbcdf-1c31-47d6-ae96-f2a3f4c45f84", "0b7812d4-32d9-4e54-b1b3-4d97084982a0", "baaeea83-8419-4aa8-ac89-14e7246a3d2f"} uuids := []string{"389bbcdf-1c31-47d6-ae96-f2a3f4c45f84", "0b7812d4-32d9-4e54-b1b3-4d97084982a0"}
for _, id := range uuids { for _, id := range uuids {
free, err := fsm2.state.ValidateProposedPeeringSecretUUID(id) free, err := fsm2.state.ValidateProposedPeeringSecretUUID(id)
require.NoError(t, err) require.NoError(t, err)

2
proto/pbpeering/peering.proto
View File

@ -69,7 +69,7 @@ message SecretsWriteRequest {
// GenerateTokenRequest encodes a request to persist a peering establishment // GenerateTokenRequest encodes a request to persist a peering establishment
// secret. It is triggered by generating a new peering token for a peer cluster. // secret. It is triggered by generating a new peering token for a peer cluster.
message GenerateTokenRequest{ message GenerateTokenRequest {
// establishment_secret is the proposed secret ID to store as the establishment // establishment_secret is the proposed secret ID to store as the establishment
// secret for this peering. // secret for this peering.
string establishment_secret = 1; string establishment_secret = 1;