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

Feature: force merge #608

Merged
merged 28 commits into from
Feb 22, 2023
Merged

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Feb 12, 2023

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
@SuZhou-Joe SuZhou-Joe requested a review from a team February 12, 2023 06:31
@SuZhou-Joe SuZhou-Joe self-assigned this Feb 12, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 12, 2023

Codecov Report

Merging #608 (cf7d5a4) into 2.x (307c986) will increase coverage by 0.13%.
The diff coverage is n/a.

❗ Current head cf7d5a4 differs from pull request most recent head 5daba34. Consider uploading reports for the commit 5daba34 to get more accurate results

📣 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             @@
##              2.x     #608      +/-   ##
==========================================
+ Coverage   59.67%   59.81%   +0.13%     
==========================================
  Files         268      274       +6     
  Lines        8863     9040     +177     
  Branches     1618     1564      -54     
==========================================
+ Hits         5289     5407     +118     
- Misses       3180     3219      +39     
- Partials      394      414      +20     
Impacted Files Coverage Δ
.../pages/Indices/containers/IndicesActions/index.tsx 86.84% <0.00%> (-2.35%) ⬇️
...onents/FormGenerator/built_in_components/index.tsx 70.00% <0.00%> (-0.84%) ⬇️
...ement-dashboards-plugin/public/pages/Main/Main.tsx 6.02% <0.00%> (-0.31%) ⬇️
...gement-dashboards-plugin/public/utils/constants.ts 95.23% <0.00%> (ø)
.../ForceMerge/components/IndexSelect/IndexSelect.tsx 84.84% <0.00%> (ø)
...pages/ForceMerge/components/SwitchNumber/index.tsx 33.33% <0.00%> (ø)
...-plugin/public/pages/ForceMerge/utils/constants.ts 100.00% <0.00%> (ø)
...ges/ForceMerge/container/ForceMerge/ForceMerge.tsx 67.79% <0.00%> (ø)
...MergeAdvancedOptions/ForceMergeAdvancedOptions.tsx 50.00% <0.00%> (ø)
...rds-plugin/public/pages/ForceMerge/utils/helper.ts 68.00% <0.00%> (ø)

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

Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
Signed-off-by: suzhou <suzhou@amazon.com>
@Angie-Zhang Angie-Zhang added v2.x and removed v2.6.0 labels Feb 21, 2023
@Angie-Zhang
Copy link

Replaced label v2.6.0 with v2.x due to the 2.6.0 release code cut off.

@SuZhou-Joe SuZhou-Joe merged commit a7a2ad9 into opensearch-project:2.x Feb 22, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

SuZhou-Joe added a commit to SuZhou-Joe/index-management-dashboards-plugin that referenced this pull request Feb 22, 2023
* temp: save

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add validator

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add cypress test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: try to get cypress test start

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: force merge optimize

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify toast message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add debounce

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: make unit test run

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify id

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add readonly detect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: protect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: use the specific reason when force merge failed

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

---------

Signed-off-by: suzhou <suzhou@amazon.com>
(cherry picked from commit a7a2ad9)
SuZhou-Joe added a commit that referenced this pull request Feb 22, 2023
* temp: save

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add validator

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add cypress test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: try to get cypress test start

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: force merge optimize

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify toast message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add debounce

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: make unit test run

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify id

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add readonly detect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: protect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: use the specific reason when force merge failed

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

---------

Signed-off-by: suzhou <suzhou@amazon.com>
(cherry picked from commit a7a2ad9)
SuZhou-Joe added a commit to SuZhou-Joe/index-management-dashboards-plugin that referenced this pull request Feb 22, 2023
* temp: save

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add validator

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add cypress test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: try to get cypress test start

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: force merge optimize

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify toast message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add debounce

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update validation

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update unit test

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: make unit test run

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: modify id

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: remove useless code

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update message

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: add readonly detect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: protect

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: use the specific reason when force merge failed

Signed-off-by: suzhou <suzhou@amazon.com>

* feat: update

Signed-off-by: suzhou <suzhou@amazon.com>

---------

Signed-off-by: suzhou <suzhou@amazon.com>
(cherry picked from commit a7a2ad9)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants