MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-09 13:39:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

types/authkey: include user object in response (#2542)

Browse Source 
* types/authkey: include user object, not string

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* make preauthkeys use id

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* changelog

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* integration: wire up user id for auth keys

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

---------

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby
2025-04-30 12:45:08 +03:00
committed by GitHub
parent f1206328dc
commit 8f9fbf16f1
23 changed files with 454 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
integration/cli_test.go
View File

@@ -4,6 +4,7 @@ import (
"cmp"
"encoding/json"
"fmt"
"strconv"
"strings"
"testing"
"time"
@@ -271,7 +272,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"create",
"--reusable",
"--expiration",
@@ -297,7 +298,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"list",
"--output",
"json",
@@ -311,8 +312,8 @@ func TestPreAuthKeyCommand(t *testing.T) {
assert.Equal(
t,
[]string{keys[0].GetId(), keys[1].GetId(), keys[2].GetId()},
[]string{
[]uint64{keys[0].GetId(), keys[1].GetId(), keys[2].GetId()},
[]uint64{
listedPreAuthKeys[1].GetId(),
listedPreAuthKeys[2].GetId(),
listedPreAuthKeys[3].GetId(),
@@ -354,7 +355,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"expire",
listedPreAuthKeys[1].GetKey(),
},
@@ -368,7 +369,7 @@ func TestPreAuthKeyCommand(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"list",
"--output",
"json",
@@ -408,7 +409,7 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"create",
"--reusable",
"--output",
@@ -425,7 +426,7 @@ func TestPreAuthKeyCommandWithoutExpiry(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"list",
"--output",
"json",
@@ -470,7 +471,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"create",
"--reusable=true",
"--output",
@@ -487,7 +488,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"create",
"--ephemeral=true",
"--output",
@@ -507,7 +508,7 @@ func TestPreAuthKeyCommandReusableEphemeral(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user,
"1",
"list",
"--output",
"json",
@@ -547,7 +548,7 @@ func TestPreAuthKeyCorrectUserLoggedInCommand(t *testing.T) {
headscale, err := scenario.Headscale()
assertNoErr(t, err)
err = headscale.CreateUser(user2)
u2, err := headscale.CreateUser(user2)
assertNoErr(t, err)
var user2Key v1.PreAuthKey
@@ -558,7 +559,7 @@ func TestPreAuthKeyCorrectUserLoggedInCommand(t *testing.T) {
"headscale",
"preauthkeys",
"--user",
user2,
strconv.FormatUint(u2.GetId(), 10),
"create",
"--reusable",
"--expiration",