feat(config): add links and dns settings
- links: short names mapped to host selectors, validated against chains and static host names - dns.suggest / dns.save_link: ask, always or never - dns.domains: domain rules per name pattern (mx* -> easysahre.de) - the wizard edits the dns settings under Resolver & cache and keeps links; setup.SaveTo reports to a chosen writer Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
c408d529a0
commit
5c41a5eb6f
6 files changed
+290
-6
No files matched your search
+112
-4
@@ -3,6 +3,7 @@ package setup
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
@@ -181,6 +182,11 @@ func editResolverCache(cfg *config.Config) error {
|
||||
hostnameDomain := cfg.Resolver.HostnameDomain
|
||||
cacheTTL := strconv.Itoa(cfg.Cache.TTL)
|
||||
cachePath := cfg.Cache.Path
|
||||
dnsSuggest, dnsSaveLink := cfg.DNS.SuggestMode(), cfg.DNS.SaveLinkMode()
|
||||
dnsDomains := formatDNSDomains(cfg.DNS.Domains)
|
||||
modes := func(ask, always, never string) []huh.Option[string] {
|
||||
return []huh.Option[string]{huh.NewOption(ask, config.DNSAsk), huh.NewOption(always, config.DNSAlways), huh.NewOption(never, config.DNSNever)}
|
||||
}
|
||||
err := huh.NewForm(huh.NewGroup(
|
||||
huh.NewInput().
|
||||
Title("Resolver strategies").
|
||||
@@ -214,7 +220,25 @@ func editResolverCache(cfg *config.Config) error {
|
||||
Title("Cache file").
|
||||
Description("Where resolved hosts are stored. Leave empty for the default location.").
|
||||
Value(&cachePath),
|
||||
).Title("Resolver & cache")).Run()
|
||||
).Title("Resolver & cache"), huh.NewGroup(
|
||||
huh.NewSelect[string]().
|
||||
Title("Unknown names: suggest the host behind the DNS address?").
|
||||
Options(modes("ask", "always take the first suggestion (also in scripts)", "never (no DNS lookup)")...).
|
||||
Value(&dnsSuggest),
|
||||
huh.NewSelect[string]().
|
||||
Title("Save a shortcut (link) after a suggestion?").
|
||||
Options(modes("ask", "always", "never")...).
|
||||
Value(&dnsSaveLink),
|
||||
huh.NewText().
|
||||
Title("DNS domains for short names").
|
||||
Description("One rule per line: PATTERN = DOMAIN, e.g.\nmx* = easysahre.de\nah* = jhfduwia.de\nA line with only a domain applies to every name.").
|
||||
Lines(5).
|
||||
Value(&dnsDomains).
|
||||
Validate(func(s string) error {
|
||||
_, err := parseDNSDomains(s)
|
||||
return err
|
||||
}),
|
||||
).Title("DNS names")).Run()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -224,9 +248,49 @@ func editResolverCache(cfg *config.Config) error {
|
||||
cfg.Resolver.HostnameDomain = strings.Trim(strings.TrimSpace(hostnameDomain), ".")
|
||||
cfg.Cache.TTL, _ = strconv.Atoi(cacheTTL)
|
||||
cfg.Cache.Path = strings.TrimSpace(cachePath)
|
||||
cfg.DNS.Domains, _ = parseDNSDomains(dnsDomains)
|
||||
cfg.DNS.Suggest, cfg.DNS.SaveLink = keepDefault(dnsSuggest), keepDefault(dnsSaveLink)
|
||||
return nil
|
||||
}
|
||||
|
||||
// keepDefault stores "ask" as unset, so the config only lists changes.
|
||||
func keepDefault(mode string) string {
|
||||
if mode == config.DNSAsk {
|
||||
return ""
|
||||
}
|
||||
return mode
|
||||
}
|
||||
|
||||
func formatDNSDomains(rules []config.DNSDomain) string {
|
||||
lines := make([]string, 0, len(rules))
|
||||
for _, rule := range rules {
|
||||
if rule.Match == "" {
|
||||
lines = append(lines, rule.Domain)
|
||||
} else {
|
||||
lines = append(lines, rule.Match+" = "+rule.Domain)
|
||||
}
|
||||
}
|
||||
return strings.Join(lines, "\n")
|
||||
}
|
||||
|
||||
// parseDNSDomains reads "PATTERN = DOMAIN" lines; a bare domain matches all names.
|
||||
func parseDNSDomains(text string) ([]config.DNSDomain, error) {
|
||||
var rules []config.DNSDomain
|
||||
for _, line := range strings.Split(text, "\n") {
|
||||
line = strings.TrimSpace(line)
|
||||
if line == "" {
|
||||
continue
|
||||
}
|
||||
rule := config.DNSDomain{Domain: line}
|
||||
if match, domain, ok := strings.Cut(line, "="); ok {
|
||||
rule = config.DNSDomain{Match: strings.TrimSpace(match), Domain: strings.TrimSpace(domain)}
|
||||
}
|
||||
rules = append(rules, rule)
|
||||
}
|
||||
err := (&config.Config{DNS: config.DNSConfig{Domains: rules}}).ValidateDNS()
|
||||
return rules, err
|
||||
}
|
||||
|
||||
func editShortcuts(cfg *config.Config) error {
|
||||
shortcutDomains := strings.Join(cfg.Shortcuts.Domains, ", ")
|
||||
stripHyphens := cfg.Shortcuts.StripHyphens
|
||||
@@ -367,9 +431,15 @@ func validateStrategies(s string) error {
|
||||
func parseStrategies(s string) []string { return splitList(s) }
|
||||
|
||||
// Save validates cfg and writes it to the config file, replacing the old file.
|
||||
func Save(cfg config.Config) error { return save(cfg) }
|
||||
func Save(cfg config.Config) error { return SaveTo(cfg, os.Stdout) }
|
||||
|
||||
func save(cfg config.Config) error {
|
||||
// SaveTo is Save with the confirmation written to w; callers that run
|
||||
// before a connection pass os.Stderr to keep stdout clean.
|
||||
func SaveTo(cfg config.Config, w io.Writer) error { return saveTo(cfg, w) }
|
||||
|
||||
func save(cfg config.Config) error { return saveTo(cfg, os.Stdout) }
|
||||
|
||||
func saveTo(cfg config.Config, w io.Writer) error {
|
||||
if err := config.ValidateCommandAlias(cfg.Shell.Alias); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -385,6 +455,12 @@ func save(cfg config.Config) error {
|
||||
if err := cfg.ValidateHosts(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := cfg.ValidateLinks(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := cfg.ValidateDNS(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := cfg.ValidateOperations(); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -502,6 +578,38 @@ func save(cfg config.Config) error {
|
||||
}
|
||||
}
|
||||
|
||||
if cfg.DNS.Suggest != "" || cfg.DNS.SaveLink != "" || len(cfg.DNS.Domains) > 0 {
|
||||
b.WriteString("\ndns:\n")
|
||||
if cfg.DNS.Suggest != "" {
|
||||
fmt.Fprintf(&b, " suggest: %s\n", cfg.DNS.SuggestMode())
|
||||
}
|
||||
if cfg.DNS.SaveLink != "" {
|
||||
fmt.Fprintf(&b, " save_link: %s\n", cfg.DNS.SaveLinkMode())
|
||||
}
|
||||
if len(cfg.DNS.Domains) > 0 {
|
||||
b.WriteString(" domains:\n")
|
||||
for _, rule := range cfg.DNS.Domains {
|
||||
if rule.Match != "" {
|
||||
fmt.Fprintf(&b, " - match: %q\n domain: %q\n", rule.Match, rule.Domain)
|
||||
} else {
|
||||
fmt.Fprintf(&b, " - domain: %q\n", rule.Domain)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(cfg.Links) > 0 {
|
||||
b.WriteString("\nlinks:\n")
|
||||
names := make([]string, 0, len(cfg.Links))
|
||||
for name := range cfg.Links {
|
||||
names = append(names, name)
|
||||
}
|
||||
sort.Strings(names)
|
||||
for _, name := range names {
|
||||
fmt.Fprintf(&b, " %s: %q\n", strings.ToLower(name), cfg.Links[name])
|
||||
}
|
||||
}
|
||||
|
||||
if len(cfg.Groups) > 0 {
|
||||
b.WriteString("\ngroups:\n")
|
||||
names := make([]string, 0, len(cfg.Groups))
|
||||
@@ -599,7 +707,7 @@ func save(cfg config.Config) error {
|
||||
return fmt.Errorf("writing config: %w", err)
|
||||
}
|
||||
|
||||
fmt.Printf("\nConfig saved → %s\n", path)
|
||||
fmt.Fprintf(w, "\nConfig saved → %s\n", path)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -771,3 +771,29 @@ func TestSaveRoundtripNetBoxInsightSettings(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSDomainsTextAndSave(t *testing.T) {
|
||||
rules, err := parseDNSDomains("mx* = easysahre.de\n\nah* = jhfduwia.de\nfallback.de\n")
|
||||
if err != nil || len(rules) != 3 || rules[0] != (config.DNSDomain{Match: "mx*", Domain: "easysahre.de"}) || rules[2].Match != "" {
|
||||
t.Fatalf("parsed %+v, %v", rules, err)
|
||||
}
|
||||
if formatDNSDomains(rules) != "mx* = easysahre.de\nah* = jhfduwia.de\nfallback.de" {
|
||||
t.Fatalf("format: %q", formatDNSDomains(rules))
|
||||
}
|
||||
if _, err := parseDNSDomains("mx* = "); err == nil {
|
||||
t.Fatal("empty domain accepted")
|
||||
}
|
||||
t.Setenv("XDG_CONFIG_HOME", t.TempDir())
|
||||
cfg := config.Config{NetBox: config.NetBoxConfig{URL: "https://nb.example"}, Resolver: config.ResolverConfig{Strategies: []string{"primary_ip"}},
|
||||
DNS: config.DNSConfig{Suggest: "never", SaveLink: "always", Domains: rules}, Links: map[string]string{"mx123": "prod/web07"}}
|
||||
if err := Save(cfg); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := config.Load()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !reflect.DeepEqual(loaded.DNS, cfg.DNS) || loaded.Links["mx123"] != "prod/web07" {
|
||||
t.Fatalf("lost: %+v %v", loaded.DNS, loaded.Links)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user