Support multi data source in Region map #6654

junqiu-lei · 2024-04-26T16:00:26Z

Description

This PR adds the ability to use multi data source in Region maps. In API level, this PR contains updates for:

POST api/geospatial/_indices
POST api/geospatial/_search
POST api/geospatial/_mappings

Issues Resolved

Part of opensearch-project/dashboards-maps#584

Screenshot

Screen.Recording.2024-04-26.at.8.14.06.AM.mov

Testing the changes

Tests will be added in functional test repo in another PR

Changelog

skip

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

github-actions · 2024-04-26T16:01:01Z

ℹ️ Manual Changeset Creation Reminder

Please ensure manual commit for changeset file 6654.yml under folder changelogs/fragments to complete this PR.

If you want to use the available OpenSearch Changeset Bot App to avoid manual creation of changeset file you can install it in your forked repository following this link.

For more information about formatting of changeset files, please visit OpenSearch Auto Changeset and Release Notes Tool.

Signed-off-by: Junqiu Lei <[email protected]>

github-actions · 2024-04-26T16:03:46Z

❌ Changeset File Not Added Yet

Please ensure manual commit for changeset file 6654.yml under folder changelogs/fragments to complete this PR. File still missing.

github-actions · 2024-04-26T16:03:59Z

❌ Changeset File Not Added Yet

Please ensure manual commit for changeset file 6654.yml under folder changelogs/fragments to complete this PR. File still missing.

codecov · 2024-04-26T16:15:50Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.77%. Comparing base (857f8cb) to head (a9bf162).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6654      +/-   ##
==========================================
- Coverage   67.79%   67.77%   -0.03%     
==========================================
  Files        3413     3413              
  Lines       66755    66755              
  Branches    10861    10861              
==========================================
- Hits        45256    45240      -16     
- Misses      18856    18871      +15     
- Partials     2643     2644       +1

Flag	Coverage Δ
Linux_1	`33.18% <ø> (ø)`
Linux_2	`55.63% <ø> (ø)`
Linux_3	`?`
Linux_4	`34.91% <ø> (ø)`
Windows_1	`?`
Windows_2	`55.59% <ø> (ø)`
Windows_3	`45.25% <ø> (-0.02%)`	⬇️
Windows_4	`34.91% <ø> (ø)`

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.

BionIT

Do we have unit/integ tests for the changes?

junqiu-lei · 2024-04-26T16:40:33Z

Do we have unit/integ tests for the changes?

Will add integ tests in functional test repo.

Signed-off-by: Junqiu Lei <[email protected]> (cherry picked from commit fea8202) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

zhongnansu

left some comments

zhongnansu · 2024-04-26T17:09:09Z

src/plugins/region_map/server/routes/opensearch.ts

@@ -14,20 +14,28 @@ export function registerGeospatialRoutes(router: IRouter) {
        body: schema.object({
          index: schema.string(),
        }),
+        query: schema.maybe(schema.object({}, { unknowns: 'allow' })),


why we use { unknowns: 'allow' } here? isn't dataSourceId the only parameter allowed?

zhongnansu · 2024-04-26T17:17:33Z

src/plugins/region_map/server/routes/opensearch.ts

+      if (!req.query.dataSourceId) {
+        client = context.core.opensearch.client.asCurrentUser;
+      } else {
+        // @ts-ignore
+        client = await context.dataSource.opensearch.getClient(req.query.dataSourceId);
+      }


can we extract this to be a util function for reuse? I saw 3 places are uses this

Signed-off-by: Junqiu Lei <[email protected]> (cherry picked from commit fea8202) 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>

Signed-off-by: Junqiu Lei <[email protected]>

junqiu-lei requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, curq, bandinib-amzn, SuZhou-Joe, ruanyl, BionIT and xinruiba as code owners April 26, 2024 16:00

github-actions bot added the repeat-contributor label Apr 26, 2024

github-actions bot added the failed changeset label Apr 26, 2024

Support multi data source in Region map

a9bf162

Signed-off-by: Junqiu Lei <[email protected]>

junqiu-lei force-pushed the region-map-osd branch from a022dfe to a9bf162 Compare April 26, 2024 16:02

BionIT approved these changes Apr 26, 2024

View reviewed changes

github-actions bot added Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry and removed failed changeset labels Apr 26, 2024

BionIT added the backport 2.x label Apr 26, 2024

BionIT added the v2.14.0 label Apr 26, 2024

xinruiba approved these changes Apr 26, 2024

View reviewed changes

junqiu-lei mentioned this pull request Apr 26, 2024

Support multi data source in region map opensearch-project/dashboards-maps#614

Merged

BionIT merged commit fea8202 into opensearch-project:main Apr 26, 2024
72 of 74 checks passed

opensearch-trigger-bot bot mentioned this pull request Apr 26, 2024

[Backport 2.x] Support multi data source in Region map #6655

Merged

zhongnansu reviewed Apr 26, 2024

View reviewed changes

LDrago27 pushed a commit to LDrago27/OpenSearch-Dashboards that referenced this pull request Jun 3, 2024

Support multi data source in Region map (opensearch-project#6654)

b9b90a3

Signed-off-by: Junqiu Lei <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multi data source in Region map #6654

Support multi data source in Region map #6654

junqiu-lei commented Apr 26, 2024 •

edited by BionIT

Loading

github-actions bot commented Apr 26, 2024

github-actions bot commented Apr 26, 2024

github-actions bot commented Apr 26, 2024

codecov bot commented Apr 26, 2024 •

edited

Loading

BionIT left a comment

junqiu-lei commented Apr 26, 2024

zhongnansu left a comment

zhongnansu Apr 26, 2024

zhongnansu Apr 26, 2024

Support multi data source in Region map #6654

Support multi data source in Region map #6654

Conversation

junqiu-lei commented Apr 26, 2024 • edited by BionIT Loading

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

github-actions bot commented Apr 26, 2024

ℹ️ Manual Changeset Creation Reminder

github-actions bot commented Apr 26, 2024

❌ Changeset File Not Added Yet

github-actions bot commented Apr 26, 2024

❌ Changeset File Not Added Yet

codecov bot commented Apr 26, 2024 • edited Loading

Codecov Report

BionIT left a comment

Choose a reason for hiding this comment

junqiu-lei commented Apr 26, 2024

zhongnansu left a comment

Choose a reason for hiding this comment

zhongnansu Apr 26, 2024

Choose a reason for hiding this comment

zhongnansu Apr 26, 2024

Choose a reason for hiding this comment

junqiu-lei commented Apr 26, 2024 •

edited by BionIT

Loading

codecov bot commented Apr 26, 2024 •

edited

Loading