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

OnBehalfOf tokens odds and ends #3593

Merged
merged 4 commits into from
Oct 27, 2023

Conversation

peternied
Copy link
Member

Description

I was doing some inspection around the OBO feature and noticed some items to clean up.

Testing

Unit + Integration tests

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.

I was doing some inspection around the OBO feature and noticed some
items to clean up.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
@codecov
Copy link

codecov bot commented Oct 24, 2023

Codecov Report

Merging #3593 (eb1b555) into main (9c25cfe) will increase coverage by 43.97%.
The diff coverage is 0.00%.

❗ Current head eb1b555 differs from pull request most recent head 413b2a2. Consider uploading reports for the commit 413b2a2 to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##             main    #3593       +/-   ##
===========================================
+ Coverage        0   43.97%   +43.97%     
- Complexity      0     2502     +2502     
===========================================
  Files           0      283      +283     
  Lines           0    20621    +20621     
  Branches        0     3391     +3391     
===========================================
+ Hits            0     9068     +9068     
- Misses          0    10368    +10368     
- Partials        0     1185     +1185     
Files Coverage Δ
...g/opensearch/security/authtoken/jwt/JwtVendor.java 30.30% <0.00%> (ø)
...y/action/onbehalf/CreateOnBehalfOfTokenAction.java 24.39% <0.00%> (ø)

... and 281 files with indirect coverage changes

Copy link
Collaborator

@RyanL1997 RyanL1997 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @peternied , thanks for making these changes. Here are some comments:

@peternied
Copy link
Member Author

FYI - I've got some merge conflicts and test failures to look into.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@DarshitChanpura DarshitChanpura merged commit 9e26b15 into opensearch-project:main Oct 27, 2023
56 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3593-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9e26b15dd8d00150bed000afa9a2519e155236d2
# Push it to GitHub
git push --set-upstream origin backport/backport-3593-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3593-to-2.x.

RyanL1997 pushed a commit to RyanL1997/security that referenced this pull request Nov 2, 2023
I was doing some inspection around the OBO feature and noticed some
items to clean up.

Signed-off-by: Peter Nied <petern@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants