From 9f6b14ff8540ae40a62131e22876196f7fc1ecd0 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 25 Apr 2024 16:40:23 +0200 Subject: [PATCH 1/2] Extract fn ConfigFromContext This allows it to be consumed by other clients like `kairosctl bridge` without having to duplicate the functionality. Signed-off-by: Mauro Morales --- cmd/util.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/util.go b/cmd/util.go index d9d358e6..409ca23a 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -31,7 +31,6 @@ import ( rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager" "github.com/mudler/edgevpn/internal" "github.com/mudler/edgevpn/pkg/config" - nodeConfig "github.com/mudler/edgevpn/pkg/config" "github.com/multiformats/go-multiaddr" "github.com/mudler/edgevpn/pkg/logger" @@ -391,8 +390,8 @@ func stringsToMultiAddr(peers []string) []multiaddr.Multiaddr { return res } -func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) { - +// ConfigFromContext returns a config object from a cli context +func ConfigFromContext(c *cli.Context) *config.Config { var limitConfig *rcmgr.PartialLimitConfig autorelayInterval, err := time.ParseDuration(c.String("autorelay-discovery-interval")) @@ -405,7 +404,7 @@ func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) { d := map[string]map[string]interface{}{} json.Unmarshal([]byte(pa), &d) - nc := nodeConfig.Config{ + return &config.Config{ NetworkConfig: c.String("config"), NetworkToken: c.String("token"), Address: c.String("address"), @@ -467,6 +466,10 @@ func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) { AuthProviders: d, }, } +} + +func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) { + nc := ConfigFromContext(c) lvl, err := log.LevelFromString(nc.LogLevel) if err != nil { From 9e855a2ec46390e5ab7fcb1735c7b5b4fa8eb8ed Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 25 Apr 2024 16:51:30 +0200 Subject: [PATCH 2/2] Fix typo Signed-off-by: Mauro Morales --- cmd/util.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/util.go b/cmd/util.go index 409ca23a..20ee6152 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -99,8 +99,8 @@ var CommonFlags []cli.Flag = []cli.Flag{ EnvVars: []string{"EDGEVPNAUTORELAYSTATICONLY"}, }, &cli.IntFlag{ - Name: "ledger-syncronization-interval", - Usage: "Ledger syncronization interval time", + Name: "ledger-synchronization-interval", + Usage: "Ledger synchronization interval time", EnvVars: []string{"EDGEVPNLEDGERSYNCINTERVAL"}, Value: 10, }, @@ -424,7 +424,7 @@ func ConfigFromContext(c *cli.Context) *config.Config { Ledger: config.Ledger{ StateDir: c.String("ledger-state"), AnnounceInterval: time.Duration(c.Int("ledger-announce-interval")) * time.Second, - SyncInterval: time.Duration(c.Int("ledger-syncronization-interval")) * time.Second, + SyncInterval: time.Duration(c.Int("ledger-synchronization-interval")) * time.Second, }, NAT: config.NAT{ Service: c.Bool("natservice"),