more

cmd/headscale/cli/api_key.go

@@ -40,13 +40,13 @@ func init() {
 
 var apiKeysCmd = &cobra.Command{
 	Use:     "apikeys",
-	Short:   "Handle the Api keys in Headscale",
+	Short:   "Handle the API keys in Headscale",
 	Aliases: []string{"apikey", "api"},
 }
 
 var listAPIKeys = &cobra.Command{
 	Use:     "list",
-	Short:   "List the Api keys for headscale",
+	Short:   "List the API keys for Headscale",
 	Aliases: []string{"ls", "show"},
 	Run: func(cmd *cobra.Command, args []string) {
 		output := GetOutputFlag(cmd)
@@ -107,7 +107,7 @@ var listAPIKeys = &cobra.Command{
 
 var createAPIKeyCmd = &cobra.Command{
 	Use:   "create",
-	Short: "Creates a new Api key",
+	Short: "Create a new API key",
 	Long: `
 Creates a new Api key, the Api key is only visible on creation
 and cannot be retrieved again.
@@ -157,7 +157,7 @@ If you loose a key, create a new one and revoke (expire) the old one.`,
 
 var expireAPIKeyCmd = &cobra.Command{
 	Use:     "expire",
-	Short:   "Expire an ApiKey",
+	Short:   "Expire an API key",
 	Aliases: []string{"revoke", "exp", "e"},
 	Run: func(cmd *cobra.Command, args []string) {
 		output := GetOutputFlag(cmd)
@@ -194,7 +194,7 @@ var expireAPIKeyCmd = &cobra.Command{
 
 var deleteAPIKeyCmd = &cobra.Command{
 	Use:     "delete",
-	Short:   "Delete an ApiKey",
+	Short:   "Delete an API key",
 	Aliases: []string{"remove", "del"},
 	Run: func(cmd *cobra.Command, args []string) {
 		output := GetOutputFlag(cmd)

cmd/headscale/cli/configtest.go

@@ -11,8 +11,8 @@ func init() {
 
 var configTestCmd = &cobra.Command{
 	Use:   "configtest",
-	Short: "Test the configuration.",
-	Long:  "Run a test of the configuration and exit.",
+	Short: "Test the configuration",
+	Long:  "Run a test of the configuration and exit",
 	Run: func(cmd *cobra.Command, args []string) {
 		_, err := newHeadscaleServerWithConfig()
 		if err != nil {

cmd/headscale/cli/dump_config.go

@@ -12,9 +12,10 @@ func init() {
 }
 
 var dumpConfigCmd = &cobra.Command{
-	Use:    "dumpConfig",
-	Short:  "dump current config to /etc/headscale/config.dump.yaml, integration test only",
-	Hidden: true,
+	Use:     "dump-config",
+	Short:   "Dump current config to /etc/headscale/config.dump.yaml, integration test only",
+	Aliases: []string{"dumpConfig"},
+	Hidden:  true,
 	Args: func(cmd *cobra.Command, args []string) error {
 		return nil
 	},

cmd/headscale/cli/nodes.go

@@ -22,17 +22,28 @@ import (
 
 func init() {
 	rootCmd.AddCommand(nodeCmd)
+	// User filtering
 	listNodesCmd.Flags().StringP("user", "u", "", "Filter by user")
+	// Node filtering
+	listNodesCmd.Flags().StringP("node", "", "", "Filter by node (ID, name, hostname, or IP)")
+	listNodesCmd.Flags().Uint64P("id", "", 0, "Filter by node ID")
+	listNodesCmd.Flags().StringP("name", "", "", "Filter by node hostname")
+	listNodesCmd.Flags().StringP("ip", "", "", "Filter by node IP address")
+	// Display options
 	listNodesCmd.Flags().BoolP("tags", "t", false, "Show tags")
 	listNodesCmd.Flags().String("columns", "", "Comma-separated list of columns to display")
-
+	// Backward compatibility
 	listNodesCmd.Flags().StringP("namespace", "n", "", "User")
 	listNodesNamespaceFlag := listNodesCmd.Flags().Lookup("namespace")
 	listNodesNamespaceFlag.Deprecated = deprecateNamespaceMessage
 	listNodesNamespaceFlag.Hidden = true
 	nodeCmd.AddCommand(listNodesCmd)
 
-	listNodeRoutesCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
+	listNodeRoutesCmd.Flags().StringP("node", "n", "", "Node identifier (ID, name, hostname, or IP)")
+	listNodeRoutesCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID) - deprecated, use --node")
+	identifierFlag := listNodeRoutesCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --node"
+	identifierFlag.Hidden = true
 	nodeCmd.AddCommand(listNodeRoutesCmd)
 
 	registerNodeCmd.Flags().StringP("user", "u", "", "User")
@@ -53,30 +64,42 @@ func init() {
 	}
 	nodeCmd.AddCommand(registerNodeCmd)
 
-	expireNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
-	err = expireNodeCmd.MarkFlagRequired("identifier")
+	expireNodeCmd.Flags().StringP("node", "n", "", "Node identifier (ID, name, hostname, or IP)")
+	expireNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID) - deprecated, use --node")
+	identifierFlag = expireNodeCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --node"
+	identifierFlag.Hidden = true
 	if err != nil {
 		log.Fatal(err.Error())
 	}
 	nodeCmd.AddCommand(expireNodeCmd)
 
-	renameNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
-	err = renameNodeCmd.MarkFlagRequired("identifier")
+	renameNodeCmd.Flags().StringP("node", "n", "", "Node identifier (ID, name, hostname, or IP)")
+	renameNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID) - deprecated, use --node")
+	identifierFlag = renameNodeCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --node"
+	identifierFlag.Hidden = true
 	if err != nil {
 		log.Fatal(err.Error())
 	}
 	nodeCmd.AddCommand(renameNodeCmd)
 
-	deleteNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
-	err = deleteNodeCmd.MarkFlagRequired("identifier")
+	deleteNodeCmd.Flags().StringP("node", "n", "", "Node identifier (ID, name, hostname, or IP)")
+	deleteNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID) - deprecated, use --node")
+	identifierFlag = deleteNodeCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --node"
+	identifierFlag.Hidden = true
 	if err != nil {
 		log.Fatal(err.Error())
 	}
 	nodeCmd.AddCommand(deleteNodeCmd)
 
-	moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID)")
+	moveNodeCmd.Flags().StringP("node", "n", "", "Node identifier (ID, name, hostname, or IP)")
+	moveNodeCmd.Flags().Uint64P("identifier", "i", 0, "Node identifier (ID) - deprecated, use --node")
+	identifierFlag = moveNodeCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --node"
+	identifierFlag.Hidden = true
 
-	err = moveNodeCmd.MarkFlagRequired("identifier")
 	if err != nil {
 		log.Fatal(err.Error())
 	}
@@ -170,19 +193,43 @@ var listNodesCmd = &cobra.Command{
 	Short:   "List nodes",
 	Aliases: []string{"ls", "show"},
 	Run: func(cmd *cobra.Command, args []string) {
-		output, _ := cmd.Flags().GetString("output")
-		user, err := cmd.Flags().GetString("user")
-		if err != nil {
-			ErrorOutput(err, fmt.Sprintf("Error getting user: %s", err), output)
-		}
+		output := GetOutputFlag(cmd)
 		showTags, err := cmd.Flags().GetBool("tags")
 		if err != nil {
 			ErrorOutput(err, fmt.Sprintf("Error getting tags flag: %s", err), output)
+			return
 		}
 
 		err = WithClient(func(ctx context.Context, client v1.HeadscaleServiceClient) error {
-			request := &v1.ListNodesRequest{
-				User: user,
+			request := &v1.ListNodesRequest{}
+			
+			// Handle user filtering (existing functionality)
+			if user, _ := cmd.Flags().GetString("user"); user != "" {
+				request.User = user
+			}
+			if namespace, _ := cmd.Flags().GetString("namespace"); namespace != "" {
+				request.User = namespace // backward compatibility
+			}
+			
+			// Handle node filtering (new functionality)
+			if nodeFlag, _ := cmd.Flags().GetString("node"); nodeFlag != "" {
+				// Use smart lookup to determine filter type
+				if id, err := strconv.ParseUint(nodeFlag, 10, 64); err == nil && id > 0 {
+					request.Id = id
+				} else if isIPAddress(nodeFlag) {
+					request.IpAddresses = []string{nodeFlag}
+				} else {
+					request.Name = nodeFlag
+				}
+			} else {
+				// Check specific filter flags
+				if id, _ := cmd.Flags().GetUint64("id"); id > 0 {
+					request.Id = id
+				} else if name, _ := cmd.Flags().GetString("name"); name != "" {
+					request.Name = name
+				} else if ip, _ := cmd.Flags().GetString("ip"); ip != "" {
+					request.IpAddresses = []string{ip}
+				}
 			}
 
 			response, err := client.ListNodes(ctx, request)
@@ -200,7 +247,9 @@ var listNodesCmd = &cobra.Command{
 				return nil
 			}
 
-			tableData, err := nodesToPtables(user, showTags, response.GetNodes())
+			// Get user for table display (if filtering by user)
+			userFilter := request.User
+			tableData, err := nodesToPtables(userFilter, showTags, response.GetNodes())
 			if err != nil {
 				ErrorOutput(err, fmt.Sprintf("Error converting to table: %s", err), output)
 				return err
@@ -231,11 +280,11 @@ var listNodeRoutesCmd = &cobra.Command{
 	Aliases: []string{"lsr", "routes"},
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -305,11 +354,11 @@ var expireNodeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
 
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -349,11 +398,11 @@ var renameNodeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
 
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -400,11 +449,11 @@ var deleteNodeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
 
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -491,11 +540,11 @@ var moveNodeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
 
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -552,8 +601,9 @@ var moveNodeCmd = &cobra.Command{
 }
 
 var backfillNodeIPsCmd = &cobra.Command{
-	Use:   "backfillips",
-	Short: "Backfill IPs missing from nodes",
+	Use:     "backfill-ips",
+	Short:   "Backfill IPs missing from nodes",
+	Aliases: []string{"backfillips"},
 	Long: `
 Backfill IPs can be used to add/remove IPs from nodes
 based on the current configuration of Headscale.
@@ -782,11 +832,11 @@ var tagCmd = &cobra.Command{
 		output, _ := cmd.Flags().GetString("output")
 		
 		// retrieve flags from CLI
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return
@@ -840,11 +890,11 @@ var approveRoutesCmd = &cobra.Command{
 		output, _ := cmd.Flags().GetString("output")
 		
 		// retrieve flags from CLI
-		identifier, err := cmd.Flags().GetUint64("identifier")
+		identifier, err := GetNodeIdentifier(cmd)
 		if err != nil {
 			ErrorOutput(
 				err,
-				fmt.Sprintf("Error converting ID to integer: %s", err),
+				fmt.Sprintf("Error getting node identifier: %s", err),
 				output,
 			)
 			return

cmd/headscale/cli/users.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"strconv"
+	"strings"
 
 	survey "github.com/AlecAivazis/survey/v2"
 	v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
@@ -16,25 +17,27 @@ import (
 )
 
 func usernameAndIDFlag(cmd *cobra.Command) {
-	cmd.Flags().Int64P("identifier", "i", -1, "User identifier (ID)")
+	cmd.Flags().StringP("user", "u", "", "User identifier (ID, name, or email)")
+	cmd.Flags().Uint64P("identifier", "i", 0, "User identifier (ID) - deprecated, use --user")
+	identifierFlag := cmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --user"
+	identifierFlag.Hidden = true
 	cmd.Flags().StringP("name", "n", "", "Username")
 }
 
-// usernameAndIDFromFlag returns the username and ID from the flags of the command.
-// If both are empty, it will exit the program with an error.
+// usernameAndIDFromFlag returns the user ID using smart lookup.
+// If no user is specified, it will exit the program with an error.
 func usernameAndIDFromFlag(cmd *cobra.Command) (uint64, string) {
-	username, _ := cmd.Flags().GetString("name")
-	identifier, _ := cmd.Flags().GetInt64("identifier")
-	if username == "" && identifier < 0 {
-		err := errors.New("--name or --identifier flag is required")
+	userID, err := GetUserIdentifier(cmd)
+	if err != nil {
 		ErrorOutput(
 			err,
-			"Cannot rename user: "+status.Convert(err).Message(),
-			"",
+			"Cannot identify user: "+err.Error(),
+			GetOutputFlag(cmd),
 		)
 	}
 
-	return uint64(identifier), username
+	return userID, ""
 }
 
 func init() {
@@ -44,8 +47,16 @@ func init() {
 	createUserCmd.Flags().StringP("email", "e", "", "Email")
 	createUserCmd.Flags().StringP("picture-url", "p", "", "Profile picture URL")
 	userCmd.AddCommand(listUsersCmd)
-	usernameAndIDFlag(listUsersCmd)
-	listUsersCmd.Flags().StringP("email", "e", "", "Email")
+	// Smart lookup filters - can be used individually or combined
+	listUsersCmd.Flags().StringP("user", "u", "", "Filter by user (ID, name, or email)")
+	listUsersCmd.Flags().Uint64P("id", "", 0, "Filter by user ID")
+	listUsersCmd.Flags().StringP("name", "n", "", "Filter by username")
+	listUsersCmd.Flags().StringP("email", "e", "", "Filter by email address")
+	// Backward compatibility (deprecated)
+	listUsersCmd.Flags().Uint64P("identifier", "i", 0, "Filter by user ID - deprecated, use --id")
+	identifierFlag := listUsersCmd.Flags().Lookup("identifier")
+	identifierFlag.Deprecated = "use --id"
+	identifierFlag.Hidden = true
 	listUsersCmd.Flags().String("columns", "", "Comma-separated list of columns to display (ID,Name,Username,Email,Created)")
 	userCmd.AddCommand(destroyUserCmd)
 	usernameAndIDFlag(destroyUserCmd)
@@ -221,18 +232,28 @@ var listUsersCmd = &cobra.Command{
 		err := WithClient(func(ctx context.Context, client v1.HeadscaleServiceClient) error {
 			request := &v1.ListUsersRequest{}
 
-			id, _ := cmd.Flags().GetInt64("identifier")
-			username, _ := cmd.Flags().GetString("name")
-			email, _ := cmd.Flags().GetString("email")
-
-			// filter by one param at most
-			switch {
-			case id > 0:
-				request.Id = uint64(id)
-			case username != "":
-				request.Name = username
-			case email != "":
-				request.Email = email
+			// Check for smart lookup flag first
+			userFlag, _ := cmd.Flags().GetString("user")
+			if userFlag != "" {
+				// Use smart lookup to determine filter type
+				if id, err := strconv.ParseUint(userFlag, 10, 64); err == nil && id > 0 {
+					request.Id = id
+				} else if strings.Contains(userFlag, "@") {
+					request.Email = userFlag
+				} else {
+					request.Name = userFlag
+				}
+			} else {
+				// Check specific filter flags
+				if id, _ := cmd.Flags().GetUint64("id"); id > 0 {
+					request.Id = id
+				} else if identifier, _ := cmd.Flags().GetUint64("identifier"); identifier > 0 {
+					request.Id = identifier // backward compatibility
+				} else if name, _ := cmd.Flags().GetString("name"); name != "" {
+					request.Name = name
+				} else if email, _ := cmd.Flags().GetString("email"); email != "" {
+					request.Email = email
+				}
 			}
 
 			response, err := client.ListUsers(ctx, request)

cmd/headscale/cli/utils.go

@@ -5,7 +5,10 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
+	"net"
 	"os"
+	"strconv"
+	"strings"
 
 	v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
 	"github.com/juanfont/headscale/hscontrol"
@@ -206,3 +209,156 @@ func GetOutputFlag(cmd *cobra.Command) string {
 	output, _ := cmd.Flags().GetString("output")
 	return output
 }
+
+// GetNodeIdentifier returns the node ID using smart lookup via gRPC ListNodes call
+func GetNodeIdentifier(cmd *cobra.Command) (uint64, error) {
+	nodeFlag, _ := cmd.Flags().GetString("node")
+	identifierFlag, _ := cmd.Flags().GetUint64("identifier")
+	
+	// Check if --identifier (deprecated) was used
+	if identifierFlag > 0 {
+		return identifierFlag, nil
+	}
+	
+	// Use --node flag
+	if nodeFlag == "" {
+		return 0, fmt.Errorf("--node flag is required")
+	}
+	
+	// Use smart lookup via gRPC
+	return lookupNodeBySpecifier(nodeFlag)
+}
+
+// lookupNodeBySpecifier performs smart lookup of a node by ID, name, hostname, or IP
+func lookupNodeBySpecifier(specifier string) (uint64, error) {
+	var nodeID uint64
+	
+	err := WithClient(func(ctx context.Context, client v1.HeadscaleServiceClient) error {
+		request := &v1.ListNodesRequest{}
+		
+		// Detect what type of specifier this is and set appropriate filter
+		if id, err := strconv.ParseUint(specifier, 10, 64); err == nil && id > 0 {
+			// Looks like a numeric ID
+			request.Id = id
+		} else if isIPAddress(specifier) {
+			// Looks like an IP address
+			request.IpAddresses = []string{specifier}
+		} else {
+			// Treat as hostname/name
+			request.Name = specifier
+		}
+		
+		response, err := client.ListNodes(ctx, request)
+		if err != nil {
+			return fmt.Errorf("failed to lookup node: %w", err)
+		}
+		
+		nodes := response.GetNodes()
+		if len(nodes) == 0 {
+			return fmt.Errorf("no node found matching '%s'", specifier)
+		}
+		
+		if len(nodes) > 1 {
+			var nodeInfo []string
+			for _, node := range nodes {
+				nodeInfo = append(nodeInfo, fmt.Sprintf("ID=%d name=%s", node.GetId(), node.GetName()))
+			}
+			return fmt.Errorf("multiple nodes found matching '%s': %s", specifier, strings.Join(nodeInfo, ", "))
+		}
+		
+		// Exactly one match - this is what we want
+		nodeID = nodes[0].GetId()
+		return nil
+	})
+	
+	if err != nil {
+		return 0, err
+	}
+	
+	return nodeID, nil
+}
+
+// isIPAddress checks if a string looks like an IP address
+func isIPAddress(s string) bool {
+	// Try parsing as IP address (both IPv4 and IPv6)
+	if net.ParseIP(s) != nil {
+		return true
+	}
+	// Try parsing as CIDR
+	if _, _, err := net.ParseCIDR(s); err == nil {
+		return true
+	}
+	return false
+}
+
+// GetUserIdentifier returns the user ID using smart lookup via gRPC ListUsers call
+func GetUserIdentifier(cmd *cobra.Command) (uint64, error) {
+	userFlag, _ := cmd.Flags().GetString("user")
+	nameFlag, _ := cmd.Flags().GetString("name")
+	identifierFlag, _ := cmd.Flags().GetUint64("identifier")
+	
+	var specifier string
+	
+	// Determine which flag was used (prefer --user, fall back to legacy flags)
+	if userFlag != "" {
+		specifier = userFlag
+	} else if nameFlag != "" {
+		specifier = nameFlag
+	} else if identifierFlag > 0 {
+		return identifierFlag, nil // Direct ID, no lookup needed
+	} else {
+		return 0, fmt.Errorf("--user flag is required")
+	}
+	
+	// Use smart lookup via gRPC
+	return lookupUserBySpecifier(specifier)
+}
+
+// lookupUserBySpecifier performs smart lookup of a user by ID, name, or email
+func lookupUserBySpecifier(specifier string) (uint64, error) {
+	var userID uint64
+	
+	err := WithClient(func(ctx context.Context, client v1.HeadscaleServiceClient) error {
+		request := &v1.ListUsersRequest{}
+		
+		// Detect what type of specifier this is and set appropriate filter
+		if id, err := strconv.ParseUint(specifier, 10, 64); err == nil && id > 0 {
+			// Looks like a numeric ID
+			request.Id = id
+		} else if strings.Contains(specifier, "@") {
+			// Looks like an email address
+			request.Email = specifier
+		} else {
+			// Treat as username
+			request.Name = specifier
+		}
+		
+		response, err := client.ListUsers(ctx, request)
+		if err != nil {
+			return fmt.Errorf("failed to lookup user: %w", err)
+		}
+		
+		users := response.GetUsers()
+		if len(users) == 0 {
+			return fmt.Errorf("no user found matching '%s'", specifier)
+		}
+		
+		if len(users) > 1 {
+			var userInfo []string
+			for _, user := range users {
+				userInfo = append(userInfo, fmt.Sprintf("ID=%d name=%s email=%s", user.GetId(), user.GetName(), user.GetEmail()))
+			}
+			return fmt.Errorf("multiple users found matching '%s': %s", specifier, strings.Join(userInfo, ", "))
+		}
+		
+		// Exactly one match - this is what we want
+		userID = users[0].GetId()
+		return nil
+	})
+	
+	if err != nil {
+		return 0, err
+	}
+	
+	return userID, nil
+}

cmd/headscale/cli/version.go

@@ -11,8 +11,8 @@ func init() {
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Print the version.",
-	Long:  "The version of headscale.",
+	Short: "Print the version",
+	Long:  "The version of headscale",
 	Run: func(cmd *cobra.Command, args []string) {
 		output, _ := cmd.Flags().GetString("output")
 		SuccessOutput(map[string]string{