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

Fix datasource conntection failure #6648

Merged
merged 2 commits into from
Apr 26, 2024

Conversation

zhyuanqi
Copy link
Collaborator

@zhyuanqi zhyuanqi commented Apr 26, 2024

Description

Fix datasource conntection failure introduced by 0c114ce#diff-a01a6007a1a466a29810fbf0689bc607c3c3dfc9d3f7713da9bbf653beb92ef8R176

Screenshot

Screenshot 2024-04-25 at 8 15 52 PM

Changelog

  • fix: Fix datasource test connect error

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Copy link

codecov bot commented Apr 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.74%. Comparing base (0c114ce) to head (008454f).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6648      +/-   ##
==========================================
- Coverage   67.79%   67.74%   -0.06%     
==========================================
  Files        3413     3413              
  Lines       66755    66755              
  Branches    10861    10861              
==========================================
- Hits        45256    45221      -35     
- Misses      18856    18885      +29     
- Partials     2643     2649       +6     
Flag Coverage Δ
Linux_1 33.18% <ø> (ø)
Linux_2 55.63% <ø> (ø)
Linux_3 45.26% <ø> (+<0.01%) ⬆️
Linux_4 34.91% <ø> (ø)
Windows_1 ?
Windows_2 ?
Windows_3 ?
Windows_4 ?

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.

Copy link
Contributor

@yujin-emma yujin-emma left a comment

Choose a reason for hiding this comment

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

Thanks for the fix

@zhongnansu zhongnansu merged commit b29d90e into opensearch-project:main Apr 26, 2024
68 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 26, 2024
* Fix datasource conntection failure

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>

* Changeset file for PR #6648 created/updated

---------

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit b29d90e)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
zhongnansu pushed a commit that referenced this pull request Apr 26, 2024
* Fix datasource conntection failure

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>

* Changeset file for PR #6648 created/updated

---------

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit b29d90e)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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

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

@ZilongX
Copy link
Collaborator

ZilongX commented Apr 26, 2024

@zhyuanqi auto backport failed to 2.x and we'll need a manual backport for this one

@ZilongX
Copy link
Collaborator

ZilongX commented Apr 26, 2024

thanks @zhongnansu for taking care of the backport !

zhongnansu pushed a commit to zhongnansu/OpenSearch-Dashboards that referenced this pull request Apr 26, 2024
* Fix datasource conntection failure

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>

* Changeset file for PR opensearch-project#6648 created/updated

---------

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit b29d90e)
BionIT pushed a commit that referenced this pull request Apr 26, 2024
* Fix datasource conntection failure

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>

* Changeset file for PR #6648 created/updated

---------

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit b29d90e)

Co-authored-by: Yuanqi(Ella) Zhu <53279298+zhyuanqi@users.noreply.github.com>
LDrago27 pushed a commit to LDrago27/OpenSearch-Dashboards that referenced this pull request Jun 3, 2024
* Fix datasource conntection failure

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>

* Changeset file for PR opensearch-project#6648 created/updated

---------

Signed-off-by: Yuanqi(Ella) Zhu <zhyuanqi@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
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.

None yet

6 participants