Staging for version increment automation

[prudhvigodithi]

Signed-off-by: pgodithi pgodithi@amazon.com

Description

This is the staging PR for to execute workflows that auto raise the version increment PR's
Example: prudhvigodithi#2

• Category: Enhancement

Issues Resolved

Part of: opensearch-project/opensearch-build#1375
From solution: opensearch-project/opensearch-build#1375 (comment)
Related issue: #1930

Is this a backport? If so, please add backport PR # and/or commits #

Testing

Example: prudhvigodithi#2

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.

[prudhvigodithi]

Referred old 2.x version increment PR: #1881
@dblock @bbarani

[codecov-commenter]

Codecov Report

Merging #1932 (8c9a499) into main (be876c0) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1932      +/-   ##
============================================
+ Coverage     61.00%   61.01%   +0.01%     
- Complexity     3233     3234       +1     
============================================
  Files           256      256              
  Lines         18088    18088              
  Branches       3224     3224              
============================================
+ Hits          11035    11037       +2     
+ Misses         5470     5467       -3     
- Partials       1583     1584       +1     

Impacted Files	Coverage Δ
...a/org/opensearch/security/tools/SecurityAdmin.java	37.31% <0.00%> (-0.25%)	⬇️
...nsearch/security/dlic/rest/api/AuditApiAction.java	68.08% <0.00%> (+4.25%)	⬆️
...ecurity/configuration/StaticResourceException.java	25.00% <0.00%> (+25.00%)	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us.

[peternied]

Before we merge this change should have a test to ensure its functionality.

[peternied]

Please add a test for this, see example tests in https://github.com/opensearch-project/security/blob/main/.github/workflows/ci.yml#L124

[prudhvigodithi]

Added @peternied can you please check.
Thank you

[peternied]

This executes the command, but doesn't verify any outcome.

What do you think about adding a execution of the gradle task assemble, check the artifact is version X, then run the versionIncrement task, then assemble and check its version X+1

[prudhvigodithi]

Renaming to task updateVersion following opensearch-project/opensearch-plugin-template-java#32.

[DarshitChanpura]

This looks good. I agree with Peter's ask on testing to verify whether this change would work, if it is possible.

[peternied]

@prudhvigodithi Do you need any help with this?

[prudhvigodithi]

@prudhvigodithi Do you need any help with this?

Hey @peternied I should be pushing the requested change by end of today, just got pulled away from this :)

[prudhvigodithi]

Hey @peternied and @DarshitChanpura I have updated the CI workflow running the task updateVersion with an increment of existing majorVersion + 1. Please check
Thank you
https://github.com/opensearch-project/security/runs/7512662131?check_suite_focus=true
@bbarani @peterzhuamazon

[bbarani]

@davidlago @peternied @DarshitChanpura Can you please review this PR soon?

[peternied]

Thanks!

[DarshitChanpura]

Thank you @prudhvigodithi !

[DarshitChanpura]

Thank you @prudhvigodithi !

[opensearch-trigger-bot]

The backport to 2.0 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-1932-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 235d25672139c0663b422c3f7a2354e0250f23b0
# Push it to GitHub
git push --set-upstream origin backport/backport-1932-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport/backport-1932-to-2.0.

[opensearch-trigger-bot]

The backport to 2.1 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.1 2.1
# Navigate to the new working tree
cd .worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-1932-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 235d25672139c0663b422c3f7a2354e0250f23b0
# Push it to GitHub
git push --set-upstream origin backport/backport-1932-to-2.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.1

Then, create a pull request where the base branch is 2.1 and the compare/head branch is backport/backport-1932-to-2.1.

[prudhvigodithi]

Hey @peternied I see the following PR is closed #1933, but this change is not backported to 1.x (1.3) branches, can you please take a look?

Thank you

[opensearch-trigger-bot]

The backport to 1.3 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-1932-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 235d25672139c0663b422c3f7a2354e0250f23b0
# Push it to GitHub
git push --set-upstream origin backport/backport-1932-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-1932-to-1.3.

[peternied]

@prudhvigodithi Could you double check #2029 and make sure it will work as expected?