Added config constraints & Created config package tests

Author: RedSkiesReaperr

cmd/updater/main.go

@@ -18,7 +18,7 @@ type body struct {
 }
 
 func main() {
-	config, err := config.Load()
+	config, err := config.Load("")
 	if err != nil {
 		log.Fatalf("Unable to load config: %s\n", err)
 	}

cmd/watcher/main.go

@@ -20,7 +20,7 @@ type updateRequestBody struct {
 }
 
 func main() {
-	config, err := config.Load()
+	config, err := config.Load("")
 	if err != nil {
 		log.Fatalf("Unable to load config: %s\n", err)
 	} else {

config/.env.test_default

@@ -0,0 +1,7 @@
+NOTION_API_SECRET=65s$ye6&NWnu@dK%*utFd*dDa
+NOTION_PAGE_ID=Sob@3JRoXrB&#ffyXTkVCV9NY
+IGDB_CLIENT_ID=gqMAXshTpzhbfcT7$b$U7#mGh
+IGDB_SECRET=QurU4ihv7Sf7!WijUJ3s&gBa6
+UPDATER_HOST=
+UPDATER_PORT=
+WATCHER_TICK_DELAY=

config/.env.test_invalid

@@ -0,0 +1,7 @@
+NOTION_API_SECRET=
+NOTION_PAGE_ID=
+IGDB_CLIENT_ID=
+IGDB_SECRET=
+UPDATER_HOST=
+UPDATER_PORT=
+WATCHER_TICK_DELAY=

config/.env.test_success

@@ -0,0 +1,7 @@
+NOTION_API_SECRET=u3M3sAdjqkLm8JSJihaGu3GfscAGE2
+NOTION_PAGE_ID=sEQCpMkvVCRfd4JAzVjmsd4EGYCFNC
+IGDB_CLIENT_ID=pUnDQo4LzgjrYifQR5W7cAeaxACx92
+IGDB_SECRET=WjMpHfNk6Mt4b4FV8TFT2pDiwiUeKu
+UPDATER_HOST=76.388.29.99
+UPDATER_PORT=7654
+WATCHER_TICK_DELAY=99

config/config.go

@@ -9,20 +9,24 @@ import (
 
 // Config holds all configurations loaded from .env file
 type Config struct {
-	NotionAPISecret  string `env:"NOTION_API_SECRET,required"`
-	NotionPageID     string `env:"NOTION_PAGE_ID,required"`
-	IGDBClientID     string `env:"IGDB_CLIENT_ID,required"`
-	IGDBSecret       string `env:"IGDB_SECRET,required"`
-	UpdaterHost      string `env:"UPDATER_HOST,required"`
-	UpdaterPort      int    `env:"UPDATER_PORT,required"`
-	WatcherTickDelay int    `env:"WATCHER_TICK_DELAY,required"`
+	NotionAPISecret  string `env:"NOTION_API_SECRET,required,notEmpty"`
+	NotionPageID     string `env:"NOTION_PAGE_ID,required,notEmpty"`
+	IGDBClientID     string `env:"IGDB_CLIENT_ID,required,notEmpty"`
+	IGDBSecret       string `env:"IGDB_SECRET,required,notEmpty"`
+	UpdaterHost      string `env:"UPDATER_HOST,required" envDefault:"127.0.0.1"`
+	UpdaterPort      int    `env:"UPDATER_PORT,required" envDefault:"8080"`
+	WatcherTickDelay int    `env:"WATCHER_TICK_DELAY,required" envDefault:"5"`
 }
 
 // Load all configs from .env & returns the values (+ error if needed)
-func Load() (Config, error) {
+func Load(file string) (Config, error) {
 	config := Config{}
 
-	err := godotenv.Load()
+	if file == "" {
+		file = ".env"
+	}
+
+	err := godotenv.Load(file)
 	if err != nil {
 		return config, err
 	}
@@ -35,6 +39,7 @@ func Load() (Config, error) {
 	return config, nil
 }
 
+// UpdaterURL returns URL to reach the updater process
 func (c *Config) UpdaterURL() string {
 	return fmt.Sprintf("http://%s:%d/", c.UpdaterHost, c.UpdaterPort)
 }

config/config_test.go

@@ -0,0 +1,112 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestLoadNotFoundFile(t *testing.T) {
+	os.Clearenv()
+	_, err := Load(".env.this_file_does_not_exist")
+	if err == nil {
+		t.Errorf("Unexpected Load() success: expected:failure, got:success")
+	}
+}
+
+func TestLoadErrors(t *testing.T) {
+	expectedErrors := [4]string{
+		`"NOTION_API_SECRET" should not be empty`,
+		`"NOTION_PAGE_ID" should not be empty`,
+		`"IGDB_CLIENT_ID" should not be empty`,
+		`"IGDB_SECRET" should not be empty`,
+	}
+
+	os.Clearenv()
+	_, err := Load(".env.test_invalid")
+
+	for _, expected := range expectedErrors {
+		if !strings.Contains(err.Error(), expected) {
+			t.Errorf("Expected to find error '%s'", expected)
+		}
+	}
+}
+
+func TestLoadDefaultValues(t *testing.T) {
+	os.Clearenv()
+	config, err := Load(".env.test_default")
+	if err != nil {
+		t.Errorf("Unexpected Load() error:'%s'", err)
+	}
+
+	if assertConfig("UpdaterHost", config.UpdaterHost, "127.0.0.1") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("UpdaterPort", config.UpdaterPort, 8080) != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("WatcherTickDelay", config.WatcherTickDelay, 5) != nil {
+		t.Error(err)
+	}
+}
+
+func TestLoadSuccess(t *testing.T) {
+	os.Clearenv()
+	config, err := Load(".env.test_success")
+	if err != nil {
+		t.Errorf("Unexpected Load() error:'%s'", err)
+	}
+
+	if assertConfig("NotionAPISecret", config.NotionAPISecret, "u3M3sAdjqkLm8JSJihaGu3GfscAGE2") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("NotionPageID", config.NotionPageID, "sEQCpMkvVCRfd4JAzVjmsd4EGYCFNC") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("IGDBClientID", config.IGDBClientID, "pUnDQo4LzgjrYifQR5W7cAeaxACx92") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("IGDBSecret", config.IGDBSecret, "WjMpHfNk6Mt4b4FV8TFT2pDiwiUeKu") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("UpdaterHost", config.UpdaterHost, "76.388.29.99") != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("UpdaterPort", config.UpdaterPort, 7654) != nil {
+		t.Error(err)
+	}
+
+	if assertConfig("WatcherTickDelay", config.WatcherTickDelay, 99) != nil {
+		t.Error(err)
+	}
+}
+
+func TestUpdaterURL(t *testing.T) {
+	config := Config{
+		UpdaterHost: "172.16.4.97",
+		UpdaterPort: 9999,
+	}
+
+	result := config.UpdaterURL()
+	expected := "http://172.16.4.97:9999/"
+
+	if result != expected {
+		t.Errorf("Unexpected UpdaterURL: expected:%s, got:%s", expected, result)
+	}
+}
+
+func assertConfig(key string, value any, expected any) (err error) {
+	if value != expected {
+		err = fmt.Errorf("Unexpected %s value: expected:%v, got:%v", key, expected, value)
+	}
+
+	return
+}