From 6e46d23b453588b7c17426166894abe4481ca29d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 28 Aug 2023 15:48:38 +0000 Subject: [PATCH] jpictl: only load Machine.PublicAddresses for `jpictl dump` Signed-off-by: Alejandro Mery --- cmd/jpictl/config.go | 6 ++++-- cmd/jpictl/dump.go | 2 +- cmd/jpictl/env.go | 2 +- cmd/jpictl/write.go | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/jpictl/config.go b/cmd/jpictl/config.go index a649b53..ec20b7e 100644 --- a/cmd/jpictl/config.go +++ b/cmd/jpictl/config.go @@ -14,6 +14,8 @@ var cfg = &Config{ } // LoadZones loads all zones and machines in the config directory -func (cfg *Config) LoadZones() (*zones.Zones, error) { - return zones.New(cfg.Base, cfg.Domain) +func (cfg *Config) LoadZones(resolve bool) (*zones.Zones, error) { + return zones.New(cfg.Base, cfg.Domain, + zones.ResolvePublicAddresses(resolve), + ) } diff --git a/cmd/jpictl/dump.go b/cmd/jpictl/dump.go index eae0801..fb892ba 100644 --- a/cmd/jpictl/dump.go +++ b/cmd/jpictl/dump.go @@ -58,7 +58,7 @@ var dumpCmd = &cobra.Command{ var buf bytes.Buffer var enc Encoder - m, err := cfg.LoadZones() + m, err := cfg.LoadZones(true) if err != nil { return err } diff --git a/cmd/jpictl/env.go b/cmd/jpictl/env.go index 659862a..a968725 100644 --- a/cmd/jpictl/env.go +++ b/cmd/jpictl/env.go @@ -11,7 +11,7 @@ var envCmd = &cobra.Command{ Use: "env", Short: "generates environment variables for shell scripts", RunE: func(_ *cobra.Command, _ []string) error { - m, err := cfg.LoadZones() + m, err := cfg.LoadZones(false) if err != nil { return err } diff --git a/cmd/jpictl/write.go b/cmd/jpictl/write.go index 93fffb7..acb79c2 100644 --- a/cmd/jpictl/write.go +++ b/cmd/jpictl/write.go @@ -9,7 +9,7 @@ var writeCmd = &cobra.Command{ Use: "write", Short: "rewrites all config files", RunE: func(_ *cobra.Command, _ []string) error { - m, err := cfg.LoadZones() + m, err := cfg.LoadZones(false) if err != nil { return err }