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

Manually Backporting 1779 to 2.x #1796

Merged

Conversation

matthewryanwells
Copy link
Contributor

@matthewryanwells matthewryanwells commented Jun 28, 2023

Description

Manually backporting #1779 into 2.x as a few of the IT tests failed due to a small difference in the getContentType method

Issues Resolved

Automatic backport to 2.x failing

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

…xt (opensearch-project#1779)

* Fix CI (opensearch-project#1760)

* Fix ML-commons missing dependency.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Fix `mockito` dependency.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Revert changes in `:opensearch` since it is not needed anymore.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

---------

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Matthew Wells <matthew.wells@improving.com>

* Fix CSV/RAW outputting wrong format (#279)

* Fixed bug where CSV/RAW outputs as JSON rather than plain text

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

---------

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
(cherry picked from commit 1ec696d)
Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Signed-off-by: Matthew Wells <matthew.wells@improving.com>
@codecov
Copy link

codecov bot commented Jun 28, 2023

Codecov Report

Merging #1796 (093dc43) into 2.x (e9a009b) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                2.x    #1796      +/-   ##
============================================
+ Coverage     97.34%   97.35%   +0.01%     
- Complexity     4409     4443      +34     
============================================
  Files           388      388              
  Lines         10940    10996      +56     
  Branches        773      784      +11     
============================================
+ Hits          10649    10705      +56     
  Misses          284      284              
  Partials          7        7              
Flag Coverage Δ
sql-engine 97.35% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...rotocol/response/format/FlatResponseFormatter.java 100.00% <100.00%> (ø)
...rotocol/response/format/JsonResponseFormatter.java 100.00% <100.00%> (ø)

... and 10 files with indirect coverage changes

Signed-off-by: Matthew Wells <matthew.wells@improving.com>
@Yury-Fridlyand Yury-Fridlyand merged commit 63e317b into opensearch-project:2.x Jun 28, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the backport/backport-1779-to-2.x branch June 28, 2023 21:45
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.

5 participants