Fix incorrect file path

ElliotThiebaut · ElliotThiebaut · commit c32787ca7f37 · 2025-02-27T01:02:18.000-05:00
diff --git a/internal/app/traefik-github-oauth-server/config.go b/internal/app/traefik-github-oauth-server/config.go
@@ -20,15 +20,15 @@ type Config struct {
 }
 
 func envString(key string) string {
-	value := os.Getenv(key)
-	if strings.HasSuffix(key, "_FILE") && value != "" {
+	fileKey := key + "_FILE"
+	if value := os.Getenv(fileKey); value != "" {
 		content, err := os.ReadFile(value)
 		if err != nil {
-			return ""
+			return os.Getenv(key)
 		}
 		return strings.TrimSpace(string(content))
 	}
-	return value
+	return os.Getenv(key)
 }
 
 func envWithDefault(key string, defaultValue string) string {

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@ type Config struct {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func envString(key string) string {`
`23`		`- value := os.Getenv(key)`
`24`		`- if strings.HasSuffix(key, "_FILE") && value != "" {`
	`23`	`+ fileKey := key + "_FILE"`
	`24`	`+ if value := os.Getenv(fileKey); value != "" {`
`25`	`25`	`content, err := os.ReadFile(value)`
`26`	`26`	`if err != nil {`
`27`		`- return ""`
	`27`	`+ return os.Getenv(key)`
`28`	`28`	`}`
`29`	`29`	`return strings.TrimSpace(string(content))`
`30`	`30`	`}`
`31`		`- return value`
	`31`	`+ return os.Getenv(key)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func envWithDefault(key string, defaultValue string) string {`