From 715c5a4a1c7fd5a1fbabe51750b10ee7de60552f Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 28 Sep 2026 13:34:18 +0000 Subject: [PATCH] cli: split the user lookup out of resolveSingleUser Lets commands with their own flags resolve a user the same way. --- cmd/headscale/cli/users.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/headscale/cli/users.go b/cmd/headscale/cli/users.go index 5aef4b71..203f129c 100644 --- a/cmd/headscale/cli/users.go +++ b/cmd/headscale/cli/users.go @@ -64,6 +64,17 @@ func resolveSingleUser( return "", nil, err } + return lookupUser(ctx, client, id, username) +} + +// lookupUser resolves exactly one user by ID and/or name (0 and "" are unset), +// returning the identifier of the matched user and the user itself. +func lookupUser( + ctx context.Context, + client *clientv1.ClientWithResponses, + id uint64, + username string, +) (string, *clientv1.User, error) { params := &clientv1.ListUsersParams{} if username != "" { params.Name = &username