Fix incorrect handling of addresses from environment and configuration

karmi · karmi · commit 44daba1f27f0 · 2019-11-12T18:49:40.000+01:00
(cherry picked from commit 8e2b609)
diff --git a/elasticsearch.go b/elasticsearch.go
@@ -104,10 +104,9 @@ func NewClient(cfg Config) (*Client, error) {
 		addrs = append(addrs, cloudAddrs)
 	} else {
 		if len(envAddrs) > 0 {
-			addrs = append(envAddrs, envAddrs...)
-		}
-		if len(cfg.Addresses) > 0 {
-			addrs = append(envAddrs, cfg.Addresses...)
+			addrs = append(addrs, envAddrs...)
+		} else if len(cfg.Addresses) > 0 {
+			addrs = append(addrs, cfg.Addresses...)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,9 @@ func NewClient(cfg Config) (*Client, error) {`
`104`	`104`	`addrs = append(addrs, cloudAddrs)`
`105`	`105`	`} else {`
`106`	`106`	`if len(envAddrs) > 0 {`
`107`		`- addrs = append(envAddrs, envAddrs...)`
`108`		`- }`
`109`		`- if len(cfg.Addresses) > 0 {`
`110`		`- addrs = append(envAddrs, cfg.Addresses...)`
	`107`	`+ addrs = append(addrs, envAddrs...)`
	`108`	`+ } else if len(cfg.Addresses) > 0 {`
	`109`	`+ addrs = append(addrs, cfg.Addresses...)`
`111`	`110`	`}`
`112`	`111`	`}`
`113`	`112`