mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-09-20 21:21:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: use helper function for matching profiles

Browse Source 
This makes the `switch` command use the helper `matchProfile` function
that was introduced in the `remove` sub command.

Signed-off-by: Esteban-Bermudez <esteban@bermudezaguirre.com>
This commit is contained in:
Esteban-Bermudez 2025-06-25 12:15:53 -07:00 committed by Brad Fitzpatrick
parent 5e3e536c2d
commit 1c9aaa444d
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/tailscale/cli/switch.go
View File

@ -122,40 +122,8 @@ func switchProfile(ctx context.Context, args []string) error {
errf("Failed to switch to account: %v\n", err)
os.Exit(1)
}
var profID ipn.ProfileID
// Allow matching by ID, Tailnet, Account, or Display Name
// in that order.
for _, p := range all {
if p.ID == ipn.ProfileID(args[0]) {
profID = p.ID
break
}
}
if profID == "" {
for _, p := range all {
if p.NetworkProfile.DomainName == args[0] {
profID = p.ID
break
}
}
}
if profID == "" {
for _, p := range all {
if p.Name == args[0] {
profID = p.ID
break
}
}
}
if profID == "" {
for _, p := range all {
if p.NetworkProfile.DisplayName == args[0] {
profID = p.ID
break
}
}
}
if profID == "" {
profID, ok := matchProfile(args[0], all)
if !ok {
errf("No profile named %q\n", args[0])
os.Exit(1)
}
@ -229,7 +197,7 @@ func removeProfile(ctx context.Context, args []string) error {
}
func matchProfile(arg string, all []ipn.LoginProfile) (ipn.ProfileID, bool) {
// Allow matching by ID, Tailnet, or Account
// Allow matching by ID, Tailnet, Account, or Display Name
// in that order.
for _, p := range all {
if p.ID == ipn.ProfileID(arg) {
@ -246,5 +214,10 @@ func matchProfile(arg string, all []ipn.LoginProfile) (ipn.ProfileID, bool) {
return p.ID, true
}
}
for _, p := range all {
if p.NetworkProfile.DisplayName == arg {
return p.ID, true
}
}
return "", false
}