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

feat: update backend to support MDS #190

Merged
merged 11 commits into from
May 30, 2024
Merged

Conversation

raintygao
Copy link
Collaborator

@raintygao raintygao commented May 27, 2024

Description

  1. Introduce DSM and DS as dependency
  2. update router and controller to support MDS

There will be another PR about integrating in frontend and depend on opensearch-project/OpenSearch-Dashboards#6827

Issue resolved

#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.

public/components/feedback_modal.tsx Outdated Show resolved Hide resolved
public/hooks/__tests__/use_conversations.test.ts Outdated Show resolved Hide resolved
public/services/data_source_service.ts Outdated Show resolved Hide resolved
@@ -123,16 +146,20 @@ const feedbackRoute = {
body: schema.object({
satisfaction: schema.boolean(),
}),
query: schema.object({
dataSourceId: schema.maybe(schema.string()),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shall we add some UT for dataSourceId query passed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We could add UT for data source specifically, for now this PR is depended by other PRs, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do you mean will be added in the following PRs?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I remember that you wanted this PR being merged ASAP, if not, we could try to add tests in this PR to make this fully.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you can added them first. At least we need to verify the route handler called getOpenSearchClientTransport with passed data source id.

public/chat_flyout.tsx Outdated Show resolved Hide resolved
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
raintygao and others added 2 commits May 29, 2024 18:40
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
public/chat_flyout.tsx Outdated Show resolved Hide resolved
public/chat_flyout.tsx Outdated Show resolved Hide resolved
Signed-off-by: tygao <tygao@amazon.com>
@raintygao raintygao merged commit 0d6ce86 into opensearch-project:main May 30, 2024
9 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-190-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0d6ce86b742b50b3a0cc0cd8a1a609ced1d59895
# Push it to GitHub
git push --set-upstream origin backport/backport-190-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-190-to-2.x.

@raintygao raintygao added backport 2.x Trigger the backport flow to 2.x and removed 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
* init MDS

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

* update backend to support mds

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

* remove DSM in required plugins

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

* doc: update changelog

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

* test: update tests

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

* update mock context

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

* update core context mock

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

* test: add tests for chat route

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

* use await and update tests

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

* Fix unit tests after getDataSourceQuery change

Signed-off-by: Lin Wang <wonglam@amazon.com>

* remove useless DSM calling in flyout

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

---------

Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 0d6ce86)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
raintygao added a commit that referenced this pull request Jun 3, 2024
* init MDS

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

* update backend to support mds

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

* remove DSM in required plugins

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

* doc: update changelog

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

* test: update tests

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

* update mock context

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

* update core context mock

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

* test: add tests for chat route

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

* use await and update tests

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

* Fix unit tests after getDataSourceQuery change

Signed-off-by: Lin Wang <wonglam@amazon.com>

* remove useless DSM calling in flyout

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

---------

Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 0d6ce86)
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>
Co-authored-by: tygao <tygao@amazon.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 failed backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants