[Workspace] Fix find saved object within a workspace without queryparams return all the saved objects #9420
Conversation
❌ Empty Changelog SectionThe Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section. |
❌ Empty Changelog SectionThe Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section. |
❌ Entry Too LongEntry is 111 characters long, which is 11 characters longer than the maximum allowed length of 100 characters. Please revise your entry to be within the maximum length. |
| ) | ||
| ); | ||
| }; | ||
|
|
There was a problem hiding this comment.
Just refactoring repeated code
FriedhelmWS
requested review from
ananzh,
kavilla,
AMoo-Miki,
ashwin-pc,
joshuarrrr,
abbyhu2000,
zengyan-amazon,
zhongnansu,
manasvinibs,
ZilongX,
Flyingliuhub,
curq,
bandinib-amzn,
SuZhou-Joe,
ruanyl,
BionIT,
xinruiba,
zhyuanqi,
mengweieric,
LDrago27 and
virajsanghvi
as code owners
FriedhelmWS
changed the title
| it('should handle workspace filtering', async () => { | ||
| registerFindRoute(router, Promise.resolve(managementService)); | ||
|
|
||
| req.query.workspaces = ['workspace1']; |
There was a problem hiding this comment.
nit: should we have a case for workspace is empty?
There was a problem hiding this comment.
I think the no workspace case is already been covered by the above "basic find" test case. For a find request without workspace filtering then the saved object is always opt-in so that it somehow pointless to explicitly test this case.
| workspaces: req.query.workspaces ? Array<string>().concat(req.query.workspaces) : undefined, | ||
| ...(req.query.workspaces | ||
| ? { | ||
| workspaces: Array<string>().concat(req.query.workspaces), | ||
| } | ||
| : {}), |
There was a problem hiding this comment.
We have another PR to fix the * issue: #9409. I think it should be fine for this PR to leave *.
Signed-off-by: Owen Wang <owenwyk@amazon.com>
Signed-off-by: Owen Wang <owenwyk@amazon.com>
Description
Given we have two workspaces (namely
firstandsecond), and each has a saved object.We retrieve the saved objects using the following URL (using workspace prefix but no query parameters):
/w/first/api/opensearch-dashboards/management/saved_objects/_find?type=index-patternPreviously, this request would return both saved objects because when no
workspacequery parameter was provided, our endpoint would passworkspace: undefinedto the actual query, bypassing the workspace check. As a result, the backend would return all saved objects even when the original request was made under thefirstworkspace context.This PR removes the logic of passing
workspace: undefinedwhen there is noworkspacequery parameter. Now, the wrapper for the_findendpoint automatically retrieves the current workspace context, ensuring the backend only returns saved objects associated with the current workspace.Issues Resolved
NA
Screenshot
NA
Testing the changes
Changelog
Check List
yarn test:jestyarn test:jest_integration