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

Refactor and update existing ml roles #4151

Merged
merged 14 commits into from
Mar 29, 2024
Merged

Conversation

b4sjoo
Copy link
Contributor

@b4sjoo b4sjoo commented Mar 20, 2024

Description

This PR refactor and update exisiting ml roles

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.

Signed-off-by: Sicheng Song <[email protected]>
@cwperks
Copy link
Member

cwperks commented Mar 21, 2024

@b4sjoo @ylwu-amzn @lezzago

If this PR and associated PR in security-dashboards-plugin are intended for 2.13 please mark this approved to signal to the security maintainers that it is good to go and also get signoff from @bbarani for inclusion in the release as this is post code freeze.

b4sjoo added 2 commits March 21, 2024 19:35
Signed-off-by: Sicheng Song <[email protected]>
config/roles.yml Show resolved Hide resolved
@peternied peternied dismissed their stale review March 21, 2024 20:13

Concerns about previous name are N/A as it never shipped.

b4sjoo added 7 commits March 22, 2024 05:08
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
@b4sjoo
Copy link
Contributor Author

b4sjoo commented Mar 22, 2024

@peternied @cwperks Hi security team, just want to let you know we are good to ship both this PR and the dashboard one. I am also going to notify @bbarani. In the meantime, you can either merge this one first and wait @bbarani to sign-off the 2.13 backport, or wait until his sign-off to merge it to mainline and backport.

@stephen-crawford stephen-crawford added backport 2.x backport to 2.x branch backport 2.13 backport to 2.13 branch labels Mar 22, 2024
stephen-crawford added a commit to stephen-crawford/security that referenced this pull request Mar 22, 2024
@stephen-crawford stephen-crawford changed the title Refactor and update exisiting ml roles Refactor and update existing ml roles Mar 22, 2024
stephen-crawford added a commit that referenced this pull request Mar 22, 2024
### Description
Manually backport #4151 and add DNFOF exception to fix tests. 

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Stephen Crawford <[email protected]>
@cwperks
Copy link
Member

cwperks commented Mar 22, 2024

FYI This has already been merged to 2.13, this will get merged to main and 2.x shortly but the merge to 2.13 was done first.

@peternied peternied removed the backport 2.13 backport to 2.13 branch label Mar 22, 2024
@cwperks cwperks merged commit ef72e4c into opensearch-project:main Mar 29, 2024
80 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-4151-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ef72e4c1e539a98a83dd9882e5f3d10d33ad3a2d
# Push it to GitHub
git push --set-upstream origin backport/backport-4151-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-4151-to-2.x.

dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
stephen-crawford added a commit to stephen-crawford/security that referenced this pull request Jul 15, 2024
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.

8 participants