Check error in BaseClient.Perform #922 (#926)

Anaethelion · web-flow · commit e2419cf5c935 · 2024-11-27T14:55:33.000+01:00
diff --git a/elasticsearch.go b/elasticsearch.go
@@ -302,9 +302,12 @@ func (c *Client) Perform(req *http.Request) (*http.Response, error) {
 
 	// Retrieve the original request.
 	res, err := c.Transport.Perform(req)
+	if err != nil {
+		return nil, err
+	}
 
 	// ResponseCheck path continues, we run the header check on the first answer from ES.
-	if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300){
+	if res.StatusCode >= 200 && res.StatusCode < 300 {
 		checkHeader := func(context.Context) error {
 			return genuineCheckHeader(res.Header)
 		}
@@ -313,7 +316,7 @@ func (c *Client) Perform(req *http.Request) (*http.Response, error) {
 			return nil, err
 		}
 	}
-	return res, err
+	return res, nil
 }
 
 // doProductCheck calls f if there as not been a prior successful call to doProductCheck,

Original file line number	Diff line number	Diff line change
`@@ -302,9 +302,12 @@ func (c Client) Perform(req http.Request) (*http.Response, error) {`
`302`	`302`
`303`	`303`	`// Retrieve the original request.`
`304`	`304`	`res, err := c.Transport.Perform(req)`
	`305`	`+ if err != nil {`
	`306`	`+ return nil, err`
	`307`	`+ }`
`305`	`308`
`306`	`309`	`// ResponseCheck path continues, we run the header check on the first answer from ES.`
`307`		`- if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300){`
	`310`	`+ if res.StatusCode >= 200 && res.StatusCode < 300 {`
`308`	`311`	`checkHeader := func(context.Context) error {`
`309`	`312`	`return genuineCheckHeader(res.Header)`
`310`	`313`	`}`
`@@ -313,7 +316,7 @@ func (c Client) Perform(req http.Request) (*http.Response, error) {`
`313`	`316`	`return nil, err`
`314`	`317`	`}`
`315`	`318`	`}`
`316`		`- return res, err`
	`319`	`+ return res, nil`
`317`	`320`	`}`
`318`	`321`
`319`	`322`	`// doProductCheck calls f if there as not been a prior successful call to doProductCheck,`