feat: update backend to support MDS #190

raintygao · 2024-05-27T05:17:15Z

Description

Introduce DSM and DS as dependency
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

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

public/hooks/__tests__/use_conversations.test.ts

public/services/data_source_service.ts

wanglam · 2024-05-28T02:22:24Z

server/routes/chat_routes.ts

@@ -123,16 +146,20 @@ const feedbackRoute = {
    body: schema.object({
      satisfaction: schema.boolean(),
    }),
+    query: schema.object({
+      dataSourceId: schema.maybe(schema.string()),


Shall we add some UT for dataSourceId query passed?

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

Do you mean will be added in the following PRs?

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.

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

Signed-off-by: tygao <[email protected]>

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

public/chat_flyout.tsx

Signed-off-by: tygao <[email protected]>

opensearch-trigger-bot · 2024-05-30T06:32:10Z

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.

* init MDS Signed-off-by: tygao <[email protected]> * update backend to support mds Signed-off-by: tygao <[email protected]> * remove DSM in required plugins Signed-off-by: tygao <[email protected]> * doc: update changelog Signed-off-by: tygao <[email protected]> * test: update tests Signed-off-by: tygao <[email protected]> * update mock context Signed-off-by: tygao <[email protected]> * update core context mock Signed-off-by: tygao <[email protected]> * test: add tests for chat route Signed-off-by: tygao <[email protected]> * use await and update tests Signed-off-by: tygao <[email protected]> * Fix unit tests after getDataSourceQuery change Signed-off-by: Lin Wang <[email protected]> * remove useless DSM calling in flyout Signed-off-by: tygao <[email protected]> --------- Signed-off-by: tygao <[email protected]> Signed-off-by: Lin Wang <[email protected]> Co-authored-by: Lin Wang <[email protected]> (cherry picked from commit 0d6ce86) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

* init MDS Signed-off-by: tygao <[email protected]> * update backend to support mds Signed-off-by: tygao <[email protected]> * remove DSM in required plugins Signed-off-by: tygao <[email protected]> * doc: update changelog Signed-off-by: tygao <[email protected]> * test: update tests Signed-off-by: tygao <[email protected]> * update mock context Signed-off-by: tygao <[email protected]> * update core context mock Signed-off-by: tygao <[email protected]> * test: add tests for chat route Signed-off-by: tygao <[email protected]> * use await and update tests Signed-off-by: tygao <[email protected]> * Fix unit tests after getDataSourceQuery change Signed-off-by: Lin Wang <[email protected]> * remove useless DSM calling in flyout Signed-off-by: tygao <[email protected]> --------- Signed-off-by: tygao <[email protected]> Signed-off-by: Lin Wang <[email protected]> Co-authored-by: Lin Wang <[email protected]> (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 <[email protected]>

raintygao requested review from lezzago, joshuali925, anirudha, ruanyl, SuZhou-Joe, xluo-aws, gaobinlong, Hailong-am and wanglam as code owners May 27, 2024 05:17

raintygao added the backport 2.x Trigger the backport flow to 2.x label May 27, 2024

wanglam reviewed May 28, 2024

View reviewed changes

public/chat_flyout.tsx Outdated Show resolved Hide resolved

raintygao force-pushed the mds branch from f793753 to d1f9ce8 Compare May 28, 2024 03:56

wanglam approved these changes May 29, 2024

View reviewed changes

raintygao added 8 commits May 29, 2024 14:48

init MDS

1e5bb49

Signed-off-by: tygao <[email protected]>

update backend to support mds

cdbe89e

Signed-off-by: tygao <[email protected]>

remove DSM in required plugins

6dcb784

Signed-off-by: tygao <[email protected]>

doc: update changelog

030a1dd

Signed-off-by: tygao <[email protected]>

test: update tests

a22f741

Signed-off-by: tygao <[email protected]>

update mock context

86fbcaa

Signed-off-by: tygao <[email protected]>

update core context mock

fc4373a

Signed-off-by: tygao <[email protected]>

test: add tests for chat route

f836af3

Signed-off-by: tygao <[email protected]>

raintygao force-pushed the mds branch from 887bec6 to f836af3 Compare May 29, 2024 06:50

raintygao and others added 2 commits May 29, 2024 18:40

use await and update tests

47e476c

Signed-off-by: tygao <[email protected]>

Fix unit tests after getDataSourceQuery change

344c316

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

SuZhou-Joe reviewed May 30, 2024

View reviewed changes

public/chat_flyout.tsx Outdated Show resolved Hide resolved

SuZhou-Joe reviewed May 30, 2024

View reviewed changes

public/chat_flyout.tsx Outdated Show resolved Hide resolved

SuZhou-Joe approved these changes May 30, 2024

View reviewed changes

remove useless DSM calling in flyout

f217322

Signed-off-by: tygao <[email protected]>

raintygao merged commit 0d6ce86 into opensearch-project:main May 30, 2024
9 checks passed

opensearch-trigger-bot bot added the failed backport label May 30, 2024

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 mentioned this pull request Jun 3, 2024

[Backport 2.x] feat: update backend to support MDS #199

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: update backend to support MDS #190

feat: update backend to support MDS #190

raintygao commented May 27, 2024 •

edited

Loading

wanglam May 28, 2024

raintygao May 28, 2024

wanglam May 28, 2024

raintygao May 28, 2024

wanglam May 28, 2024

opensearch-trigger-bot bot commented May 30, 2024

feat: update backend to support MDS #190

feat: update backend to support MDS #190

Conversation

raintygao commented May 27, 2024 • edited Loading

Description

Issue resolved

Check List

wanglam May 28, 2024

Choose a reason for hiding this comment

raintygao May 28, 2024

Choose a reason for hiding this comment

wanglam May 28, 2024

Choose a reason for hiding this comment

raintygao May 28, 2024

Choose a reason for hiding this comment

wanglam May 28, 2024

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented May 30, 2024

raintygao commented May 27, 2024 •

edited

Loading