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 ActionGroup REST API test and partial fix #4166 #4371

Merged
merged 3 commits into from
May 30, 2024

Conversation

willyborankin
Copy link
Collaborator

@willyborankin willyborankin commented May 28, 2024

Description

Changes:

Issues Resolved

#4166 - only for action groups

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.

The test was moved into DefaultApiAvailabilityIntegrationTest

Signed-off-by: Andrey Pleskach <[email protected]>
@willyborankin willyborankin force-pushed the refactor-tests#5 branch 2 times, most recently from 1bdb553 to 02f5e0f Compare May 28, 2024 12:54
@willyborankin willyborankin changed the title Refactor ActionGroup test and patially fix #4166 Refactor ActionGroup REST API test and patially fix #4166 May 28, 2024
Copy link

codecov bot commented May 28, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 65.37%. Comparing base (f71d2e6) to head (02f5e0f).
Report is 3 commits behind head on main.

Current head 02f5e0f differs from pull request most recent head 8f536a5

Please upload reports for the commit 8f536a5 to get more accurate results.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4371      +/-   ##
==========================================
- Coverage   65.43%   65.37%   -0.06%     
==========================================
  Files         310      310              
  Lines       21992    21993       +1     
  Branches     3554     3554              
==========================================
- Hits        14391    14379      -12     
- Misses       5830     5842      +12     
- Partials     1771     1772       +1     
Files Coverage Δ
.../security/dlic/rest/api/ActionGroupsApiAction.java 67.44% <0.00%> (-30.18%) ⬇️

@DarshitChanpura DarshitChanpura changed the title Refactor ActionGroup REST API test and patially fix #4166 Refactor ActionGroup REST API test and partially fix #4166 May 28, 2024
@willyborankin willyborankin changed the title Refactor ActionGroup REST API test and partially fix #4166 Refactor ActionGroup REST API test and partial fix #4166 May 28, 2024
Signed-off-by: Andrey Pleskach <[email protected]>
Changes:

- Moved ActionGroupsApiTest into ActionGroupsRestApiIntegrationTest
- Partially fixed issue opensearch-project#4166 for action groups only

Signed-off-by: Andrey Pleskach <[email protected]>
@willyborankin
Copy link
Collaborator Author

Added a new issue which is related to action group type #4374

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label May 29, 2024
@DarshitChanpura
Copy link
Member

@willyborankin The changes look good to me. I will add my approval once the pending comment is resolved.

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 @willyborankin. I've opened an issue for discussion around static field. Approving this PR as this a non-blocker and can be addressed in a follow-up PR if needed.

@willyborankin willyborankin merged commit e455aa1 into opensearch-project:main May 30, 2024
79 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-4371-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e455aa1c3e02b322531a16b940e1f70d23ea0092
# Push it to GitHub
git push --set-upstream origin backport/backport-4371-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-4371-to-2.x.

@willyborankin willyborankin deleted the refactor-tests#5 branch June 14, 2024 19:00
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.

3 participants