-
Notifications
You must be signed in to change notification settings - Fork 282
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
Feature branch sync up with main branch #2847
Feature branch sync up with main branch #2847
Conversation
Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
…w has one. (opensearch-project#2801) This resolves "JAR hell" issues when installing the plugin. Signed-off-by: Thomas Farr <[email protected]>
…ject#2808) * [FEATURE] usage of JWKS with JWT (w/o OpenID connect) Signed-off-by: Sebastian Michalski <[email protected]> * Change issuer to audience Signed-off-by: Craig Perkins <[email protected]> * Switch to OCT_2 and use String instead of var Signed-off-by: Craig Perkins <[email protected]> * Only check required issuer and required audience if set Signed-off-by: Craig Perkins <[email protected]> * Fix test cases Signed-off-by: Craig Perkins <[email protected]> * Remove unused import Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Sebastian Michalski <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: Sebastian Michalski <[email protected]>
* Isolate spotless config changes Signed-off-by: Craig Perkins <[email protected]> * update dlic/auth package style Signed-off-by: Stephen Crawford <[email protected]> * Update formatterConfig.xml --------- Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Stephen Crawford <[email protected]> Co-authored-by: Craig Perkins <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
…search-project#2823) * rebase Signed-off-by: Stephen Crawford <[email protected]> * Update java style under **/auth Signed-off-by: Stephen Crawford <[email protected]> * Update Util dir Signed-off-by: Stephen Crawford <[email protected]> * readd formatting Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]>
* Match version of zstd-jni from core Signed-off-by: Craig Perkins <[email protected]> * Add zstd version from core to force resolutions section Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]>
…security/m* (opensearch-project#2826) * Update Sec/action to Sec/Filter Signed-off-by: Stephen Crawford <[email protected]> * Update Security/* Signed-off-by: Stephen Crawford <[email protected]> * Update Security/* and test/opensearch/security/* Signed-off-by: Stephen Crawford <[email protected]> * Half sec test changes Signed-off-by: Stephen Crawford <[email protected]> * Half sec test changes Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]>
* Update test/security/s* java files Signed-off-by: Stephen Crawford <[email protected]> * Update test/security/s* java files Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]>
…#2837) * Update test/security/s* java files Signed-off-by: Stephen Crawford <[email protected]> * Update test/security/s* java files Signed-off-by: Stephen Crawford <[email protected]> * Update all tests under security Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
…ject#2808) * [FEATURE] usage of JWKS with JWT (w/o OpenID connect) Signed-off-by: Sebastian Michalski <[email protected]> * Change issuer to audience Signed-off-by: Craig Perkins <[email protected]> * Switch to OCT_2 and use String instead of var Signed-off-by: Craig Perkins <[email protected]> * Only check required issuer and required audience if set Signed-off-by: Craig Perkins <[email protected]> * Fix test cases Signed-off-by: Craig Perkins <[email protected]> * Remove unused import Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Sebastian Michalski <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: Sebastian Michalski <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
* Match version of zstd-jni from core Signed-off-by: Craig Perkins <[email protected]> * Add zstd version from core to force resolutions section Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
…w has one. (opensearch-project#2801) This resolves "JAR hell" issues when installing the plugin. Signed-off-by: Thomas Farr <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
Are we still pushing changes to this branch? |
Codecov Report
@@ Coverage Diff @@
## feature/extensions #2847 +/- ##
========================================================
+ Coverage 61.49% 61.66% +0.16%
- Complexity 3428 3441 +13
========================================================
Files 269 269
Lines 19096 19124 +28
Branches 3327 3330 +3
========================================================
+ Hits 11744 11793 +49
+ Misses 5740 5720 -20
+ Partials 1612 1611 -1
|
@RyanL1997 I am seeing some differences after I did a merge from main -> feature/extensions and resolved conflicts. The file count on this https://github.com/opensearch-project/security/compare/feature/extensions...cwperks:format-feature-extensions-apply?expand=1 is different from this PR. I checked out your branch and did a merge of main -> this branch and had to resolve the same conflicts from merging main into the branch in the link above. |
Hi @DarshitChanpura. Yes this PR needs the formatting changes + library fix to run the test I think |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets please hold off on these changes , I've still got outstanding commits for this branch that I'd like to land before we pull in all the style changes.
@peternied When can this change be merged into the feature branch? Its pretty stale at this point and not only needs the formatting changes, but other build breaking fixes as well. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm no longer impacted by this changes getting merged. Please use rebase and merge
instead of squash and merge
via the GitHub UX so it makes it easier to manage the changes.
Closing this one due to the merge of: #2854 |
Description
Feature branch sync up with main
Check List
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.