From 394629d3bdbec62b5d3a01dcb06cf7fdd9b72634 Mon Sep 17 00:00:00 2001 From: Fernando Takagi Date: Wed, 6 Sep 2023 09:51:17 -0300 Subject: [PATCH] Do not log if config is empty. --- internal/satori/satori.go | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/internal/satori/satori.go b/internal/satori/satori.go index 30b9628b81..3781a96d3b 100644 --- a/internal/satori/satori.go +++ b/internal/satori/satori.go @@ -59,7 +59,9 @@ func NewSatoriClient(logger *zap.Logger, satoriUrl, apiKeyName, apiKey, signingK tokenExpirySec: 3600, } - if err := sc.validateConfig(); err != nil { + if sc.urlString == "" && sc.apiKeyName == "" && sc.apiKey == "" && sc.signingKey == "" { + sc.invalidConfig = true + } else if err := sc.validateConfig(); err != nil { sc.invalidConfig = true logger.Warn(err.Error()) } @@ -69,18 +71,23 @@ func NewSatoriClient(logger *zap.Logger, satoriUrl, apiKeyName, apiKey, signingK func (s *SatoriClient) validateConfig() error { errorStrings := make([]string, 0) - if s.url == nil { - _, err := url.Parse(s.urlString) + satoriUrl, err := url.Parse(s.urlString) + if err != nil { errorStrings = append(errorStrings, fmt.Sprintf("Invalid URL: %s", err.Error())) } - if s.apiKeyName == "" { - errorStrings = append(errorStrings, "api_key_name not set") - } - if s.apiKey == "" { - errorStrings = append(errorStrings, "api_key not set") - } - if s.signingKey == "" { - errorStrings = append(errorStrings, "signing_key not set") + + if satoriUrl.String() != "" { + if s.apiKeyName == "" { + errorStrings = append(errorStrings, "api_key_name not set") + } + if s.apiKey == "" { + errorStrings = append(errorStrings, "api_key not set") + } + if s.signingKey == "" { + errorStrings = append(errorStrings, "signing_key not set") + } + } else if s.apiKeyName != "" || s.apiKey != "" || s.signingKey != "" { + errorStrings = append(errorStrings, "Satori configuration incomplete: url not set") } if len(errorStrings) > 0 {