-
Notifications
You must be signed in to change notification settings - Fork 963
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
Make createWorkspaceIndexPatterns to handle no default cluster and clean up #9129
Conversation
be7e799
to
c7dfa6c
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9129 +/- ##
=======================================
Coverage 60.90% 60.90%
=======================================
Files 3808 3808
Lines 91196 91196
Branches 14400 14400
=======================================
+ Hits 55544 55546 +2
+ Misses 32097 32096 -1
+ Partials 3555 3554 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
@@ -3,11 +3,11 @@ | |||
* SPDX-License-Identifier: Apache-2.0 | |||
*/ | |||
|
|||
import { MiscUtils } from '@opensearch-dashboards-test/opensearch-dashboards-test-library'; | |||
import { WORKSPACE_NAME, DATASOURCE_NAME } from './constants'; | |||
import { WORKSPACE_NAME, DATASOURCE_NAME } from '../../../../../utils/apps/constants'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be '../../../../../utils/apps/query_enhancements/constants'
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I put export * from './query_enhancements/constants';
in the apps constants. Should be good.
// wait until delete is done | ||
cy.getElementByTestId('headerApplicationTitle').should('be.visible'); | ||
} | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the associated index.d.ts
can be deleted
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good call. will update.
import { SECONDARY_ENGINE } from '../../../../../utils/constants'; | ||
|
||
const miscUtils = new MiscUtils(cy); | ||
const randomString = Math.random().toString(36).substring(7); | ||
const workspace = `${WORKSPACE_NAME}-${randomString}`; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIt: Could you elaborate more why we need a random workspace name here? Seems we still using a fixed workspace name for other cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have our CI/CD tests running in parallel, and if there are tests running concurrently and using the same backend, this can lead to conflicts (for example, one instance deletes a workspace, while another was still running tests for that workspace). We decided that randomizing the workspace name will prevent these edge cases from happening, and we plan on randomizing other test suites as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it is for future CI/CD.
a0774f3
to
b7b52c3
Compare
…ean up Signed-off-by: Anan <[email protected]>
b7b52c3
to
05a6e0d
Compare
The backport to
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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-9129-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 698bcec68d5b3ede65fa1c9ebe2c28f37b3d479d
# Push it to GitHub
git push --set-upstream origin backport/backport-9129-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x Then, create a pull request where the |
…ean up (opensearch-project#9129) * Make createWorkspaceIndexPatterns to handle no default cluster and clean up Signed-off-by: Anan <[email protected]> * Changeset file for PR opensearch-project#9129 created/updated --------- Signed-off-by: Anan <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
…ing backports (#9261) * [Discover] Makes caching dataset options optional (#8799) * [Discover] Makes caching dataset options optional. * Adds unit test * Changeset file for PR #8799 created/updated * Update test Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla <[email protected]> * Upgrade Cypress to v12 (#8995) * Update Cypress to v12 (#8926) * Update cypress to v12 Signed-off-by: Daniel Rowe <[email protected]> * Add required e2e.js Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #8926 created/updated * Update license header Signed-off-by: Daniel Rowe <[email protected]> * Update license in e2e.js Signed-off-by: Daniel Rowe <[email protected]> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * fix: support imports without extensions in cypress webpack build (#8993) * fix: support imports without extensions in cypress webpack build Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #8993 created/updated * use typescript config Signed-off-by: Daniel Rowe <[email protected]> * fix lint Signed-off-by: Daniel Rowe <[email protected]> * disable new test isolation feature This isolation was causing regressions Signed-off-by: Daniel Rowe <[email protected]> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [Discover Test] TestID-69: Filtering. Add data-test-subj tags. (#9027) * Update Cypress to v12 (#8926) * Update cypress to v12 Signed-off-by: Daniel Rowe <[email protected]> * Add required e2e.js Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #8926 created/updated * Update license header Signed-off-by: Daniel Rowe <[email protected]> * Update license in e2e.js Signed-off-by: Daniel Rowe <[email protected]> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * fix: support imports without extensions in cypress webpack build (#8993) * fix: support imports without extensions in cypress webpack build Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #8993 created/updated * use typescript config Signed-off-by: Daniel Rowe <[email protected]> * fix lint Signed-off-by: Daniel Rowe <[email protected]> * disable new test isolation feature This isolation was causing regressions Signed-off-by: Daniel Rowe <[email protected]> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * Add data-test-subj tags. Signed-off-by: Argus Li <[email protected]> --------- Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Argus Li <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * Migrate query enhancement tests from functional repo to main (#9048) * migrate query enhacenement tests Signed-off-by: abbyhu2000 <[email protected]> * ignore lint in data files Signed-off-by: abbyhu2000 <[email protected]> * remove yarn lock changes Signed-off-by: abbyhu2000 <[email protected]> * add changelog Signed-off-by: abbyhu2000 <[email protected]> --------- Signed-off-by: abbyhu2000 <[email protected]> * Add missing data-test-subj tags for discover plugin (#9049) * Add data-test-subj for discover Signed-off-by: Anan Zhuang <[email protected]> * fix comment Signed-off-by: Anan Zhuang <[email protected]> --------- Signed-off-by: Anan Zhuang <[email protected]> * Add missing data-test-subj tags for data plugin (#9051) * Add missing data-test-subj tags for data plugin * Update Snapshots * Fix as per the comments --------- Signed-off-by: Suchit Sahoo <[email protected]> Co-authored-by: Anan Zhuang <[email protected]> * Follow up on #9048 by updating data and utilities (#9060) * Follow up on #9048 by updating data and utilities Feature branch PRs: #9038 #9006 Signed-off-by: Anan <[email protected]> * fix comment Signed-off-by: Anan <[email protected]> * update path and add utility from suchit commit Signed-off-by: Anan <[email protected]> * update the path to run sample test Signed-off-by: Anan <[email protected]> * fix PR comments Signed-off-by: Anan <[email protected]> * skip tests before enable workspace Signed-off-by: Anan <[email protected]> --------- Signed-off-by: Anan <[email protected]> * refactor some query-enhancement utility functions, add some missing typings (#9074) * refactor some query-enhancement utility functions, add some missing typings Signed-off-by: Justin Kim <[email protected]> * Changeset file for PR #9074 created/updated --------- Signed-off-by: Justin Kim <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * add queryEditorLanguageOptions data-test-subj on language_selector.tsx (#9029) Signed-off-by: Federico Silva <[email protected]> Co-authored-by: Federico Silva <[email protected]> * Re-enable dataset_selector.spec.js and queries.spec.js under workspace (#9082) * Re-enable dataset_selector.spec.js and queries.spec.js under workspace Signed-off-by: Anan <[email protected]> * fix comment Signed-off-by: Anan <[email protected]> * add verifyHitCount for PPL Signed-off-by: Anan <[email protected]> * Changeset file for PR #9082 created/updated --------- Signed-off-by: Anan <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * Make createWorkspaceIndexPatterns to handle no default cluster and clean up (#9129) * Make createWorkspaceIndexPatterns to handle no default cluster and clean up Signed-off-by: Anan <[email protected]> * Changeset file for PR #9129 created/updated --------- Signed-off-by: Anan <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * add data-test-subj (#9135) Signed-off-by: Federico Silva <[email protected]> * [Discover] Adding Cypress Tests for S3 Datasets (#9113) * [Discover 2.0 Testing] Create Filtering Test (TestId-69: Filtering) (#9119) * Add test for filtering functionality for discover, which enables query enhancement * Make test more robust: Add logic to use date picker start and end buttons if set to absolute times. Check the table length directly instead of number of hits to avoid bug where not all results load. --------- Signed-off-by: Argus Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * Add tests for saved search creation and loading for query enhancement (#9112) * Add tests for saved search creation and loading for query enhancement * click on a random element before typing on query editor to bypass the popover that appears * address pr comments - refactor to create saved search as an api call * address pr comments - specifically navigate to discover page before setting datasource Signed-off-by: Justin Kim <[email protected]> --------- Signed-off-by: Justin Kim <[email protected]> Signed-off-by: Anan Zhuang <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Anan Zhuang <[email protected]> * fix: 0 rendered in discover when there are no results (#9153) * fix: 0 rendered in discover when there are no results Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #9153 created/updated --------- Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [Cypress][Fix] Update saved search utilities (#9151) * update saved search * minor refactor4 on setDatePickerDatesAndSearchIfRelevant Signed-off-by: Justin Kim <[email protected]> --------- Signed-off-by: Justin Kim <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * chore: use relative paths in cypress (#9079) * chore: use relative paths in cypress when we move to running tests in parallel we won't be able to use a single hardcoded basepath as these can differ by tasks Signed-off-by: Daniel Rowe <[email protected]> * Changeset file for PR #9079 created/updated --------- Signed-off-by: Daniel Rowe <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [Discover 2.0 Testing] Create View List of Saved Queries Test (Test-Id 124: View list of Saved query) (#9166) * add spec for old ui Signed-off-by: Argus Li <[email protected]> * Add comment about cleaning up saved queries Signed-off-by: Argus Li <[email protected]> * Add data-test-subj for save query new ui Signed-off-by: Argus Li <[email protected]> * Add data-test-subj for save query button for new ui Signed-off-by: Argus Li <[email protected]> * Add data-test-subj for open query button in query management popover Signed-off-by: Argus Li <[email protected]> * Add new ui spec to test list saved queries Signed-off-by: Argus Li <[email protected]> * Fix DataSource url Signed-off-by: Argus Li <[email protected]> * Changeset file for PR #9166 created/updated * Address Justin's comments. Signed-off-by: Argus Li <[email protected]> * Remove final force. Signed-off-by: Argus Li <[email protected]> * Fix final force. Signed-off-by: Argus Li <[email protected]> * Move utils to Suchit's suggested location, fix comments Signed-off-by: Argus Li <[email protected]> * Rename specs, change cypress workflow to use new save query ui, merge old ui and new ui commands Signed-off-by: Argus Li <[email protected]> * fix import Signed-off-by: Argus Li <[email protected]> --------- Signed-off-by: Argus Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * change casing to folder structures to be compliant with our rules (#9197) Signed-off-by: Justin Kim <[email protected]> * [Fix] Saved Search Integ Test Update: update saving a new saved search test spec (#9200) * wait for the page to be loaded before loading a saved search * when loading a saved search and saving it as a new saved search, use a different name Signed-off-by: Justin Kim <[email protected]> --------- Signed-off-by: Justin Kim <[email protected]> * refactor query enhancement tests (#9208) Signed-off-by: Justin Kim <[email protected]> * chore: change casing of data-logs to be compliant with our git hook rules (#9220) Signed-off-by: Justin Kim <[email protected]> * chore: remove unused/redundant functions from field_display_filtering utils (#9219) Signed-off-by: Justin Kim <[email protected]> * Create cypress command namespacing util (#9150) * update cy.createInitialWorkspaceWithDataSource -> cy.osd.createInitialWorkspaceWithDataSource (#9262) Signed-off-by: Justin Kim <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Daniel Rowe <[email protected]> Signed-off-by: Argus Li <[email protected]> Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: Anan Zhuang <[email protected]> Signed-off-by: Suchit Sahoo <[email protected]> Signed-off-by: Anan <[email protected]> Signed-off-by: Justin Kim <[email protected]> Signed-off-by: Federico Silva <[email protected]> Signed-off-by: Federico Silva <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: Argus Li <[email protected]> Co-authored-by: Daniel Rowe <[email protected]> Co-authored-by: Qingyang(Abby) Hu <[email protected]> Co-authored-by: Suchit Sahoo <[email protected]> Co-authored-by: Justin Kim <[email protected]> Co-authored-by: Federico Silva <[email protected]> Co-authored-by: Federico Silva <[email protected]> Co-authored-by: Federico Silva <[email protected]> Co-authored-by: Sean Li <[email protected]> Co-authored-by: d rowe <[email protected]>
Description
Make createWorkspaceIndexPatterns to handle no default cluster and clean up
Issues Resolved
NA
Screenshot
NA
Changelog
Check List
yarn test:jest
yarn test:jest_integration