From bf5d04122441ce1b4de3258cde240138400c9da2 Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Wed, 15 Jan 2025 14:29:35 -0800 Subject: [PATCH 1/4] change casing to folder structures to be compliant with our rules Signed-off-by: Justin Kim --- .../apps/query_enhancements/a_check.spec.js | 0 .../apps/query_enhancements/dataset_selector.spec.js | 0 .../apps/query_enhancements/field_display_filtering.spec.js | 0 .../apps/query_enhancements/queries.spec.js | 0 .../apps/query_enhancements/s3_dataset.spec.js | 0 .../apps/query_enhancements/saved_search.spec.js | 0 .../apps/query_enhancements/utils/field_display_filtering.js | 0 .../apps/query_enhancements/utils/saved_search.js | 0 .../{with-security => with_security}/check_advanced_settings.js | 0 .../{with-security => with_security}/check_default_page.js | 0 .../{with-security => with_security}/check_filter_and_query.js | 0 .../{with-security => with_security}/check_loaded_data.js | 0 .../{with-security => with_security}/check_timeline.js | 0 .../{with-security => with_security}/helpers/generate_data.js | 0 .../{with-security => with_security}/plugins/.gitignore | 0 .../check_advanced_settings.js | 0 .../{without-security => without_security}/check_default_page.js | 0 .../check_filter_and_query.js | 0 .../{without-security => without_security}/check_loaded_data.js | 0 .../{without-security => without_security}/check_timeline.js | 0 .../helpers/generate_data.js | 0 .../{without-security => without_security}/plugins/.gitignore | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/a_check.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/dataset_selector.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/field_display_filtering.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/queries.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/s3_dataset.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/saved_search.spec.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/utils/field_display_filtering.js (100%) rename cypress/integration/{core-opensearch-dashboards/opensearch-dashboards => core_opensearch_dashboards/opensearch_dashboards}/apps/query_enhancements/utils/saved_search.js (100%) rename cypress/integration/{with-security => with_security}/check_advanced_settings.js (100%) rename cypress/integration/{with-security => with_security}/check_default_page.js (100%) rename cypress/integration/{with-security => with_security}/check_filter_and_query.js (100%) rename cypress/integration/{with-security => with_security}/check_loaded_data.js (100%) rename cypress/integration/{with-security => with_security}/check_timeline.js (100%) rename cypress/integration/{with-security => with_security}/helpers/generate_data.js (100%) rename cypress/integration/{with-security => with_security}/plugins/.gitignore (100%) rename cypress/integration/{without-security => without_security}/check_advanced_settings.js (100%) rename cypress/integration/{without-security => without_security}/check_default_page.js (100%) rename cypress/integration/{without-security => without_security}/check_filter_and_query.js (100%) rename cypress/integration/{without-security => without_security}/check_loaded_data.js (100%) rename cypress/integration/{without-security => without_security}/check_timeline.js (100%) rename cypress/integration/{without-security => without_security}/helpers/generate_data.js (100%) rename cypress/integration/{without-security => without_security}/plugins/.gitignore (100%) diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/a_check.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/a_check.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/a_check.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/a_check.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/dataset_selector.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/dataset_selector.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/dataset_selector.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/dataset_selector.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/field_display_filtering.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/field_display_filtering.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/queries.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/queries.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/s3_dataset.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/s3_dataset.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/s3_dataset.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/s3_dataset.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/saved_search.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/saved_search.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/saved_search.spec.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/saved_search.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/field_display_filtering.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/field_display_filtering.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/field_display_filtering.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/field_display_filtering.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/saved_search.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/saved_search.js rename to cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js diff --git a/cypress/integration/with-security/check_advanced_settings.js b/cypress/integration/with_security/check_advanced_settings.js similarity index 100% rename from cypress/integration/with-security/check_advanced_settings.js rename to cypress/integration/with_security/check_advanced_settings.js diff --git a/cypress/integration/with-security/check_default_page.js b/cypress/integration/with_security/check_default_page.js similarity index 100% rename from cypress/integration/with-security/check_default_page.js rename to cypress/integration/with_security/check_default_page.js diff --git a/cypress/integration/with-security/check_filter_and_query.js b/cypress/integration/with_security/check_filter_and_query.js similarity index 100% rename from cypress/integration/with-security/check_filter_and_query.js rename to cypress/integration/with_security/check_filter_and_query.js diff --git a/cypress/integration/with-security/check_loaded_data.js b/cypress/integration/with_security/check_loaded_data.js similarity index 100% rename from cypress/integration/with-security/check_loaded_data.js rename to cypress/integration/with_security/check_loaded_data.js diff --git a/cypress/integration/with-security/check_timeline.js b/cypress/integration/with_security/check_timeline.js similarity index 100% rename from cypress/integration/with-security/check_timeline.js rename to cypress/integration/with_security/check_timeline.js diff --git a/cypress/integration/with-security/helpers/generate_data.js b/cypress/integration/with_security/helpers/generate_data.js similarity index 100% rename from cypress/integration/with-security/helpers/generate_data.js rename to cypress/integration/with_security/helpers/generate_data.js diff --git a/cypress/integration/with-security/plugins/.gitignore b/cypress/integration/with_security/plugins/.gitignore similarity index 100% rename from cypress/integration/with-security/plugins/.gitignore rename to cypress/integration/with_security/plugins/.gitignore diff --git a/cypress/integration/without-security/check_advanced_settings.js b/cypress/integration/without_security/check_advanced_settings.js similarity index 100% rename from cypress/integration/without-security/check_advanced_settings.js rename to cypress/integration/without_security/check_advanced_settings.js diff --git a/cypress/integration/without-security/check_default_page.js b/cypress/integration/without_security/check_default_page.js similarity index 100% rename from cypress/integration/without-security/check_default_page.js rename to cypress/integration/without_security/check_default_page.js diff --git a/cypress/integration/without-security/check_filter_and_query.js b/cypress/integration/without_security/check_filter_and_query.js similarity index 100% rename from cypress/integration/without-security/check_filter_and_query.js rename to cypress/integration/without_security/check_filter_and_query.js diff --git a/cypress/integration/without-security/check_loaded_data.js b/cypress/integration/without_security/check_loaded_data.js similarity index 100% rename from cypress/integration/without-security/check_loaded_data.js rename to cypress/integration/without_security/check_loaded_data.js diff --git a/cypress/integration/without-security/check_timeline.js b/cypress/integration/without_security/check_timeline.js similarity index 100% rename from cypress/integration/without-security/check_timeline.js rename to cypress/integration/without_security/check_timeline.js diff --git a/cypress/integration/without-security/helpers/generate_data.js b/cypress/integration/without_security/helpers/generate_data.js similarity index 100% rename from cypress/integration/without-security/helpers/generate_data.js rename to cypress/integration/without_security/helpers/generate_data.js diff --git a/cypress/integration/without-security/plugins/.gitignore b/cypress/integration/without_security/plugins/.gitignore similarity index 100% rename from cypress/integration/without-security/plugins/.gitignore rename to cypress/integration/without_security/plugins/.gitignore From e65b6b38b50ada263b5b9f05e399b085c2e30d12 Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Wed, 15 Jan 2025 15:46:56 -0800 Subject: [PATCH 2/4] fix paths that references old path Signed-off-by: Justin Kim --- .../apps/query_enhancements/field_display_filtering.spec.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js index 1069f2077db0..3f699fcecfcc 100644 --- a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js +++ b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/field_display_filtering.spec.js @@ -12,7 +12,7 @@ import { END_TIME, DATASET_CONFIGS, } from '../../../../../utils/apps/constants'; -import * as dataExplorer from '../../../../../integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/field_display_filtering.js'; +import * as dataExplorer from '../../../../../integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/field_display_filtering.js'; import { SECONDARY_ENGINE, BASE_PATH } from '../../../../../utils/constants'; import { NEW_SEARCH_BUTTON } from '../../../../../utils/dashboards/data_explorer/elements.js'; diff --git a/package.json b/package.json index 0ddf914436e8..277a0b1961e4 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "release_note:generate": "scripts/use_node scripts/generate_release_note", "cypress:run-without-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --env SECURITY_ENABLED=false", "cypress:run-with-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --env SECURITY_ENABLED=true,openSearchUrl=https://localhost:9200,WAIT_FOR_LOADER_BUFFER_MS=500", - "osd:ciGroup10": "echo \"cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/*.js\"", + "osd:ciGroup10": "echo \"cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/*.js\"", "osd:ciGroup11": "echo \"cypress/integration/dashboard_sanity_test.spec.js\"", "generate:opensearchsqlantlr": "./node_modules/antlr4ng-cli/index.js -Dlanguage=TypeScript -o ./src/plugins/data/public/antlr/opensearch_sql/.generated -visitor -no-listener -Xexact-output-dir ./src/plugins/data/public/antlr/opensearch_sql/grammar/OpenSearchSQLLexer.g4 ./src/plugins/data/public/antlr/opensearch_sql/grammar/OpenSearchSQLParser.g4", "generate:opensearchpplantlr": "./node_modules/antlr4ng-cli/index.js -Dlanguage=TypeScript -o ./src/plugins/data/public/antlr/opensearch_ppl/.generated -visitor -no-listener -Xexact-output-dir ./src/plugins/data/public/antlr/opensearch_ppl/grammar/OpenSearchPPLLexer.g4 ./src/plugins/data/public/antlr/opensearch_ppl/grammar/OpenSearchPPLParser.g4" From 6e1cb49a79edcd69bf9c72a5357f1c083f68b8bb Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Wed, 15 Jan 2025 18:06:19 -0800 Subject: [PATCH 3/4] add a cypress log to a baffling flakiness Signed-off-by: Justin Kim --- .../apps/query_enhancements/utils/saved_search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js index f61b5267827c..3a65a1acbeed 100644 --- a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js +++ b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js @@ -249,6 +249,7 @@ export const generateAllTestConfigurations = () => { * @param {QueryEnhancementLanguage} language - query language */ export const setDatePickerDatesAndSearchIfRelevant = (language) => { + cy.log(`setDatePickerDatesAndSearchIfRelevant with language: ${language}`); if (language !== QueryLanguages.SQL.name) { cy.setTopNavDate(START_TIME, END_TIME); } From 1cdaca8eaea9b08ae47f7053196324762da09bbe Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Thu, 16 Jan 2025 11:17:22 -0800 Subject: [PATCH 4/4] revert the cy.log Signed-off-by: Justin Kim --- .../apps/query_enhancements/utils/saved_search.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js index 3a65a1acbeed..f61b5267827c 100644 --- a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js +++ b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/saved_search.js @@ -249,7 +249,6 @@ export const generateAllTestConfigurations = () => { * @param {QueryEnhancementLanguage} language - query language */ export const setDatePickerDatesAndSearchIfRelevant = (language) => { - cy.log(`setDatePickerDatesAndSearchIfRelevant with language: ${language}`); if (language !== QueryLanguages.SQL.name) { cy.setTopNavDate(START_TIME, END_TIME); }