Updating cypress version and fixing CVE-2024-21538 (#1247)

* Updating cypress version Signed-off-by: Kshitij Tandon <[email protected]> * Fixing CVE-2024-21538 Signed-off-by: Kshitij Tandon <[email protected]> * Testing cypress baselining Signed-off-by: Kshitij Tandon <[email protected]> * Modifying spec patterns Signed-off-by: Kshitij Tandon <[email protected]> * Fixing an issue in snpashot e2e test Signed-off-by: Kshitij Tandon <[email protected]> --------- Signed-off-by: Kshitij Tandon <[email protected]> (cherry picked from commit 3eb1b24)
opensearch-project · Jan 30, 2025 · 09e085d · 09e085d
1 parent 3db302c
commit 09e085d
Show file tree

Hide file tree

Showing 24 changed files with 699 additions and 1,212 deletions.
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,47 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+  e2e: {
+    specPattern: "cypress/e2e/plugins/index-management-dashboards-plugin/*.{js,jsx,ts,tsx}",
+    defaultCommandTimeout: 60000,
+    requestTimeout: 60000,
+    responseTimeout: 60000,
+    baseUrl: "http://localhost:5601",
+    viewportWidth: 2000,
+    viewportHeight: 1320,
+    env: {
+      openSearchUrl: "http://localhost:9200",
+      SECURITY_ENABLED: false,
+      username: "admin",
+      password: "admin",
+    },
+    clientCertificates: [
+      {
+        url: "https://localhost:9200/.opendistro-ism*",
+        ca: ["cypress/resources/root-ca.pem"],
+        certs: [
+          {
+            cert: "cypress/resources/kirk.pem",
+            key: "cypress/resources/kirk-key.pem",
+            passphrase: "",
+          },
+        ],
+      },
+      {
+        url: "https://localhost:9200/.opendistro-ism-config/_update_by_query/",
+        ca: ["cypress/resources/root-ca.pem"],
+        certs: [
+          {
+            cert: "cypress/resources/kirk.pem",
+            key: "cypress/resources/kirk-key.pem",
+            passphrase: "",
+          },
+        ],
+      },
+    ],
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+      return config;
+    },
+  },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/...x-management-dashboards-plugin/aliases.js → ...x-management-dashboards-plugin/aliases.js b/...x-management-dashboards-plugin/aliases.js → ...x-management-dashboards-plugin/aliases.js
diff --git a/...agement-dashboards-plugin/create_index.js → ...agement-dashboards-plugin/create_index.js b/...agement-dashboards-plugin/create_index.js → ...agement-dashboards-plugin/create_index.js
diff --git a/...agement-dashboards-plugin/data_streams.js → ...agement-dashboards-plugin/data_streams.js b/...agement-dashboards-plugin/data_streams.js → ...agement-dashboards-plugin/data_streams.js
diff --git a/...nagement-dashboards-plugin/force_merge.js → ...nagement-dashboards-plugin/force_merge.js b/...nagement-dashboards-plugin/force_merge.js → ...nagement-dashboards-plugin/force_merge.js
diff --git a/...agement-dashboards-plugin/indices_spec.js → ...agement-dashboards-plugin/indices_spec.js b/...agement-dashboards-plugin/indices_spec.js → ...agement-dashboards-plugin/indices_spec.js
diff --git a/...dashboards-plugin/managed_indices_spec.js → ...dashboards-plugin/managed_indices_spec.js b/...dashboards-plugin/managed_indices_spec.js → ...dashboards-plugin/managed_indices_spec.js
diff --git a/...ashboards-plugin/notification_settings.js → ...ashboards-plugin/notification_settings.js b/...ashboards-plugin/notification_settings.js → ...ashboards-plugin/notification_settings.js
diff --git a/...gement-dashboards-plugin/policies_spec.js → ...gement-dashboards-plugin/policies_spec.js b/...gement-dashboards-plugin/policies_spec.js → ...gement-dashboards-plugin/policies_spec.js
diff --git a/...gement-dashboards-plugin/refresh_index.js → ...gement-dashboards-plugin/refresh_index.js b/...gement-dashboards-plugin/refresh_index.js → ...gement-dashboards-plugin/refresh_index.js
diff --git a/...agement-dashboards-plugin/reindex_spec.js → ...agement-dashboards-plugin/reindex_spec.js b/...agement-dashboards-plugin/reindex_spec.js → ...agement-dashboards-plugin/reindex_spec.js
diff --git a/...-management-dashboards-plugin/rollover.js → ...-management-dashboards-plugin/rollover.js b/...-management-dashboards-plugin/rollover.js → ...-management-dashboards-plugin/rollover.js
diff --git a/...agement-dashboards-plugin/rollups_spec.js → ...agement-dashboards-plugin/rollups_spec.js b/...agement-dashboards-plugin/rollups_spec.js → ...agement-dashboards-plugin/rollups_spec.js
diff --git a/...ement-dashboards-plugin/snapshots_spec.js → ...ement-dashboards-plugin/snapshots_spec.js b/...ement-dashboards-plugin/snapshots_spec.js → ...ement-dashboards-plugin/snapshots_spec.js
@@ -92,6 +92,7 @@ describe("Snapshots", () => {
 
   describe("Snapshot can be restored", () => {
     it("Successfully restores indexes from snapshot", () => {
+      cy.visit(`${BASE_PATH}/app/${IM_PLUGIN_NAME}#/snapshots`);
       // Wait for snapshot to be created successfully with a 12sec timeout
       cy.get(`[data-test-subj="refreshButton"]`, { timeout: 12000 })
         .should("be.visible")
@@ -124,6 +125,7 @@ describe("Snapshots", () => {
 
   describe("Snapshot can be deleted", () => {
     it("deletes snapshot successfully", () => {
+      cy.visit(`${BASE_PATH}/app/${IM_PLUGIN_NAME}#/snapshots`);
       // Select test snapshot
       cy.get(`[data-test-subj="checkboxSelectRow-test_repo:test_snapshot"]`).check({ force: true });
 

diff --git a/...nagement-dashboards-plugin/split_index.js → ...nagement-dashboards-plugin/split_index.js b/...nagement-dashboards-plugin/split_index.js → ...nagement-dashboards-plugin/split_index.js
diff --git a/...-dashboards-plugin/template_components.js → ...-dashboards-plugin/template_components.js b/...-dashboards-plugin/template_components.js → ...-dashboards-plugin/template_components.js
diff --git a/...management-dashboards-plugin/templates.js → ...management-dashboards-plugin/templates.js b/...management-dashboards-plugin/templates.js → ...management-dashboards-plugin/templates.js
diff --git a/...ment-dashboards-plugin/transforms_spec.js → ...ment-dashboards-plugin/transforms_spec.js b/...ment-dashboards-plugin/transforms_spec.js → ...ment-dashboards-plugin/transforms_spec.js
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/cypress/support/index.js → cypress/support/e2e.js b/cypress/support/index.js → cypress/support/e2e.js
diff --git a/cypress/utils/commands.js b/cypress/utils/commands.js
@@ -98,7 +98,7 @@ Cypress.Commands.add("login", () => {
 
 Cypress.Commands.add("deleteAllIndices", () => {
   cy.log("Deleting all indexes");
-  cy.request("DELETE", `${Cypress.env("openSearchUrl")}/index*,sample*,opensearch_dashboards*`);
+  cy.request("DELETE", `${Cypress.env("openSearchUrl")}/test_index_*,index*,sample*,opensearch_dashboards*`);
   cy.task("readCertAndKey").then(({ cert, key }) => {
     cy.request({
       method: "DELETE",

diff --git a/package.json b/package.json
@@ -59,7 +59,8 @@
     "**/nth-check": "^2.0.1",
     "**/typescript": "4.0.2",
     "**/terser": "^4.8.1",
-    "braces": "^3.0.3"
+    "braces": "^3.0.3",
+    "**/eslint/cross-spawn": "^7.0.5"
   },
   "devDependencies": {
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",
@@ -72,7 +73,7 @@
     "@types/json-schema": "^7.0.11",
     "@types/react-dom": "^16.9.8",
     "@types/react-router-dom": "^5.3.2",
-    "cypress": "9.5.4",
+    "cypress": "12.17.4",
     "diff": "^4.0.1",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
@@ -83,4 +84,4 @@
   "engines": {
     "yarn": "^1.21.1"
   }
-}
+}