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

Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above) #7550

Merged
merged 2 commits into from
May 16, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented May 12, 2023

Description

Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above)

Related Issues

Resolves #7549

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@reta
Copy link
Collaborator Author

reta commented May 12, 2023

@andrross @dblock curious what do you think folks, @martin-gaievski @ylwu-amzn fyi

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testIndexCreateBlockIsRemovedWhenAnyNodesNotExceedHighWatermarkWithAutoReleaseEnabled

@codecov
Copy link

codecov bot commented May 12, 2023

Codecov Report

Merging #7550 (a82198b) into main (e44b3f1) will increase coverage by 0.09%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #7550      +/-   ##
============================================
+ Coverage     70.47%   70.57%   +0.09%     
- Complexity    59728    59764      +36     
============================================
  Files          4896     4896              
  Lines        286798   286810      +12     
  Branches      41331    41331              
============================================
+ Hits         202133   202426     +293     
+ Misses        68078    67705     -373     
- Partials      16587    16679      +92     
Impacted Files Coverage Δ
.../opensearch/common/xcontent/cbor/CborXContent.java 83.33% <100.00%> (+3.33%) ⬆️
.../opensearch/common/xcontent/json/JsonXContent.java 100.00% <100.00%> (ø)
...pensearch/common/xcontent/smile/SmileXContent.java 89.47% <100.00%> (+1.97%) ⬆️
.../opensearch/common/xcontent/yaml/YamlXContent.java 87.50% <100.00%> (+2.88%) ⬆️

... and 518 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta force-pushed the issue-7549 branch 3 times, most recently from 02a3321 to 14be00c Compare May 12, 2023 20:56
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

reta added 2 commits May 15, 2023 08:48
…date to Jackson 2.15.0 and above)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta requested a review from andrross May 16, 2023 13:16
@martin-gaievski
Copy link
Member

@andrross could you please review again, seems that Andriy (reta) has been addressed your previous comments? This change should unblock several plugins that are blocked by jackson 2.15 upgrade

@andrross andrross added the backport 2.x Backport to 2.x branch label May 16, 2023
@andrross andrross merged commit 03e41e3 into opensearch-project:main May 16, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 16, 2023
…date to Jackson 2.15.0 and above) (#7550)

* Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 03e41e3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@andrross
Copy link
Member

@reta Sorry I missed this prior to merging, but since this introduces a new setting for cluster operators I think this merits a changelog entry. What do you think?

@reta
Copy link
Collaborator Author

reta commented May 16, 2023

@reta Sorry I missed this prior to merging, but since this introduces a new setting for cluster operators I think this merits a changelog entry. What do you think?

I will do that (in a moment) and also include the documentation issue, thank you

andrross added a commit that referenced this pull request May 16, 2023
…aints (after update to Jackson 2.15.0 and above) (#7584)

* Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above) (#7550)

* Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 03e41e3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Add changelog entry from #7587

Signed-off-by: Andrew Ross <andrross@amazon.com>

* Lift the XContent parsing constraint limits to preserve backward compatibility

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
stephen-crawford pushed a commit to stephen-crawford/OpenSearch that referenced this pull request May 31, 2023
…date to Jackson 2.15.0 and above) (opensearch-project#7550)

* Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…date to Jackson 2.15.0 and above) (opensearch-project#7550)

* Provide mechanism to configure XContent parsing constraints (after update to Jackson 2.15.0 and above)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants