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

Switch to maven to download plugin snapshots #1331

Merged

Conversation

peternied
Copy link
Member

@peternied peternied commented Feb 16, 2023

Description

The Security Plugin publishing snapshots of its build through maven. Switching from the distribution build to these maven based artifacts.

Note; The security plugin does not publish these artifacts for version 1.x so this change should not be backported.

Issues Resolved

Testing

This change is tested through GitHub Actions associated with this project

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: Peter Nied <petern@amazon.com>
@peternied peternied requested a review from a team February 16, 2023 19:21
@cwperks
Copy link
Member

cwperks commented Feb 16, 2023

@peternied Should the backport 2.x label be added?

@codecov-commenter
Copy link

Codecov Report

Merging #1331 (e8fd257) into main (8e9c4b7) will not change coverage.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff           @@
##             main    #1331   +/-   ##
=======================================
  Coverage   71.78%   71.78%           
=======================================
  Files          88       88           
  Lines        2027     2027           
  Branches      274      274           
=======================================
  Hits         1455     1455           
  Misses        509      509           
  Partials       63       63           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.


- name: Rename the Plugin Files
run: mv opensearch-security-${{ inputs.plugin-version }}.zip opensearch-security.zip
- run: |
Copy link
Collaborator

@RyanL1997 RyanL1997 Feb 16, 2023

Choose a reason for hiding this comment

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

Could we add a name for this task, so that it is easy to track in the terminal. The rest looks good to me!

@peternied peternied added the backport 2.x backport to 2.x branch label Feb 16, 2023
@peternied peternied merged commit a039441 into opensearch-project:main Feb 16, 2023
@peternied peternied deleted the download-plugin-via-maven branch February 16, 2023 20:56
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 16, 2023
Signed-off-by: Peter Nied <petern@amazon.com>
(cherry picked from commit a039441)
peternied added a commit that referenced this pull request Feb 16, 2023
Signed-off-by: Peter Nied <petern@amazon.com>
(cherry picked from commit a039441)

Co-authored-by: Peter Nied <petern@amazon.com>
@peternied peternied added backport 1.3 backport 1.x backport to 1.x branch labels Feb 28, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 28, 2023
Signed-off-by: Peter Nied <petern@amazon.com>
(cherry picked from commit a039441)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1331-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a0394415cd0f3cefad39c4cac9f7c9d6c23a62d1
# Push it to GitHub
git push --set-upstream origin backport/backport-1331-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

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

@peternied peternied mentioned this pull request Mar 7, 2023
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport to 1.x branch backport 1.3 backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Consume latest security zip from snapshots instead of distribution build
5 participants