Mirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-01-22 18:18:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

integration: update CLI tests for ID-based preauthkey commands

Browse source 
Remove --user flag from list commands.
Change expire command to use --id flag instead of --user and key.
This commit is contained in:
Kristoffer Dalby 2026-01-07 13:45:00 +01:00 • committed by Kristoffer Dalby
parent db6882b5f5
commit 4dd1b49a35
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
integration/auth_key_test.go
View file

@ -446,10 +446,9 @@ func TestAuthKeyLogoutAndReloginSameUserExpiredKey(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
strconv.FormatUint(userMap[userName].GetId(), 10),
"expire",
key.GetKey(),
"--id",
strconv.FormatUint(key.GetId(), 10),
})
require.NoError(t, err)
require.NoError(t, err)

17
integration/cli_test.go
View file

@ -313,8 +313,6 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"1",
"list",
"--output",
"json",
@ -371,15 +369,14 @@ func TestPreAuthKeyCommand(t *testing.T) {
)
}
// Test key expiry - use the full key from creation, not the masked one from listing
// Test key expiry
_, err = headscale.Execute(
[]string{
"headscale",
"preauthkeys",
"--user",
"1",
"expire",
keys[0].GetKey(),
"--id",
strconv.FormatUint(keys[0].GetId(), 10),
},
)
require.NoError(t, err)
@ -391,8 +388,6 @@ func TestPreAuthKeyCommand(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"1",
"list",
"--output",
"json",
@ -451,8 +446,6 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"1",
"list",
"--output",
"json",
@ -460,7 +453,7 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
&listedPreAuthKeys,
)
assert.NoError(c, err)
}, 10*time.Second, 200*time.Millisecond, "Waiting for preauth keys list without expiry")
}, 10*time.Second, 200*time.Millisecond, "Waiting for preauth keys list")
// There is one key created by "scenario.CreateHeadscaleEnv"
assert.Len(t, listedPreAuthKeys, 2)
@ -538,8 +531,6 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
[]string{
"headscale",
"preauthkeys",
"--user",
"1",
"list",
"--output",
"json",