error: adjust ParseError function to handle non json errors with a cu…

…stom error

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

CHANGELOG.md

@@ -9,6 +9,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Adds the `Explanation` field containing the document explain details to the `SearchHit` struct. ([#504](https://github.com/opensearch-project/opensearch-go/pull/504))
 - Adds the `Fields` field containing the document fields to the `SearchHit` struct. ([#508](https://github.com/opensearch-project/opensearch-go/pull/508))
 - Adds new error types ([#512](https://github.com/opensearch-project/opensearch-go/pull/506))
+- Adds handling of non json errors to ParseError ([#512](https://github.com/opensearch-project/opensearch-go/pull/506))
 
 ### Changed
 - Use docker compose v2 instead of v1 ([#506](https://github.com/opensearch-project/opensearch-go/pull/506))

error.go

@@ -129,6 +129,14 @@ func ParseError(resp *Response) error {
 	if err != nil {
 		return fmt.Errorf("%w: %w", ErrReadBody, err)
 	}
+
+	if !json.Valid(body) {
+		if resp.StatusCode == http.StatusUnauthorized {
+			return ErrUnauthorized
+		}
+		return ErrNonJSONError
+	}
+
 	var testResp struct {
 		Status  any `json:"status"`
 		Error   any `json:"error"`

error_test.go

@@ -30,8 +30,7 @@ func TestError(t *testing.T) {
 			resp := &opensearch.Response{
 				StatusCode: http.StatusBadRequest,
 				Body: io.NopCloser(
-					strings.NewReader(`
-					{
+					strings.NewReader(`{
 						"error":{
 							"root_cause":[{
 								"type":"resource_already_exists_exception",
@@ -68,8 +67,7 @@ func TestError(t *testing.T) {
 		t.Run("Unmarshal errors", func(t *testing.T) {
 			t.Run("dummy", func(t *testing.T) {
 				reader := io.NopCloser(
-					strings.NewReader(`
-					{
+					strings.NewReader(`{
 						"status": "400"
 					}`),
 				)
@@ -85,8 +83,7 @@ func TestError(t *testing.T) {
 			})
 			t.Run("string", func(t *testing.T) {
 				reader := io.NopCloser(
-					strings.NewReader(`
-					{
+					strings.NewReader(`{
 						"error": 0,
 						"status": 500
 					}`),
@@ -108,8 +105,7 @@ func TestError(t *testing.T) {
 		resp := &opensearch.Response{
 			StatusCode: http.StatusMethodNotAllowed,
 			Body: io.NopCloser(
-				strings.NewReader(`
-					{
+				strings.NewReader(`{
 						"error": "Incorrect HTTP method for uri [/_doc] and method [POST], allowed: [HEAD, DELETE, PUT, GET]",
 						"status":405
 					}`),
@@ -128,8 +124,7 @@ func TestError(t *testing.T) {
 		resp := &opensearch.Response{
 			StatusCode: http.StatusBadRequest,
 			Body: io.NopCloser(
-				strings.NewReader(`
-					{
+				strings.NewReader(`{
 					  "error": "no handler found for uri [/_plugins/_security/xxx] and method [GET]"
 					}`),
 			),
@@ -146,8 +141,7 @@ func TestError(t *testing.T) {
 		resp := &opensearch.Response{
 			StatusCode: http.StatusBadRequest,
 			Body: io.NopCloser(
-				strings.NewReader(`
-					{
+				strings.NewReader(`{
 					  "status": "error",
 					  "reason": "Invalid configuration",
 					  "invalid_keys": {
@@ -188,20 +182,12 @@ func TestError(t *testing.T) {
 			WantedErrors []error
 		}{
 			{
-				Name: "response for StringError",
+				Name: "Non JSON error",
 				Resp: &opensearch.Response{
 					StatusCode: http.StatusMethodNotAllowed,
-					Body:       io.NopCloser(strings.NewReader(`"Test - Trigger an error"`)),
+					Body:       io.NopCloser(strings.NewReader(`Test - Trigger an error`)),
 				},
-				WantedErrors: []error{opensearch.ErrJSONUnmarshalBody},
-			},
-			{
-				Name: "response string",
-				Resp: &opensearch.Response{
-					StatusCode: http.StatusForbidden,
-					Body:       io.NopCloser(strings.NewReader(`"Test - Trigger an error"`)),
-				},
-				WantedErrors: []error{opensearch.ErrJSONUnmarshalBody},
+				WantedErrors: []error{opensearch.ErrNonJSONError},
 			},
 			{
 				Name: "error field object",
@@ -212,13 +198,21 @@ func TestError(t *testing.T) {
 				WantedErrors: []error{opensearch.ErrJSONUnmarshalBody, opensearch.ErrUnknownOpensearchError},
 			},
 			{
-				Name: "response json",
+				Name: "unknown json",
 				Resp: &opensearch.Response{
 					StatusCode: http.StatusNotFound,
 					Body:       io.NopCloser(strings.NewReader(`{"_index":"index","_id":"2","matched":false}`)),
 				},
 				WantedErrors: []error{opensearch.ErrUnknownOpensearchError},
 			},
+			{
+				Name: "unauthorized",
+				Resp: &opensearch.Response{
+					StatusCode: http.StatusUnauthorized,
+					Body:       io.NopCloser(strings.NewReader(http.StatusText(http.StatusUnauthorized))),
+				},
+				WantedErrors: []error{opensearch.ErrUnauthorized},
+			},
 			{
 				Name: "io read error",
 				Resp: &opensearch.Response{
@@ -232,6 +226,14 @@ func TestError(t *testing.T) {
 				Resp:         &opensearch.Response{StatusCode: http.StatusBadRequest},
 				WantedErrors: []error{opensearch.ErrUnexpectedEmptyBody},
 			},
+			{
+				Name: "unmarshal error",
+				Resp: &opensearch.Response{
+					StatusCode: http.StatusNotFound,
+					Body:       io.NopCloser(strings.NewReader(`"test"`)),
+				},
+				WantedErrors: []error{opensearch.ErrJSONUnmarshalBody},
+			},
 		}
 
 		for _, tt := range cases {