Clean up config handling

config/configuration.go

@@ -1,5 +1,10 @@
 package config
 
+import (
+	"github.com/spf13/viper"
+	"log"
+)
+
 type Configuration struct {
 	Server ServerConfig
 	OpenId OpenIDConfig
@@ -34,3 +39,29 @@ type RDGCapsConfig struct {
 	DisablePnp       bool
 	DisableDrive     bool
 }
+
+func init() {
+	viper.SetDefault("server.certFile", "server.pem")
+	viper.SetDefault("server.keyFile", "key.pem")
+	viper.SetDefault("server.port", 443)
+}
+
+func Load(configFile string) Configuration {
+	var conf Configuration
+
+	viper.SetConfigName("rdpgw")
+	viper.SetConfigFile(configFile)
+	viper.AddConfigPath(".")
+	viper.SetEnvPrefix("RDPGW")
+	viper.AutomaticEnv()
+
+	if err := viper.ReadInConfig(); err != nil {
+		log.Printf("No config file found (%s). Using defaults", err)
+	}
+
+	if err := viper.Unmarshal(&conf); err != nil {
+		log.Fatalf("Cannot unmarshal the config file; %s", err)
+	}
+
+	return conf
+}

main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"golang.org/x/oauth2"
 	"log"
 	"net/http"
@@ -37,20 +36,7 @@ var ctx context.Context
 func main() {
 	// get config
 	cmd.PersistentFlags().StringVarP(&configFile, "conf", "c", "rdpgw.yaml",  "config file (json, yaml, ini)")
-
+	conf = config.Load(configFile)
-	viper.SetConfigName("rdpgw")
-	viper.SetConfigFile(configFile)
-	viper.AddConfigPath(".")
-	viper.SetEnvPrefix("RDPGW")
-	viper.AutomaticEnv()
-
-	if err := viper.ReadInConfig(); err != nil {
-		log.Printf("No config file found (%s). Using defaults", err)
-	}
-
-	if err := viper.Unmarshal(&conf); err != nil {
-		log.Fatalf("Cannot unmarshal the config file; %s", err)
-	}
 
 	// set oidc config
 	ctx = context.Background()