elasticsearch support for wrapped errors

common/elasticsearch/client/os2/client_test.go

@@ -27,6 +27,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -230,7 +231,8 @@ func TestParseError(t *testing.T) {
 			err := os2Client.parseError(&response)
 
 			if !tt.expectError {
-				if parsedErr, ok := err.(*osError); ok && parsedErr.Details != nil {
+				var parsedErr *osError
+				if errors.As(err, &parsedErr) && parsedErr.Details != nil {
 					assert.Equal(t, tt.expectedErrMsg, parsedErr.Details.Reason, "Error message mismatch for case: %s", tt.name)
 				} else {
 					t.Errorf("Failed to assert error reason for case: %s", tt.name)

common/elasticsearch/client/v6/client_bulk.go

@@ -24,6 +24,7 @@ package v6
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/olivere/elastic"
@@ -146,9 +147,9 @@ func convertV6ErrorToGenericError(err error) *bulk.GenericError {
 		return nil
 	}
 	status := bulk.UnknownStatusCode
-	switch e := err.(type) {
-	case *elastic.Error:
-		status = e.Status
+	var elasticError *elastic.Error
+	if errors.As(err, &elasticError) {
+		status = elasticError.Status
 	}
 	return &bulk.GenericError{
 		Status:  status,

common/elasticsearch/client/v7/client_bulk.go

@@ -24,6 +24,7 @@ package v7
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/olivere/elastic/v7"
@@ -189,9 +190,9 @@ func convertV7ErrorToGenericError(err error) *bulk.GenericError {
 		return nil
 	}
 	status := bulk.UnknownStatusCode
-	switch e := err.(type) {
-	case *elastic.Error:
-		status = e.Status
+	var elasticError *elastic.Error
+	if errors.As(err, &elasticError) {
+		status = elasticError.Status
 	}
 	return &bulk.GenericError{
 		Status:  status,