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

* Check error in BaseClient.Perform The http.Resonse will be nil on errors, so return early. Fixes #913 * revert reordering of imports --------- Co-authored-by: Martin Tournoij <[email protected]>
elastic · Nov 27, 2024 · 64e36b1 · 64e36b1
1 parent 53772e8
commit 64e36b1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/elasticsearch.go b/elasticsearch.go
@@ -341,17 +341,20 @@ func (c *BaseClient) Perform(req *http.Request) (*http.Response, error) {
 
 	// Retrieve the original request.
 	res, err := c.Transport.Perform(req)
+	if err != nil {
+		return nil, err
+	}
 
 	// ResponseCheck, 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() error { return genuineCheckHeader(res.Header) }
 		if err := c.doProductCheck(checkHeader); err != nil {
 			res.Body.Close()
 			return nil, err
 		}
 	}
 
-	return res, err
+	return res, nil
 }
 
 // InstrumentationEnabled propagates back to the client the Instrumentation provided by the transport.