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

[Backport 2.x] Bug 5861 Fix: fix import api always display overwritten after importing saved objects, after this fix, the first time import will display new and after that will display overwritten if import the same objects #5891

Merged
merged 1 commit into from
Feb 20, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport d8aefae from #5871.

…ting saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects (#5871)

* bug fix 5861

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* clean unused parameters in test

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* bug fix 5861

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* clean unused parameters in test

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* fix failed UT

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* update CHANGELOG.md

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

* Update changelog message

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

---------

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
Signed-off-by: Yu Jin <112784385+yujin-emma@users.noreply.github.com>
(cherry picked from commit d8aefae)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
Copy link

codecov bot commented Feb 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (1f00735) 66.99% compared to head (cd4a21e) 66.98%.
Report is 1 commits behind head on 2.x.

Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #5891      +/-   ##
==========================================
- Coverage   66.99%   66.98%   -0.01%     
==========================================
  Files        3300     3300              
  Lines       63570    63567       -3     
  Branches    10137    10137              
==========================================
- Hits        42587    42582       -5     
- Misses      18523    18524       +1     
- Partials     2460     2461       +1     
Flag Coverage Δ
Linux_1 35.22% <ø> (ø)
Linux_2 55.15% <100.00%> (-0.01%) ⬇️
Linux_3 43.86% <0.00%> (+0.01%) ⬆️
Linux_4 35.34% <0.00%> (+<0.01%) ⬆️
Windows_1 35.25% <ø> (ø)
Windows_2 55.12% <100.00%> (-0.01%) ⬇️
Windows_3 43.87% <0.00%> (+<0.01%) ⬆️
Windows_4 35.34% <0.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Flyingliuhub Flyingliuhub merged commit 57200af into 2.x Feb 20, 2024
88 of 90 checks passed
@github-actions github-actions bot deleted the backport/backport-5871-to-2.x branch February 20, 2024 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut Skip the changelog verification check on backports multiple datasource multiple datasource project repeat-contributor v2.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants