Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error deserialization with AwsSdk2Transport (#1068) #1072

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

workmanw
Copy link
Contributor

@workmanw workmanw commented Jul 10, 2024

This adds a failing test for Fix for #1068

Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Xtansia @reta mind taking a quick look at this one?

CHANGELOG.md Outdated Show resolved Hide resolved
@workmanw workmanw force-pushed the issue-1068-failed-test branch from 55ec878 to 6f2ec50 Compare July 17, 2024 00:43
@@ -617,6 +633,22 @@ private static <T> Optional<T> or(Optional<T> opt, Supplier<? extends Optional<?
}
}

private static ByteArrayInputStream toByteArrayInputStream(InputStream is) throws IOException {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not crazy about this solution, but it's effectively what ApacheHttpClient5Transport is doing by using BufferedHttpEntity.

Xtansia
Xtansia previously approved these changes Jul 17, 2024
Copy link
Collaborator

@Xtansia Xtansia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes all look reasonable to me and in-line with the HttpClient5 transport's behaviour

reta
reta previously approved these changes Jul 17, 2024
@Xtansia Xtansia merged commit 5ec233d into opensearch-project:main Jul 17, 2024
55 of 56 checks passed
@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Jul 17, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 17, 2024
Signed-off-by: Wesley Workman <[email protected]>
(cherry picked from commit 5ec233d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Xtansia pushed a commit that referenced this pull request Jul 17, 2024
(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>
@workmanw workmanw changed the title Add failing test for GetRequest w/ AwsSdk2Transport (#1068) Fix error deserialization with AwsSdk2Transport (#1068) Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants