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 with getDefaultDataSourceId$ #197

Merged

Conversation

wanglam
Copy link
Collaborator

@wanglam wanglam commented Jun 3, 2024

Description

Refactor default data source with getDefaultDataSource$ in dataSourceManagement.

Issues Resolved

A part of #192

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test.
  • New functionality has user manual doc added.
  • 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.

@wanglam wanglam added backport 2.x Trigger the backport flow to 2.x v2.15.0 labels Jun 3, 2024
Signed-off-by: Lin Wang <[email protected]>
@wanglam wanglam marked this pull request as ready for review June 3, 2024 07:14
@wanglam wanglam merged commit ec49168 into opensearch-project:main Jun 3, 2024
19 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/dashboards-assistant/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-assistant/backport-2.x
# Create a new branch
git switch --create backport/backport-197-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ec49168d4e896d9abcde85b583f6aeec44994542
# Push it to GitHub
git push --set-upstream origin backport/backport-197-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-assistant/backport-2.x

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

@wanglam wanglam added backport 2.x Trigger the backport flow to 2.x and removed failed backport backport 2.x Trigger the backport flow to 2.x labels Jun 3, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 3, 2024
* Refactor with getDefaultDataSourceId$

Signed-off-by: Lin Wang <[email protected]>

* Update change log

Signed-off-by: Lin Wang <[email protected]>

---------

Signed-off-by: Lin Wang <[email protected]>
(cherry picked from commit ec49168)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
wanglam pushed a commit that referenced this pull request Jun 3, 2024
* Refactor with getDefaultDataSourceId$

Signed-off-by: Lin Wang <[email protected]>

* Update change log

Signed-off-by: Lin Wang <[email protected]>

---------

Signed-off-by: Lin Wang <[email protected]>
(cherry picked from commit ec49168)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Trigger the backport flow to 2.x v2.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants