changed config to yaml; removed flag support

Geprüft
Mit freundlichen Grüßen
Eichhorn

.gitignore

@@ -13,3 +13,5 @@
 *.out
 
 # Custom Blacklist
+
+#CM

README.md

@@ -1,20 +1,16 @@
-# tsviewer **[WIP]**
+# tsviewer **[ALPHA 1.0.1]**
 
 A TS3 Viewer with REST API.
-
+## DOCKER-Config
-## Config
-
-### Docker-Config
 
 ```bash
 docker build -t name/cont:ver .
 
 docker run -e TS3_IP="<SERVER-IP>" -e TS3_PW="<SERVER-ADMIN_PW>" -e WEB_PORT="8080" -d -p 8080:8080 name/cont:ver
 ```
-
 ENV:
-
 ```Docker
+
 ENV TS3_IP=127.0.0.1
 ENV TS3_NAME=serveradmin
 ENV TS3_PW=<changeMe>
@@ -22,12 +18,15 @@ ENV TS3_PORT=9987
 ENV TS3_QUERY=10011
 ENV WEB_PORT=8080
 ENV BLACKLIST_USER=USER
+
+
 ```
 
-### API-Config
+# Features
+
+## Config
 
 The config file is generated automatically on first startup.
-
 ```json
 {
     "user": {
@@ -46,20 +45,17 @@ The config file is generated automatically on first startup.
 }
 ```
 
-## Features
+## URL-Parameter
-
-### URL-Parameter
 
 | Name       | Type   | Description              |
 | ---------- | ------ | ------------------------ |
 | `pretty`   | `bool` | pretty-prints JSON       |
 | `envelope` | `bool` | wraps JSON in data array |
 
-### Channels
+## Channels
 
 - **`GET`** `/v1/channels/:id`
 - **`GET`** `/v1/channels`
-
 ```json
 {
     "databaseId": 1,
@@ -71,11 +67,10 @@ The config file is generated automatically on first startup.
 }
 ```
 
-### Clients
+## Clients
 
 - **`GET`** `/v1/clients/:id`
 - **`GET`** `/v1/clients/`
-
 ```json
 {
     "id": 1,
@@ -88,10 +83,9 @@ The config file is generated automatically on first startup.
 }
 ```
 
-### Server
+## Server
 
 - **`GET`** `/v1/server/info`
-
 ```json
 {
     "name": "TeamSpeak ]I[ Server",

config/config.go

@@ -1,161 +1,84 @@
 package config
 
 import (
-	"encoding/json"
-	"flag"
-	"io/ioutil"
-	"log"
 	"os"
 	"strconv"
+
+	"github.com/spf13/viper"
 )
 
 type Config struct {
-	User      User      `json:"user"`
+	User struct {
-	ServerTS  ServerTS  `json:"serverTS"`
+		Nickname string
-	ServerWeb ServerWeb `json:"serverWeb"`
+		Name     string
-}
+		Password string
-
+	}
-type User struct {
+	ServerTS struct {
-	Nickname string `json:"nickname"`
+		IP         string
-	Name     string `json:"name"`
+		PortServer uint16
-	Password string `json:"password"`
+		PortQuery  uint16
-}
+	}
-
+	ServerWeb struct {
-type ServerTS struct {
+		Port uint16
-	IP         string `json:"ip"`
+	}
-	PortServer uint16 `json:"portServer"`
-	PortQuery  uint16 `json:"portQuery"`
-}
-
-type ServerWeb struct {
-	Port uint16 `json:"port"`
 }
 
 const FileName = "config.json"
 
 func New() (*Config, error) {
-	config := defaults()
+	viper.SetConfigName("config")
-
+	viper.SetConfigFile("yaml")
-	configFile, err := os.Open(FileName)
+	viper.AddConfigPath(".")
-	if err != nil {
+	if err := viper.ReadInConfig(); err != nil {
-		if err := config.createFile(); err != nil {
 		return nil, err
 	}
 
-		log.Println(config)
+	setDefaults()
-		return &config, nil
-	}
-	defer configFile.Close()
 
-	jsonParser := json.NewDecoder(configFile)
+	var config Config
-	jsonParser.Decode(&config)
+	err := viper.Unmarshal(&config)
 
-	config.overrideWithEnv()
+	config.overrideWithEnvironmentVars()
-	config.overrideWithFlags()
 
-	return &config, nil
+	return &config, err
 }
 
-func (config Config) createFile() error {
+func setDefaults() {
-	configJSON, err := json.MarshalIndent(config, "", "    ")
+	viper.SetDefault("User.Nickname", "serveradmin")
-	if err != nil {
+	viper.SetDefault("User.Name", "serveradmin")
-		return err
+	viper.SetDefault("User.Password", "<changeMe>")
-	}
+	viper.SetDefault("ServerTS.IP", "127.0.0.1")
-
+	viper.SetDefault("ServerTS.PortServer", "9987")
-	return ioutil.WriteFile(FileName, configJSON, 0644)
+	viper.SetDefault("ServerTS.PortQuery", "10011")
+	viper.SetDefault("ServerWeb.Port", "80")
 }
 
-func defaults() Config {
+func (config *Config) overrideWithEnvironmentVars() {
-	return Config{
+	if nickname := os.Getenv("TS3_NICKNAME"); nickname != "" {
-		User: User{
-			Nickname: "serveradmin",
-			Name:     "serveradmin",
-			Password: "",
-		},
-		ServerTS: ServerTS{
-			IP:         "127.0.0.1",
-			PortServer: 9987,
-			PortQuery:  10011,
-		},
-		ServerWeb: ServerWeb{
-			Port: 80,
-		},
-	}
-}
-
-func (config *Config) overrideWithEnv() {
-	nickname := os.Getenv("TS3_NICKNAME")
-	username := os.Getenv("TS3_NAME")
-	password := os.Getenv("TS3_PW")
-	tsIP := os.Getenv("TS3_IP")
-	tsPort, _ := strconv.Atoi(os.Getenv("TS3_PORT"))
-	tsQuery, _ := strconv.Atoi(os.Getenv("TS3_QUERY"))
-	webPort, _ := strconv.Atoi(os.Getenv("WEB_PORT"))
-
-	if nickname != "" {
 		config.User.Nickname = nickname
 	}
 
-	if username != "" {
+	if username := os.Getenv("TS3_NAME"); username != "" {
 		config.User.Name = username
 	}
 
-	if password != "" {
+	if password := os.Getenv("TS3_PW"); password != "" {
 		config.User.Password = password
 	}
 
-	if tsIP != "" {
+	if tsIP := os.Getenv("TS3_IP"); tsIP != "" {
 		config.ServerTS.IP = tsIP
 	}
 
-	if tsPort <= 65535 && tsPort != 0 {
+	if tsPort, err := strconv.Atoi(os.Getenv("TS3_PORT")); tsPort <= 65535 && tsPort >= 0 && err == nil {
 		config.ServerTS.PortServer = uint16(tsPort)
 	}
 
-	if tsQuery <= 65535 && tsQuery != 0 {
+	if tsQuery, err := strconv.Atoi(os.Getenv("TS3_QUERY")); tsQuery <= 65535 && tsQuery >= 0 && err == nil {
 		config.ServerTS.PortQuery = uint16(tsQuery)
 	}
 
-	if webPort <= 65535 && webPort != 0 {
+	if webPort, err := strconv.Atoi(os.Getenv("WEB_PORT")); webPort <= 65535 && webPort >= 0 && err == nil {
 		config.ServerWeb.Port = uint16(webPort)
 	}
 }
-
-func (config *Config) overrideWithFlags() {
-	nickname := flag.String("ts3_nickname", "", "TS3Query nickname")
-	username := flag.String("ts3_name", "", "TS3Query username")
-	password := flag.String("ts3_pw", "", "TS3Query user password")
-	tsIP := flag.String("ts3_ip", "", "TS3 IP address")
-	tsPort := flag.Uint64("ts3_port", 65536, "TS3 port")
-	tsQuery := flag.Uint64("ts3_query", 65536, "TS3 query port")
-	webPort := flag.Uint64("web_port", 65536, "Webserver port")
-	flag.Parse()
-
-	if *nickname != "" {
-		config.User.Nickname = *nickname
-	}
-
-	if *username != "" {
-		config.User.Name = *username
-	}
-
-	if *password != "" {
-		config.User.Password = *password
-	}
-
-	if *tsIP != "" {
-		config.ServerTS.IP = *tsIP
-	}
-
-	if *tsPort <= 65535 && *tsPort != 0 {
-		config.ServerTS.PortServer = uint16(*tsPort)
-	}
-
-	if *tsQuery <= 65535 && *tsQuery != 0 {
-		config.ServerTS.PortQuery = uint16(*tsQuery)
-	}
-
-	if *webPort <= 65535 && *webPort != 0 {
-		config.ServerWeb.Port = uint16(*webPort)
-	}
-}

main.go

@@ -19,7 +19,6 @@ import (
 	"github.com/go-chi/cors"
 )
 
-// Routes includes middleware and distributes request to different Routers
 func Routes(s service.Service, t template.Template) *chi.Mux {
 	router := chi.NewRouter()
 	cors := cors.New(cors.Options{