add env from machine override

unusualcodeorg · Jun 30, 2024 · 6222411 · 6222411
1 parent aa8acbc
commit 6222411
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/config/env.go b/config/env.go
@@ -35,10 +35,14 @@ type Env struct {
 	TokenAudience           string `mapstructure:"TOKEN_AUDIENCE"`
 }
 
-func NewEnv(filename string) *Env {
+func NewEnv(filename string, override bool) *Env {
 	env := Env{}
 	viper.SetConfigFile(filename)
 
+	if override {
+		viper.AutomaticEnv()
+	}
+
 	err := viper.ReadInConfig()
 	if err != nil {
 		log.Fatal("Error reading environment file", err)

diff --git a/startup/server.go b/startup/server.go
@@ -14,7 +14,7 @@ import (
 type Shutdown = func()
 
 func Server() {
-	env := config.NewEnv(".env")
+	env := config.NewEnv(".env", true)
 	router, _, shutdown := create(env)
 	defer shutdown()
 	router.Start(env.ServerHost, env.ServerPort)

diff --git a/startup/testserver.go b/startup/testserver.go
@@ -10,7 +10,7 @@ import (
 type Teardown = func()
 
 func TestServer() (network.Router, Module, Teardown) {
-	env := config.NewEnv("../.test.env")
+	env := config.NewEnv("../.test.env", false)
 	router, module, shutdown := create(env)
 	ts := httptest.NewServer(router.GetEngine())
 	teardown := func() {