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

Feature branch sync up with main branch #2847

Conversation

RyanL1997
Copy link
Collaborator

Description

Feature branch sync up with main

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

ylwu-amzn and others added 20 commits May 25, 2023 11:31
…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]>
…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]>
…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]>
* 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]>
…w has one. (opensearch-project#2801)

This resolves "JAR hell" issues when installing the plugin.

Signed-off-by: Thomas Farr <[email protected]>
@RyanL1997 RyanL1997 marked this pull request as ready for review June 9, 2023 14:35
Signed-off-by: Stephen Crawford <[email protected]>
@DarshitChanpura
Copy link
Member

Are we still pushing changes to this branch?

@codecov
Copy link

codecov bot commented Jun 9, 2023

Codecov Report

Merging #2847 (d2a5e9d) into feature/extensions (56e77fe) will increase coverage by 0.16%.
The diff coverage is 71.62%.

❗ Current head d2a5e9d differs from pull request most recent head 9af7290. Consider uploading reports for the commit 9af7290 to get more accurate results

@@                   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     
Impacted Files Coverage Δ
.../main/java/com/amazon/dlic/auth/ldap/LdapUser.java 85.71% <ø> (ø)
...c/auth/ldap/backend/LDAPAuthenticationBackend.java 81.73% <ø> (ø)
...ic/auth/ldap/backend/LDAPAuthorizationBackend.java 57.81% <ø> (ø)
...on/dlic/auth/ldap2/LDAPAuthenticationBackend2.java 67.96% <ø> (ø)
.../dlic/auth/ldap2/LDAPConnectionFactoryFactory.java 57.46% <ø> (ø)
...a/org/opensearch/security/DefaultObjectMapper.java 64.55% <ø> (ø)
.../opensearch/security/OpenSearchSecurityPlugin.java 80.31% <ø> (ø)
.../action/configupdate/ConfigUpdateNodeResponse.java 77.27% <ø> (ø)
...tion/configupdate/TransportConfigUpdateAction.java 100.00% <ø> (ø)
.../security/action/whoami/TransportWhoAmIAction.java 33.33% <0.00%> (ø)
... and 107 more

... and 3 files with indirect coverage changes

@cwperks
Copy link
Member

cwperks commented Jun 9, 2023

@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.

@RyanL1997
Copy link
Collaborator Author

Are we still pushing changes to this branch?

Hi @DarshitChanpura. Yes this PR needs the formatting changes + library fix to run the test I think

Copy link
Member

@peternied peternied left a 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.

@cwperks
Copy link
Member

cwperks commented Jun 13, 2023

@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.

Copy link
Member

@peternied peternied left a 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.

@peternied peternied dismissed their stale review June 13, 2023 18:27

No longer impacting other changes

@RyanL1997
Copy link
Collaborator Author

Closing this one due to the merge of: #2854

@RyanL1997 RyanL1997 closed this Jun 13, 2023
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.

8 participants