chore(env): getEnvWithRetro helper function

2022-01-29 14:55:56 +00:00
parent e7e4cfca4c
commit 0d8cb66d43
13 changed files with 113 additions and 300 deletions
--- a/internal/configuration/sources/env/publicip.go
+++ b/internal/configuration/sources/env/publicip.go
@@ -35,17 +35,9 @@ func readPublicIPPeriod() (period *time.Duration, err error) {
 }

 func (r *Reader) readPublicIPFilepath() (filepath *string) {
-	// Retro-compatibility
-	s := os.Getenv("IP_STATUS_FILE")
-	if s != "" {
-		r.onRetroActive("IP_STATUS_FILE", "PUBLICIP_FILE")
-		return &s
-	}
-
-	s = os.Getenv("PUBLICIP_FILE")
+	_, s := r.getEnvWithRetro("PUBLICIP_FILE", "IP_STATUS_FILE")
 	if s != "" {
 		return &s
 	}
-
 	return nil
 }