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 2.x] [Extensions] Add ExtensionAwarePlugin extension point to add custom settings for extensions (#7526) #7756

Merged
merged 3 commits into from
May 25, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented May 25, 2023

Backport of #7526 to 2.x

This backport also includes changes from #6922

…ettings for extensions (opensearch-project#7526)

* WIP on extension settings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use getExtensionSettings from the identity service

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add extension scoped settings and add area for additional settings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Run spotlessApply

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Re-run CI

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* spotlessApply

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Change contructor to take list of additionalSettings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* One constructor

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove isAuthenticated

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Re-run CI

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Re-run CI

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Create ExtensionAwarePlugin extension point

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Compute additionalSettingsKeys outside of loop

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add comment

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 277eb3d)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented May 25, 2023

Codecov Report

Merging #7756 (996649f) into 2.x (540e80f) will decrease coverage by 0.09%.
The diff coverage is 84.90%.

@@             Coverage Diff              @@
##                2.x    #7756      +/-   ##
============================================
- Coverage     70.63%   70.54%   -0.09%     
+ Complexity    56439    56401      -38     
============================================
  Files          4663     4665       +2     
  Lines        267648   267683      +35     
  Branches      39637    39640       +3     
============================================
- Hits         189048   188842     -206     
- Misses        62270    62583     +313     
+ Partials      16330    16258      -72     
Impacted Files Coverage Δ
server/src/main/java/org/opensearch/node/Node.java 85.85% <0.00%> (-0.73%) ⬇️
...a/org/opensearch/plugins/ExtensionAwarePlugin.java 0.00% <0.00%> (ø)
...a/org/opensearch/extensions/ExtensionsManager.java 57.07% <97.36%> (+4.19%) ⬆️
...n/java/org/opensearch/common/settings/Setting.java 86.21% <100.00%> (+0.01%) ⬆️
...opensearch/extensions/ExtensionScopedSettings.java 100.00% <100.00%> (ø)
.../org/opensearch/extensions/ExtensionsSettings.java 45.45% <100.00%> (+2.05%) ⬆️
...g/opensearch/extensions/NoopExtensionsManager.java 62.50% <100.00%> (ø)

... and 475 files with indirect coverage changes

@reta reta merged commit 1451380 into opensearch-project:2.x May 25, 2023
29 checks passed
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.

None yet

2 participants