From 7674efe8d7256a8bbbd61b13629730d4e8b32ce8 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Sat, 23 Mar 2024 09:37:54 +0000 Subject: [PATCH] chore(config): remove bad retro-compatiblity for HTTP_CONTROL_SERVER_ADDRESS - Retro-compatible variable key CONTROL_SERVER_ADDRESS was never defined - Old variable key CONTROL_SERVER_PORT was removed in v3.28.0 and no complain so far --- internal/configuration/sources/env/server.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/internal/configuration/sources/env/server.go b/internal/configuration/sources/env/server.go index 31a9cf9e..3064f150 100644 --- a/internal/configuration/sources/env/server.go +++ b/internal/configuration/sources/env/server.go @@ -10,22 +10,7 @@ func (s *Source) readControlServer() (controlServer settings.ControlServer, err return controlServer, err } - controlServer.Address = s.readControlServerAddress() + controlServer.Address = s.env.Get("HTTP_CONTROL_SERVER_ADDRESS") return controlServer, nil } - -func (s *Source) readControlServerAddress() (address *string) { - const currentKey = "HTTP_CONTROL_SERVER_ADDRESS" - key := firstKeySet(s.env, "CONTROL_SERVER_ADDRESS", currentKey) - if key == currentKey { - return s.env.Get(key) - } - - s.handleDeprecatedKey(key, currentKey) - value := s.env.Get("CONTROL_SERVER_ADDRESS") - if value == nil { - return nil - } - return ptrTo(":" + *value) -}