Revert "Use admin cert and key when deleting system indices for cypre…

…ss test cleanup (opensearch-project#1174)" This reverts commit a343286. Signed-off-by: Craig Perkins <[email protected]>
cwperks · Oct 31, 2024 · d2456f4 · d2456f4
1 parent 740655b
commit d2456f4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 78 deletions.
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -23,10 +23,6 @@
 /**
  * @type {Cypress.PluginConfig}
  */
-
-const fs = require("fs");
-const path = require("path");
-
 module.exports = (on) => {
   //   const options = {
   //     webpackOptions: {
@@ -46,12 +42,4 @@ module.exports = (on) => {
   //   };
   //
   //   on("file:preprocessor", wp(options));
-  on("task", {
-    readCertAndKey() {
-      const cert = fs.readFileSync(path.resolve(__dirname, "../resources/kirk.pem"));
-      const key = fs.readFileSync(path.resolve(__dirname, "../resources/kirk-key.pem"));
-
-      return { cert, key };
-    },
-  });
 };
diff --git a/cypress/resources/kirk-key.pem b/cypress/resources/kirk-key.pem
diff --git a/cypress/resources/kirk.pem b/cypress/resources/kirk.pem
diff --git a/cypress/utils/commands.js b/cypress/utils/commands.js
@@ -99,17 +99,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.task("readCertAndKey").then(({ cert, key }) => {
-    cy.request({
-      method: "DELETE",
-      url: `${Cypress.env("openSearchUrl")}/.opendistro-ism*?expand_wildcards=all`,
-      headers: {},
-      agentOptions: {
-        cert,
-        key,
-      },
-    });
-  });
+  cy.request("DELETE", `${Cypress.env("openSearchUrl")}/.opendistro-ism*?expand_wildcards=all`);
 });
 
 Cypress.Commands.add("deleteADSystemIndices", () => {