Skip to content

Commit c78a2cc

Browse files
committed
[v18] port bound keypair tests to new join service
Backport #59512 to branch/v18
1 parent b55106e commit c78a2cc

File tree

3 files changed

+1471
-0
lines changed

3 files changed

+1471
-0
lines changed

lib/auth/join_bound_keypair_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ func parseJoinState(t *testing.T, state []byte) *boundkeypair.JoinState {
9999
return &doc
100100
}
101101

102+
// TODO(nklaassen): DELETE IN 20 when the legacy join service is removed, this
103+
// test is superceded by lib/join.TestJoinBoundKeypair which exercises the new
104+
// join service.
102105
func TestServer_RegisterUsingBoundKeypairMethod(t *testing.T) {
103106
t.Parallel()
104107

@@ -944,6 +947,9 @@ func testExtractBotParamsFromCerts(t require.TestingT, certs *proto.Certs) (stri
944947
return ident.BotInstanceID, ident.Generation
945948
}
946949

950+
// TODO(nklaassen): DELETE IN 20 when the legacy join service is removed, this
951+
// test is superceded by lib/join.TestJoinBoundKeypair_GenerationCounter which
952+
// exercises the new join service.
947953
func TestServer_RegisterUsingBoundKeypairMethod_GenerationCounter(t *testing.T) {
948954
t.Parallel()
949955

@@ -1148,6 +1154,9 @@ func TestServer_RegisterUsingBoundKeypairMethod_GenerationCounter(t *testing.T)
11481154
}, 5*time.Second, 100*time.Millisecond)
11491155
}
11501156

1157+
// TODO(nklaassen): DELETE IN 20 when the legacy join service is removed, this
1158+
// test is superceded by lib/join.TestJoinBoundKeypair_JoinStateFailure which
1159+
// exercises the new join service.
11511160
func TestServer_RegisterUsingBoundKeypairMethod_JoinStateFailure(t *testing.T) {
11521161
// This tests that join state verification will trigger a lock if the
11531162
// original client and a secondary client both attempt to recover in
@@ -1304,6 +1313,9 @@ func TestServer_RegisterUsingBoundKeypairMethod_JoinStateFailure(t *testing.T) {
13041313
}, 5*time.Second, 100*time.Millisecond)
13051314
}
13061315

1316+
// TODO(nklaassen): DELETE IN 20 when the legacy join service is removed, this
1317+
// test is superceded by lib/join.TestJoinBoundKeypair_JoinStateFailureDuringRenewal
1318+
// which exercises the new join service.
13071319
func TestServer_RegisterUsingBoundKeypairMethod_JoinStateFailureDuringRenewal(t *testing.T) {
13081320
// Similar to _JoinStateFailure above, this exercises the case where the
13091321
// original client still has valid certs and isn't attempting a recovery of

0 commit comments

Comments
 (0)