starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-20 15:51:40 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

integration: update DeleteAuthKey to use ID

Browse Source
This commit is contained in:
Kristoffer Dalby
2026-01-07 13:42:18 +01:00
committed by Kristoffer Dalby
parent 1325fd8b27
commit db6882b5f5
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/auth_key_test.go
View File

@@ -530,7 +530,7 @@ func TestAuthKeyDeleteKey(t *testing.T) {
// DELETE the pre-auth key using the API // DELETE the pre-auth key using the API
t.Logf("Deleting pre-auth key ID %d using API", authKeyID) t.Logf("Deleting pre-auth key ID %d using API", authKeyID)
err = headscale.DeleteAuthKey(userID, authKeyString) err = headscale.DeleteAuthKey(authKeyID)
require.NoError(t, err) require.NoError(t, err)
t.Logf("Successfully deleted auth key") t.Logf("Successfully deleted auth key")

2
integration/control.go
View File

@@ -27,7 +27,7 @@ type ControlServer interface {
CreateAuthKey(user uint64, reusable bool, ephemeral bool) (*v1.PreAuthKey, error) CreateAuthKey(user uint64, reusable bool, ephemeral bool) (*v1.PreAuthKey, error)
CreateAuthKeyWithTags(user uint64, reusable bool, ephemeral bool, tags []string) (*v1.PreAuthKey, error) CreateAuthKeyWithTags(user uint64, reusable bool, ephemeral bool, tags []string) (*v1.PreAuthKey, error)
CreateAuthKeyWithOptions(opts hsic.AuthKeyOptions) (*v1.PreAuthKey, error) CreateAuthKeyWithOptions(opts hsic.AuthKeyOptions) (*v1.PreAuthKey, error)
DeleteAuthKey(user uint64, key string) error DeleteAuthKey(id uint64) error
ListNodes(users ...string) ([]*v1.Node, error) ListNodes(users ...string) ([]*v1.Node, error)
DeleteNode(nodeID uint64) error DeleteNode(nodeID uint64) error
NodesByUser() (map[string][]*v1.Node, error) NodesByUser() (map[string][]*v1.Node, error)

10
integration/hsic/hsic.go
View File

@@ -1162,18 +1162,16 @@ func (t *HeadscaleInContainer) CreateAuthKeyWithTags(
}) })
} }
// DeleteAuthKey deletes an "authorisation key" for a User. // DeleteAuthKey deletes an "authorisation key" by ID.
func (t *HeadscaleInContainer) DeleteAuthKey( func (t *HeadscaleInContainer) DeleteAuthKey(
user uint64, id uint64,
key string,
) error { ) error {
command := []string{ command := []string{
"headscale", "headscale",
"--user",
strconv.FormatUint(user, 10),
"preauthkeys", "preauthkeys",
"delete", "delete",
key, "--id",
strconv.FormatUint(id, 10),
"--output", "--output",
"json", "json",
} }