embed: warns about empty hosts in advertise urls
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>release-3.3
parent
04413454ac
commit
fe344ef302
|
@ -299,6 +299,22 @@ func (cfg *Config) Validate() error {
|
||||||
if err := checkBindURLs(cfg.ListenMetricsUrls); err != nil {
|
if err := checkBindURLs(cfg.ListenMetricsUrls); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := checkHostURLs(cfg.APUrls); err != nil {
|
||||||
|
// TODO: return err in v3.4
|
||||||
|
addrs := make([]string, len(cfg.APUrls))
|
||||||
|
for i := range cfg.APUrls {
|
||||||
|
addrs[i] = cfg.APUrls[i].String()
|
||||||
|
}
|
||||||
|
plog.Warningf("advertise-peer-urls %q is deprecated (%v)", strings.Join(addrs, ","), err)
|
||||||
|
}
|
||||||
|
if err := checkHostURLs(cfg.ACUrls); err != nil {
|
||||||
|
// TODO: return err in v3.4
|
||||||
|
addrs := make([]string, len(cfg.ACUrls))
|
||||||
|
for i := range cfg.ACUrls {
|
||||||
|
addrs[i] = cfg.ACUrls[i].String()
|
||||||
|
}
|
||||||
|
plog.Warningf("advertise-client-urls %q is deprecated (%v)", strings.Join(addrs, ","), err)
|
||||||
|
}
|
||||||
|
|
||||||
// Check if conflicting flags are passed.
|
// Check if conflicting flags are passed.
|
||||||
nSet := 0
|
nSet := 0
|
||||||
|
@ -484,3 +500,16 @@ func checkBindURLs(urls []url.URL) error {
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkHostURLs(urls []url.URL) error {
|
||||||
|
for _, url := range urls {
|
||||||
|
host, _, err := net.SplitHostPort(url.Host)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if host == "" {
|
||||||
|
return fmt.Errorf("unexpected empty host (%s)", url.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue