mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-11 21:27:31 +00:00
tailcfg: update node display name fields and methods (#1207)
Signed-off-by: Sonia Appasamy <sonia@tailscale.com> Consolidates the node display name logic from each of the clients into tailcfg.Node. UI clients can use these names directly, rather than computing them independently.
This commit is contained in:
@@ -17,11 +17,3 @@ func HasSuffix(name, suffix string) bool {
|
||||
nameBase := strings.TrimSuffix(name, suffix)
|
||||
return len(nameBase) < len(name) && strings.HasSuffix(nameBase, ".")
|
||||
}
|
||||
|
||||
// ToBaseName removes the domain ending from a DNS name of a node.
|
||||
func ToBaseName(name string) string {
|
||||
if i := strings.Index(name, "."); i != -1 {
|
||||
return name[:i]
|
||||
}
|
||||
return name
|
||||
}
|
||||
|
@@ -26,21 +26,3 @@ func TestHasSuffix(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestToBaseName(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
want string
|
||||
}{
|
||||
{"foo", "foo"},
|
||||
{"foo.com", "foo"},
|
||||
{"foo.example.com.beta.tailscale.net", "foo"},
|
||||
{"computer-a.test.gmail.com.beta.tailscale.net", "computer-a"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
got := ToBaseName(tt.name)
|
||||
if got != tt.want {
|
||||
t.Errorf("ToBaseName(%q) = %q; want %q", tt.name, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user