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

Add auto backport functionality to security plugin #887

Merged

Conversation

hsiang9431-amzn
Copy link
Contributor

@hsiang9431-amzn hsiang9431-amzn commented Jan 8, 2022

Signed-off-by: Jason hsiang@amazon.com

opensearch-project/security-dashboards-plugin pull request intake form

Please provide as much details as possible to get feedback/acceptance on your PR quickly

  1. Category: (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

  2. Github Issue # or road-map entry, if available:
    Add auto backport functionality to backport PRs for releases #869

  3. Description of changes:
    The documentation of how this tool used to automate backporting provides more info.

  4. Why these changes are required?

  5. What is the old behavior before changes and new behavior after changes? (Please add any example/logs/screen-shot if available)

  6. Testing done: (Please provide details of testing done: Unit testing, integration testing and manual testing)

  7. TO-DOs, if any: (Please describe pending items and provide Github issues# for each of them)

  8. Is it backport from main branch? (If yes, please add backport PR # and commits #)

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

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.

@hsiang9431-amzn hsiang9431-amzn requested a review from a team January 8, 2022 00:37
davidlago
davidlago previously approved these changes Jan 8, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jan 8, 2022

Codecov Report

Merging #887 (304fc30) into main (c8063f5) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #887   +/-   ##
=======================================
  Coverage   71.98%   71.98%           
=======================================
  Files          87       87           
  Lines        1906     1906           
  Branches      242      242           
=======================================
  Hits         1372     1372           
  Misses        480      480           
  Partials       54       54           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c8063f5...304fc30. Read the comment docs.

Signed-off-by: Jason <hsiang@amazon.com>
name: Backport
on:
pull_request:
types:
Copy link
Member

@cliu123 cliu123 Jan 12, 2022

Choose a reason for hiding this comment

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

Do all PRs merged into main branch need to be backported?

Choose a reason for hiding this comment

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

Not all of them. This means that the backport functionality gets triggered with every merge to main, but the PRs also need to be specially tagged for the actual backport to work (tagged as backport-xxx where xxx is the destination branch)

Copy link
Member

Choose a reason for hiding this comment

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

I see. Added the link to the documentation in the PR description to provide more related information. Thanks @davidlago for the answer!
Has this Github Action been tested?

Choose a reason for hiding this comment

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

We're about to test it here when this PR merges

Copy link
Member

Choose a reason for hiding this comment

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

If I remember correctly, This new Github action won't take effective until this PR getting merged to main branch.
Can we test it on the fork before merging? I told @nsri19 yesterday how to test CI/CD changes on fork for one of her PRs. It would be better to test it before merging to main

Copy link
Member

Choose a reason for hiding this comment

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

For example, this PR was tested with this run before merging to main branch.

@davidlago davidlago merged commit 5930611 into opensearch-project:main Jan 13, 2022
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.

4 participants