Fix for AwsSdk2Transport error handling (#1068) (#1072) (#1085)

(cherry picked from commit 5ec233d)

Signed-off-by: Wesley Workman <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -21,6 +21,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Fixed
 - Deserialize aggregation containing a parent aggregation ([#706](https://github.com/opensearch-project/opensearch-java/pull/706))
+- Deserialize error response when using AwsSdk2Transport ([#1068](https://github.com/opensearch-project/opensearch-java/pull/1068))
 
 ### Security
 

java-client/src/main/java/org/opensearch/client/transport/aws/AwsSdk2Transport.java

@@ -48,6 +48,7 @@
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.transport.endpoints.BooleanEndpoint;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
+import org.opensearch.client.util.MissingRequiredPropertyException;
 import org.opensearch.client.util.OpenSearchRequestBodyBuffer;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
@@ -64,6 +65,7 @@
 import software.amazon.awssdk.http.async.AsyncExecuteRequest;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 
 /**
@@ -534,10 +536,17 @@ private <ResponseT, ErrorT> ResponseT parseResponse(
                 if (errorDeserializer == null || bodyStream == null) {
                     throw new TransportException("Request failed with status code '" + statusCode + "'");
                 }
+
+                // We may have to reset if there is a parse deserialization exception
+                bodyStream = toByteArrayInputStream(bodyStream);
+
                 try {
                     try (JsonParser parser = mapper.jsonProvider().createParser(bodyStream)) {
                         ErrorT error = errorDeserializer.deserialize(parser, mapper);
                         throw new OpenSearchException((ErrorResponse) error);
+                    } catch (MissingRequiredPropertyException errorEx) {
+                        bodyStream.reset();
+                        return decodeResponse(uri, method, protocol, httpResponse, bodyStream, endpoint, mapper);
                     }
                 } catch (OpenSearchException e) {
                     throw e;
@@ -551,57 +560,68 @@ private <ResponseT, ErrorT> ResponseT parseResponse(
                 }
             }
         } else {
-            if (endpoint instanceof BooleanEndpoint) {
-                BooleanEndpoint<?> bep = (BooleanEndpoint<?>) endpoint;
-                @SuppressWarnings("unchecked")
-                ResponseT response = (ResponseT) new BooleanResponse(bep.getResult(statusCode));
-                return response;
-            } else if (endpoint instanceof JsonEndpoint) {
-                JsonEndpoint<?, ResponseT, ?> jsonEndpoint = (JsonEndpoint<?, ResponseT, ?>) endpoint;
-                // Successful response
-                ResponseT response = null;
-                JsonpDeserializer<ResponseT> responseParser = jsonEndpoint.responseDeserializer();
-                if (responseParser != null) {
-                    // Expecting a body
-                    if (bodyStream == null) {
-                        throw new TransportException("Expecting a response body, but none was sent");
-                    }
-                    try (JsonParser parser = mapper.jsonProvider().createParser(bodyStream)) {
-                        try {
-                            response = responseParser.deserialize(parser, mapper);
-                        } catch (NullPointerException e) {
-                            response = responseParser.deserialize(parser, mapper);
-                        }
-                    }
-                    ;
-                }
-                return response;
-            } else if (endpoint instanceof GenericEndpoint) {
-                @SuppressWarnings("unchecked")
-                final GenericEndpoint<?, ResponseT> rawEndpoint = (GenericEndpoint<?, ResponseT>) endpoint;
+            return decodeResponse(uri, method, protocol, httpResponse, bodyStream, endpoint, mapper);
+        }
+    }
 
-                String contentType = null;
-                if (bodyStream != null) {
-                    contentType = httpResponse.firstMatchingHeader(Header.CONTENT_TYPE).orElse(null);
+    private <ResponseT, ErrorT> ResponseT decodeResponse(
+        URI uri,
+        @Nonnull SdkHttpMethod method,
+        String protocol,
+        @Nonnull SdkHttpResponse httpResponse,
+        @CheckForNull InputStream bodyStream,
+        @Nonnull Endpoint<?, ResponseT, ErrorT> endpoint,
+        JsonpMapper mapper
+    ) throws IOException {
+        if (endpoint instanceof BooleanEndpoint) {
+            BooleanEndpoint<?> bep = (BooleanEndpoint<?>) endpoint;
+            @SuppressWarnings("unchecked")
+            ResponseT response = (ResponseT) new BooleanResponse(bep.getResult(httpResponse.statusCode()));
+            return response;
+        } else if (endpoint instanceof JsonEndpoint) {
+            JsonEndpoint<?, ResponseT, ?> jsonEndpoint = (JsonEndpoint<?, ResponseT, ?>) endpoint;
+            // Successful response
+            ResponseT response = null;
+            JsonpDeserializer<ResponseT> responseParser = jsonEndpoint.responseDeserializer();
+            if (responseParser != null) {
+                // Expecting a body
+                if (bodyStream == null) {
+                    throw new TransportException("Expecting a response body, but none was sent");
+                }
+                try (JsonParser parser = mapper.jsonProvider().createParser(bodyStream)) {
+                    try {
+                        response = responseParser.deserialize(parser, mapper);
+                    } catch (NullPointerException e) {
+                        response = responseParser.deserialize(parser, mapper);
+                    }
                 }
+            }
+            return response;
+        } else if (endpoint instanceof GenericEndpoint) {
+            @SuppressWarnings("unchecked")
+            final GenericEndpoint<?, ResponseT> rawEndpoint = (GenericEndpoint<?, ResponseT>) endpoint;
 
-                return rawEndpoint.responseDeserializer(
-                    uri.toString(),
-                    method.name(),
-                    protocol,
-                    httpResponse.statusCode(),
-                    httpResponse.statusText().orElse(null),
-                    httpResponse.headers()
-                        .entrySet()
-                        .stream()
-                        .map(h -> new AbstractMap.SimpleEntry<String, String>(h.getKey(), Objects.toString(h.getValue())))
-                        .collect(Collectors.toList()),
-                    contentType,
-                    bodyStream
-                );
-            } else {
-                throw new TransportException("Unhandled endpoint type: '" + endpoint.getClass().getName() + "'");
+            String contentType = null;
+            if (bodyStream != null) {
+                contentType = httpResponse.firstMatchingHeader(Header.CONTENT_TYPE).orElse(null);
             }
+
+            return rawEndpoint.responseDeserializer(
+                uri.toString(),
+                method.name(),
+                protocol,
+                httpResponse.statusCode(),
+                httpResponse.statusText().orElse(null),
+                httpResponse.headers()
+                    .entrySet()
+                    .stream()
+                    .map(h -> new AbstractMap.SimpleEntry<String, String>(h.getKey(), Objects.toString(h.getValue())))
+                    .collect(Collectors.toList()),
+                contentType,
+                bodyStream
+            );
+        } else {
+            throw new TransportException("Unhandled endpoint type: '" + endpoint.getClass().getName() + "'");
         }
     }
 
@@ -617,6 +637,14 @@ private static <T> Optional<T> or(Optional<T> opt, Supplier<? extends Optional<?
         }
     }
 
+    private static ByteArrayInputStream toByteArrayInputStream(InputStream is) throws IOException {
+        // Optimization to avoid copying when applicable. `executeAsync` will produce `ByteArrayInputStream`.
+        if (is instanceof ByteArrayInputStream) {
+            return (ByteArrayInputStream) is;
+        }
+        return new ByteArrayInputStream(IoUtils.toByteArray(is));
+    }
+
     /**
      * Wrap the exception so the caller's signature shows up in the stack trace, taking care to copy the original type and message
      * where possible so async and sync code don't have to check different exceptions.

java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2GetRequestIT.java

@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.client.opensearch.integTest.aws;
+
+import java.util.concurrent.CompletableFuture;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.client.opensearch.OpenSearchAsyncClient;
+import org.opensearch.client.opensearch.OpenSearchClient;
+import org.opensearch.client.opensearch.core.*;
+
+public class AwsSdk2GetRequestIT extends AwsSdk2TransportTestCase {
+    @Test
+    public void testSyncGetRequest() throws Exception {
+        resetTestIndex(false);
+        final OpenSearchClient client = getClient(false, null, null);
+
+        SimplePojo doc1 = new SimplePojo("Document 1", "The text of document 1");
+        addDoc(client, "id1", doc1);
+
+        Thread.sleep(1000);
+
+        GetRequest doc1Request = new GetRequest.Builder().index(TEST_INDEX).id("id1").build();
+        GetResponse<SimplePojo> doc1Response = client.get(doc1Request, SimplePojo.class);
+        Assert.assertTrue(doc1Response.found());
+
+        GetRequest doc2Request = new GetRequest.Builder().index(TEST_INDEX).id("does-not-exist").build();
+        GetResponse<SimplePojo> doc2Response = client.get(doc2Request, SimplePojo.class);
+        Assert.assertFalse(doc2Response.found());
+    }
+
+    @Test
+    public void testAsyncGetRequest() throws Exception {
+        resetTestIndex(false);
+        final OpenSearchAsyncClient client = getAsyncClient(false, null, null);
+
+        SimplePojo doc1 = new SimplePojo("Document 1", "The text of document 1");
+        addDoc(client, "id1", doc1).join();
+
+        Thread.sleep(1000);
+
+        GetRequest doc1Request = new GetRequest.Builder().index(TEST_INDEX).id("id1").build();
+        CompletableFuture<GetResponse<SimplePojo>> doc1ResponseFuture = client.get(doc1Request, SimplePojo.class);
+
+        GetRequest doc2Request = new GetRequest.Builder().index(TEST_INDEX).id("does-not-exist").build();
+        CompletableFuture<GetResponse<SimplePojo>> doc2ResponseFuture = client.get(doc2Request, SimplePojo.class);
+
+        Assert.assertTrue(doc1ResponseFuture.join().found());
+        Assert.assertFalse(doc2ResponseFuture.join().found());
+    }
+}

java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SearchIT.java

@@ -16,7 +16,6 @@
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
-import org.opensearch.client.opensearch.core.IndexRequest;
 import org.opensearch.client.opensearch.core.IndexResponse;
 import org.opensearch.client.opensearch.core.SearchResponse;
 import org.opensearch.client.opensearch.indices.CreateIndexRequest;
@@ -105,22 +104,6 @@ void testClientAsync(boolean async) throws Exception {
         Assert.assertEquals(doc1, response.hits().hits().get(0).source());
     }
 
-    private void addDoc(OpenSearchClient client, String id, SimplePojo doc) throws Exception {
-        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
-        client.index(req.build());
-    }
-
-    private CompletableFuture<IndexResponse> addDoc(OpenSearchAsyncClient client, String id, SimplePojo doc) {
-        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
-        try {
-            return client.index(req.build());
-        } catch (Exception e) {
-            final CompletableFuture<IndexResponse> failed = new CompletableFuture<>();
-            failed.completeExceptionally(e);
-            return failed;
-        }
-    }
-
     @Test
     public void testDoubleWrappedException() throws Exception {
         // ensure the test index exists

java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2TransportTestCase.java

@@ -26,6 +26,8 @@
 import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
+import org.opensearch.client.opensearch.core.IndexRequest;
+import org.opensearch.client.opensearch.core.IndexResponse;
 import org.opensearch.client.opensearch.core.SearchRequest;
 import org.opensearch.client.opensearch.core.SearchResponse;
 import org.opensearch.client.opensearch.indices.CreateIndexRequest;
@@ -215,6 +217,22 @@ public void resetTestIndex(boolean async) throws Exception {
         client.create(req.build());
     }
 
+    protected void addDoc(OpenSearchClient client, String id, SimplePojo doc) throws Exception {
+        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
+        client.index(req.build());
+    }
+
+    protected CompletableFuture<IndexResponse> addDoc(OpenSearchAsyncClient client, String id, SimplePojo doc) {
+        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
+        try {
+            return client.index(req.build());
+        } catch (Exception e) {
+            final CompletableFuture<IndexResponse> failed = new CompletableFuture<>();
+            failed.completeExceptionally(e);
+            return failed;
+        }
+    }
+
     protected SearchResponse<SimplePojo> query(OpenSearchClient client, String title, String text) throws Exception {
         final Query query = Query.of(qb -> {
             if (title != null) {