Fix from discussion

Signed-off-by: Mikhail Fesenko <proggga@gmail.com>
pull/11463/head
Mikhail Fesenko 1 year ago
parent 17cdfdd79f
commit 02e11cc2a7
No known key found for this signature in database
GPG Key ID: EFF13E9E31D0464E

@ -107,15 +107,13 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
return errors.New("marathon_sd: at most one of auth_token & auth_token_file must be configured") return errors.New("marathon_sd: at most one of auth_token & auth_token_file must be configured")
} }
isAuthTokenProvided := len(c.AuthToken) > 0 || len(c.AuthTokenFile) > 0 if len(c.AuthToken) > 0 || len(c.AuthTokenFile) > 0 {
if isAuthTokenProvided { switch {
if c.HTTPClientConfig.BasicAuth != nil { case c.HTTPClientConfig.BasicAuth != nil:
return errors.New("marathon_sd: at most one of basic_auth, auth_token & auth_token_file must be configured") return errors.New("marathon_sd: at most one of basic_auth, auth_token & auth_token_file must be configured")
} case len(c.HTTPClientConfig.BearerToken) > 0 || len(c.HTTPClientConfig.BearerTokenFile) > 0:
if len(c.HTTPClientConfig.BearerToken) > 0 || len(c.HTTPClientConfig.BearerTokenFile) > 0 {
return errors.New("marathon_sd: at most one of bearer_token, bearer_token_file, auth_token & auth_token_file must be configured") return errors.New("marathon_sd: at most one of bearer_token, bearer_token_file, auth_token & auth_token_file must be configured")
} case c.HTTPClientConfig.Authorization != nil:
if c.HTTPClientConfig.Authorization != nil {
return errors.New("marathon_sd: at most one of auth_token, auth_token_file & authorization must be configured") return errors.New("marathon_sd: at most one of auth_token, auth_token_file & authorization must be configured")
} }
} }

Loading…
Cancel
Save