Merge pull request #243 from mauromorales/master

Extract fn ConfigFromContext
mudler · Apr 27, 2024 · b0b1f09 · b0b1f09
2 parents cc4e89c + 9e855a2
commit b0b1f09
Showing 1 changed file with 10 additions and 7 deletions.
diff --git 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"
@@ -100,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,
 	},
@@ -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"),
@@ -425,7 +424,7 @@ func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) {
 		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"),
@@ -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 {