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.

Sign up for GitHub

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

Jump to bottom

[Backport 2.x] Add support for dependencies in plugin descriptor properties with semver range #11441 #12271

Merged
merged 1 commit into from
Feb 9, 2024
Merged

[Backport 2.x] Add support for dependencies in plugin descriptor properties with semver range #11441 #12271

merged 1 commit into from
Feb 9, 2024

Conversation

abseth-amzn
Copy link
Contributor

@abseth-amzn abseth-amzn commented Feb 9, 2024 •
edited
Loading

Description

Backport #11441 to 2.x.
Following are the additional changes:

  1. Updated PluginInfo version check for serialization of semver range list to use V_2_13_0.
  2. Updated PluginInfo version check of Version.V_1_1_0 for custom folder name and related test.
  3. Resolved minor conflicts in ListPluginsCommandTests.java

Related Issues

Resolves #1707

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024 •
edited
Loading

Compatibility status:

Checks if related components are compatible with change c82c6e1

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/sql.git]

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

❌ Gradle check result for c59fd0b: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@abseth-amzn
Add support for dependencies in plugin descriptor properties with sem…
c82c6e1 
…ver range (opensearch-project#11441)

* Add support for dependencies in plugin descriptor properties with semver range (opensearch-project#1707)

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Remove unused gson licenses

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Maintain bwc in PluginInfo with addition of semver range

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Added support for list of ranges

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Add bwc tests and restrict range list size to 1

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Update SemverRange javadoc

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Minor change to trigger jenkins re-run

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Use jackson instead of gson

* Remove jackson databind and annotations dependency from server

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* nit fixes

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

* Minor change to re-run jenkins workflow

Signed-off-by: Abhilasha Seth <abseth@amazon.com>

---------

Signed-off-by: Abhilasha Seth <abseth@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

❌ Gradle check result for c82c6e1: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@abseth-amzn
Copy link
Contributor Author

abseth-amzn commented Feb 9, 2024 •
edited
Loading

Flaky tests
Tests with failures:

This was referenced Feb 9, 2024
Merged
Merged
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

❕ Gradle check result for c82c6e1: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@codecov Codecov
Copy link

codecov bot commented Feb 9, 2024

Codecov Report

Attention: 18 lines in your changes are missing coverage. Please review.

Comparison is base (a98f719) 71.19% compared to head (c82c6e1) 71.17%.

Files Patch % Lines
...c/main/java/org/opensearch/semver/SemverRange.java 76.92% 9 Missing ⚠️
...c/main/java/org/opensearch/plugins/PluginInfo.java 78.57% 5 Missing and 4 partials ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x   #12271      +/-   ##
============================================
- Coverage     71.19%   71.17%   -0.02%     
- Complexity    59951    59969      +18     
============================================
  Files          4940     4944       +4     
  Lines        282025   282117      +92     
  Branches      41306    41321      +15     
============================================
+ Hits         200790   200809      +19     
- Misses        64249    64374     +125     
+ Partials      16986    16934      -52

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dblock dblock merged commit db4c6f4 into opensearch-project:2.x Feb 9, 2024
32 checks passed
@abseth-amzn abseth-amzn mentioned this pull request Feb 18, 2024
Closed
4 tasks
@peternied peternied mentioned this pull request Feb 29, 2024
Closed
@Xtansia Xtansia mentioned this pull request Mar 3, 2024
Closed
@Xtansia
Copy link
Contributor

Xtansia commented Mar 3, 2024

@abseth-amzn This is resulting in a breaking change within 2.x as GET /_cluster/stats and GET /_nodes both contain the PluginInfo object in their response bodies, and the opensearch_version field has changed from a string to an array.

@dblock dblock mentioned this pull request Mar 4, 2024
Closed
@dblock
Copy link
Member

dblock commented Mar 4, 2024

I opened #12528, @abseth-amzn will you please take a look?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reta reta reta approved these changes

@dblock dblock dblock approved these changes

@abbashus abbashus Awaiting requested review from abbashus

@adnapibar adnapibar Awaiting requested review from adnapibar

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@kartg kartg Awaiting requested review from kartg

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@tlfeng tlfeng Awaiting requested review from tlfeng

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@abseth-amzn @Xtansia @dblock @reta