config: flags configurable via config file

Author: DSpeichert

cmd/root.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/DSpeichert/netbootd/config"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	"os"
 )
 
@@ -17,8 +18,11 @@ var (
 
 func init() {
 	cobra.OnInitialize(config.InitConfig)
-	rootCmd.Flags().BoolVarP(&debug, "debug", "d", false, "enable debug logging")
-	rootCmd.Flags().BoolVar(&trace, "trace", false, "enable trace logging")
+	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "enable debug logging")
+	viper.BindPFlag("debug", rootCmd.Flags().Lookup("debug"))
+
+	rootCmd.PersistentFlags().BoolVar(&trace, "trace", false, "enable trace logging")
+	viper.BindPFlag("trace", rootCmd.Flags().Lookup("trace"))
 }
 
 var rootCmd = &cobra.Command{

cmd/server.go

@@ -28,25 +28,36 @@ var (
 
 func init() {
 	serverCmd.Flags().StringVarP(&addr, "address", "a", "", "IP address to listen on (DHCP, TFTP, HTTP)")
+	viper.BindPFlag("address", serverCmd.Flags().Lookup("address"))
+
 	serverCmd.Flags().IntVarP(&httpPort, "http-port", "p", 8080, "HTTP port to listen on")
+	viper.BindPFlag("http.port", serverCmd.Flags().Lookup("http-port"))
+
 	serverCmd.Flags().IntVarP(&apiPort, "api-port", "r", 8081, "HTTP API port to listen on")
+	viper.BindPFlag("api.port", serverCmd.Flags().Lookup("api-port"))
+
 	serverCmd.Flags().StringVar(&apiTlsCert, "api-tls-cert", "", "Path to TLS certificate API")
+	viper.BindPFlag("api.TLSCertificatePath", serverCmd.Flags().Lookup("api-tls-cert"))
+
 	serverCmd.Flags().StringVar(&apiTlsKey, "api-tls-key", "", "Path to TLS certificate for API")
+	viper.BindPFlag("api.TLSPrivateKeyPath", serverCmd.Flags().Lookup("api-tls-key"))
+
 	serverCmd.Flags().StringVarP(&ifname, "interface", "i", "", "interface to listen on, e.g. eth0 (DHCP)")
+	viper.BindPFlag("interface", serverCmd.Flags().Lookup("interface"))
+
 	serverCmd.Flags().StringVarP(&manifestPath, "manifests", "m", "", "load manifests from directory")
+	viper.BindPFlag("manifestPath", serverCmd.Flags().Lookup("manifests"))
 
-	viper.BindPFlag("api.TLSCertificatePath", serverCmd.Flags().Lookup("api-tls-cert"))
-	viper.BindPFlag("api.TLSPrivateKeyPath", serverCmd.Flags().Lookup("api-tls-key"))
 	rootCmd.AddCommand(serverCmd)
 }
 
 var serverCmd = &cobra.Command{
 	Use: "server",
 	Run: func(cmd *cobra.Command, args []string) {
 		// configure logging
-		if trace {
+		if viper.GetBool("trace") {
 			zerolog.SetGlobalLevel(zerolog.TraceLevel)
-		} else if debug {
+		} else if viper.GetBool("debug") {
 			zerolog.SetGlobalLevel(zerolog.DebugLevel)
 		} else {
 			zerolog.SetGlobalLevel(zerolog.InfoLevel)
@@ -57,14 +68,14 @@ var serverCmd = &cobra.Command{
 			// TODO: config
 			PersistenceDirectory: "",
 		})
-		if manifestPath != "" {
-			log.Info().Str("path", manifestPath).Msg("Loading manifests")
-			_ = store.LoadFromDirectory(manifestPath)
+		if viper.GetString("manifestPath") != "" {
+			log.Info().Str("path", viper.GetString("manifestPath")).Msg("Loading manifests")
+			_ = store.LoadFromDirectory(viper.GetString("manifestPath"))
 		}
-		store.GlobalHints.HttpPort = httpPort
+		store.GlobalHints.HttpPort = viper.GetInt("http.port")
 
 		// DHCP
-		dhcpServer, err := dhcpd.NewServer(addr, ifname, store)
+		dhcpServer, err := dhcpd.NewServer(viper.GetString("address"), viper.GetString("interface"), store)
 		if err != nil {
 			log.Fatal().Err(err)
 		}
@@ -76,7 +87,7 @@ var serverCmd = &cobra.Command{
 			log.Fatal().Err(err)
 		}
 		connTftp, err := net.ListenUDP("udp", &net.UDPAddr{
-			IP:   net.ParseIP(addr),
+			IP:   net.ParseIP(viper.GetString("address")),
 			Port: 69, // TFTP
 		})
 		if err != nil {
@@ -90,8 +101,8 @@ var serverCmd = &cobra.Command{
 			log.Fatal().Err(err)
 		}
 		connHttp, err := net.ListenTCP("tcp", &net.TCPAddr{
-			IP:   net.ParseIP(addr),
-			Port: httpPort, // HTTP
+			IP:   net.ParseIP(viper.GetString("address")),
+			Port: viper.GetInt("http.port"), // HTTP
 		})
 		if err != nil {
 			log.Fatal().Err(err)
@@ -105,8 +116,8 @@ var serverCmd = &cobra.Command{
 			log.Fatal().Err(err)
 		}
 		connApi, err := net.ListenTCP("tcp", &net.TCPAddr{
-			IP:   net.ParseIP(addr),
-			Port: apiPort, // HTTP
+			IP:   net.ParseIP(viper.GetString("address")),
+			Port: viper.GetInt("api.port"), // HTTP
 		})
 		if err != nil {
 			log.Fatal().Err(err)
@@ -121,7 +132,7 @@ var serverCmd = &cobra.Command{
 			go apiServer.Serve(connApi)
 			log.Info().Interface("api", connApi.Addr()).Msg("HTTP API listening...")
 			go func() {
-				go apiServer.Serve(connApi)
+				err := apiServer.Serve(connApi)
 				log.Error().Err(err).Msg("Error initializing HTTP API listener!")
 			}()
 		}

go.mod

@@ -16,13 +16,14 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/pin/tftp v2.1.0+incompatible
 	github.com/rs/zerolog v1.23.0
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1
+	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/u-root/u-root v7.0.0+incompatible
 	github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
-	golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
 	gopkg.in/yaml.v2 v2.4.0
 )