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.

Sign up for GitHub

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

Jump to bottom

[MD] Fix server sider endpoint validation by passing in request when creating datasource client #6822

Merged
merged 2 commits into from
May 23, 2024
Merged

[MD] Fix server sider endpoint validation by passing in request when creating datasource client #6822

merged 2 commits into from
May 23, 2024

Conversation

zhongnansu
Copy link
Member

@zhongnansu zhongnansu commented May 23, 2024 •
edited
Loading

Description

  • Fix endpoint validation by passing in request when creating datasource client. Even tho request is an optional param, but there might be data source auth types registered that from external plugin, that will depend on the request. So we still need to pass it in when creating the client. Note that for existing MDS auth types, noauth, basic auth, sigV4, they don't depend on "request".
  • added test

Issues Resolved

Screenshot

Testing the changes

Changelog

  • fix: fix endpoint validation by passing in request when creating datasource client

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

opensearch-changeset-bot bot added a commit to zhongnansu/OpenSearch-Dashboards that referenced this pull request May 23, 2024
@opensearch-changeset-bot
Changeset file for PR opensearch-project#6822 created/updated
d33d6f3
@zhongnansu zhongnansu force-pushed the fix-endpoint-validation-request branch from d33d6f3 to 9bdba20 Compare May 23, 2024 18:32
@codecov Codecov
Copy link

codecov bot commented May 23, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.92%. Comparing base (972cf10) to head (b80b940).

Additional details and impacted files 
@@             Coverage Diff             @@
##             main    #6822       +/-   ##
===========================================
- Coverage   67.56%   56.92%   -10.64%     
===========================================
  Files        3428     3141      -287     
  Lines       67343    63342     -4001     
  Branches    10996    10378      -618     
===========================================
- Hits        45498    36059     -9439     
- Misses      19176    25045     +5869     
+ Partials     2669     2238      -431
Flag Coverage Δ
Linux_1 ?
Linux_2 ?
Linux_3 ?
Linux_4 ?
Windows_1 33.06% <ø> (ø)
Windows_2 ?
Windows_3 45.17% <100.00%> (+<0.01%) ⬆️
Windows_4 34.73% <ø> (ø)

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.

opensearch-changeset-bot bot added a commit to zhongnansu/OpenSearch-Dashboards that referenced this pull request May 23, 2024
@opensearch-changeset-bot
Changeset file for PR opensearch-project#6822 created/updated
41a9ca2
@zhongnansu
[MD] Fix endpoint validation by passing in request when creating data…
6d21e1c 
… source client

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
@zhongnansu zhongnansu force-pushed the fix-endpoint-validation-request branch from 41a9ca2 to 6d21e1c Compare May 23, 2024 18:54
@zhongnansu zhongnansu changed the title [MD] Fix endpoint validation by passing in request when creating datasource client [MD] Fix server sider endpoint validation by passing in request when creating datasource client May 23, 2024
@zhongnansu zhongnansu added multiple datasource multiple datasource project v2.15.0 labels May 23, 2024
zhyuanqi
zhyuanqi approved these changes May 23, 2024
View reviewed changes
Copy link
Collaborator

@zhyuanqi zhyuanqi left a comment

Choose a reason for hiding this comment

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

LGTM

virajsanghvi
virajsanghvi approved these changes May 23, 2024
View reviewed changes
src/plugins/data_source/server/saved_objects/data_source_saved_objects_client_wrapper.ts
@@ -290,6 +304,7 @@ export class DataSourceSavedObjectsClientWrapper {
savedObjects: {} as any,
cryptography: this.cryptography,
testClientDataSourceAttr: attributes as DataSourceAttributes,
request,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Assuming this.dataSourcesService.getDataSourceClient already supports this option being passed?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, it's an optional param tho

@zhongnansu zhongnansu merged commit 54b5eb5 into opensearch-project:main May 23, 2024
72 of 73 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 23, 2024
@github-actions
[MD] Fix server sider endpoint validation by passing in request when …
70e095c 
…creating datasource client (#6822)

* [MD] Fix endpoint validation by passing in request when creating data source client

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
(cherry picked from commit 54b5eb5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request May 23, 2024
Merged
zhongnansu pushed a commit that referenced this pull request May 28, 2024
@opensearch-trigger-bot @github-actions
[MD] Fix server sider endpoint validation by passing in request when …
9ff9d51 
…creating datasource client (#6822) (#6824)

* [MD] Fix endpoint validation by passing in request when creating data source client


(cherry picked from commit 54b5eb5)

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@BionIT BionIT mentioned this pull request Jun 3, 2024
Closed
45 tasks
LDrago27 pushed a commit to LDrago27/OpenSearch-Dashboards that referenced this pull request Jun 3, 2024
@zhongnansu @LDrago27
[MD] Fix server sider endpoint validation by passing in request when …
31209b7 
…creating datasource client (opensearch-project#6822)

* [MD] Fix endpoint validation by passing in request when creating data source client

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
@zhongnansu zhongnansu mentioned this pull request Jun 11, 2024
Merged
7 tasks
@zhongnansu zhongnansu added the bug Something isn't working label Jun 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@virajsanghvi virajsanghvi virajsanghvi approved these changes

@zhyuanqi zhyuanqi zhyuanqi approved these changes

@ZilongX ZilongX ZilongX approved these changes

@ananzh ananzh Awaiting requested review from ananzh ananzh is a code owner

@kavilla kavilla Awaiting requested review from kavilla kavilla is a code owner

@AMoo-Miki AMoo-Miki Awaiting requested review from AMoo-Miki AMoo-Miki is a code owner

@ashwin-pc ashwin-pc Awaiting requested review from ashwin-pc ashwin-pc is a code owner

@joshuarrrr joshuarrrr Awaiting requested review from joshuarrrr joshuarrrr is a code owner

@abbyhu2000 abbyhu2000 Awaiting requested review from abbyhu2000 abbyhu2000 is a code owner

@zengyan-amazon zengyan-amazon Awaiting requested review from zengyan-amazon zengyan-amazon is a code owner

@manasvinibs manasvinibs Awaiting requested review from manasvinibs manasvinibs is a code owner

@Flyingliuhub Flyingliuhub Awaiting requested review from Flyingliuhub Flyingliuhub is a code owner

@curq curq Awaiting requested review from curq curq is a code owner

@bandinib-amzn bandinib-amzn Awaiting requested review from bandinib-amzn bandinib-amzn is a code owner

@SuZhou-Joe SuZhou-Joe Awaiting requested review from SuZhou-Joe SuZhou-Joe is a code owner

@ruanyl ruanyl Awaiting requested review from ruanyl ruanyl is a code owner

@BionIT BionIT Awaiting requested review from BionIT BionIT is a code owner

@xinruiba xinruiba Awaiting requested review from xinruiba xinruiba is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

Assignees
No one assigned
Labels
backport 2.x bug Something isn't working distinguished-contributor multiple datasource multiple datasource project v2.15.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zhongnansu @virajsanghvi @zhyuanqi @ZilongX