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

[Backport 1.x] Remove deprecated escape_utils, and test fixes #87

Conversation

BrianHawley
Copy link
Contributor

Description

Fixes tests in 1.x by backporting fixes from 2.0.x.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@BrianHawley BrianHawley requested review from a team and robsears as code owners July 1, 2022 20:55
Copy link
Collaborator

@VachaShah VachaShah left a comment

Choose a reason for hiding this comment

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

Thank you @BrianHawley for backporting these fixes!

@BrianHawley
Copy link
Contributor Author

@dblock maybe you can review this?

@dblock dblock merged commit 2539921 into opensearch-project:backport/backport-76-to-1.x Jul 6, 2022
VachaShah pushed a commit that referenced this pull request Jul 6, 2022
* Faraday 2 support for opensearch-transport 2 (#76)

* Faraday 2 support for opensearch-transport 2

- Support Faraday 1.x and 2.x in opensearch-transport.
- Made client autodetection not break if the detected HTTP client is
  there but the associated Faraday adapter is not.
- Made the test setup require the referenced adapters.
- Made it more clear in the README that Faraday uses adapters.

[Fixes #59]

Signed-off-by: Brian Hawley <[email protected]>

* Additional requested fixes

- The Ruby < 2.7, Faraday 2+, and Typhoeus combination doesn't work.
  Adjusted the README and test setup accordingly.
- Fix the MiniTest transport test setup.
- Add extra opensearch-transport tests to the matrix for Faraday 1.

Signed-off-by: Brian Hawley <[email protected]>

* More requested fixes

- Use Gem::Version comparison.
- Fix the faraday-typhoeus links.

Signed-off-by: Brian Hawley <[email protected]>

* More fixes and requested changes

- Move the Faraday 1 tests to their own job.
- Don't reference faraday-typhoeus during Faraday 1 tests.
- Use ENV.key?('FARADAY_VERSION').

Signed-off-by: Brian Hawley <[email protected]>

* Make the version checks backwards compatible

Signed-off-by: Brian Hawley <[email protected]>
(cherry picked from commit 60840f7)

* [Backport 1.x] Remove deprecated escape_utils, and test fixes (#87)

* Remove deprecated escape_utils. (#74)

Signed-off-by: Brian Hawley <[email protected]>

* Backport test fixes from 2.0

Signed-off-by: Brian Hawley <[email protected]>

Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>

Co-authored-by: Brian Hawley <[email protected]>
Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants