feat: hostname resolver strategy and static hosts
Add the hostname resolver strategy. It connects by the NetBox name instead of an IP, with resolver.hostname_domain appended to names without a dot. Its position in the chain decides whether it is always used or only as a fallback (e.g. [primary_ip, hostname]); names that are not valid DNS hostnames fall through to the next strategy. Add static hosts under hosts: for machines that are not in NetBox, with address, user, port, tags, and their own SSH options. They are checked before NetBox (by name or shortcut), never expire, survive cache refresh and clear, and work without any NetBox configured. The cache overlays them after every load and stores only their last use, so they appear in completion, aliases, the TUI and its recent list. SSH options merge global, static host, then rules; rules can match kind: static. Manage them with netssh hosts list|add|remove and in netssh configure, which can now also continue without NetBox. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5821dfbebd
commit
a950a82552
22 files changed
+1024
-49
No files matched your search
Vendored
+62
@@ -4,8 +4,11 @@ import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.zb-server.de/Sebi/ssh-netbox-wrapper/internal/config"
|
||||
)
|
||||
|
||||
func TestNew(t *testing.T) {
|
||||
@@ -495,3 +498,62 @@ func TestSearchMatchesHostnamesAcrossQualifiedSources(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStaticHosts(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "hosts.json")
|
||||
hosts := []config.StaticHost{{Name: "router", Address: "192.168.1.1", Tags: []string{"home"}}, {Name: "nas", Address: "nas.lan"}}
|
||||
c := New(path, 1).WithStatic(hosts)
|
||||
c.Upsert(Entry{Name: "web01", IP: "10.0.0.1", Kind: "device"})
|
||||
if err := c.Load(); err != nil { // no file yet; static hosts stay
|
||||
t.Fatal(err)
|
||||
}
|
||||
if e, fresh := c.Get("router"); !fresh || e.IP != "192.168.1.1" || e.Kind != config.StaticKind || !e.Static {
|
||||
t.Fatalf("static get: %+v %v", e, fresh)
|
||||
}
|
||||
if e, found, err := c.GetStatic("ROUTER", nil); !found || err != nil || e.Name != "router" {
|
||||
t.Fatalf("by name: %+v %v %v", e, found, err)
|
||||
}
|
||||
normalize := func(s string) string { return strings.TrimSuffix(strings.ToLower(s), ".lan") }
|
||||
if e, found, _ := c.GetStatic("nas.lan", normalize); !found || e.Name != "nas" {
|
||||
t.Fatalf("by shortcut: %+v", e)
|
||||
}
|
||||
if _, found, _ := c.GetStatic("web01", normalize); found {
|
||||
t.Fatal("NetBox entry returned as static")
|
||||
}
|
||||
|
||||
// Usage of a static host persists; the host itself stays after Save and Clear.
|
||||
c.MarkUsed("router")
|
||||
if err := c.Save(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, fresh := c.Get("nas"); !fresh {
|
||||
t.Fatal("static host lost after Save")
|
||||
}
|
||||
reloaded := New(path, 1).WithStatic(hosts)
|
||||
if err := reloaded.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if recent := reloaded.RecentlyUsed(5); len(recent) != 1 || recent[0].Name != "router" {
|
||||
t.Fatalf("recent: %+v", recent)
|
||||
}
|
||||
reloaded.Clear()
|
||||
if _, fresh := reloaded.Get("router"); !fresh {
|
||||
t.Fatal("Clear removed a static host")
|
||||
}
|
||||
|
||||
// A host removed from the config disappears, also from the file.
|
||||
removed := New(path, 1).WithStatic(hosts[1:])
|
||||
if err := removed.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if e, _ := removed.Get("router"); e.Name != "" {
|
||||
t.Fatalf("removed static host still present: %+v", e)
|
||||
}
|
||||
if err := removed.Save(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, _ := os.ReadFile(path)
|
||||
if strings.Contains(string(data), "192.168.1.1") {
|
||||
t.Fatalf("removed static host still on disk:\n%s", data)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user