fix oc commands

opendatahub-io · Jul 30, 2024 · 4d9a76b · 4d9a76b
1 parent c193e51
commit 4d9a76b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 31 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/tests/e2e/pipelines/pipelines.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/e2e/pipelines/pipelines.cy.ts
@@ -47,14 +47,8 @@ describe('An admin user can import and run a pipeline', { testIsolation: false }
         yamlContent,
         dataConnectionReplacements,
       );
-      const tempFilePath = 'cypress/temp_data_connection.yaml';
-      applyOpenShiftYaml(modifiedYamlContent, tempFilePath).then((result) => {
-        expect(result.code).to.eq(
-          0,
-          `ERROR applying YAML content
-                                      stdout: ${result.stdout}
-                                      stderr: ${result.stderr}`,
-        );
+      applyOpenShiftYaml(modifiedYamlContent).then((result) => {
+        expect(result.code).to.eq(0);
       });
     });
 
@@ -69,14 +63,8 @@ describe('An admin user can import and run a pipeline', { testIsolation: false }
     };
     cy.fixture('resources/yaml/dspa_secret.yml').then((yamlContent) => {
       const modifiedYamlContent = replacePlaceholdersInYaml(yamlContent, dspaSecretReplacements);
-      const tempFilePath = 'cypress/temp_dspa_secret.yaml';
-      applyOpenShiftYaml(modifiedYamlContent, tempFilePath).then((result) => {
-        expect(result.code).to.eq(
-          0,
-          `ERROR applying YAML content
-                                      stdout: ${result.stdout}
-                                      stderr: ${result.stderr}`,
-        );
+      applyOpenShiftYaml(modifiedYamlContent).then((result) => {
+        expect(result.code).to.eq(0);
       });
     });
 
@@ -88,14 +76,8 @@ describe('An admin user can import and run a pipeline', { testIsolation: false }
     };
     cy.fixture('resources/yaml/dspa.yml').then((yamlContent) => {
       const modifiedYamlContent = replacePlaceholdersInYaml(yamlContent, dspaReplacements);
-      const tempFilePath = 'cypress/temp_dspa.yaml';
-      applyOpenShiftYaml(modifiedYamlContent, tempFilePath).then((result) => {
-        expect(result.code).to.eq(
-          0,
-          `ERROR applying YAML content
-                                      stdout: ${result.stdout}
-                                      stderr: ${result.stderr}`,
-        );
+      applyOpenShiftYaml(modifiedYamlContent).then((result) => {
+        expect(result.code).to.eq(0);
       });
     });
   });

diff --git a/frontend/src/__tests__/cypress/cypress/utils/ocCommands.ts b/frontend/src/__tests__/cypress/cypress/utils/ocCommands.ts
@@ -2,15 +2,18 @@
  * Applies the given YAML content using the `oc apply` command.
  *
  * @param yamlContent YAML content to be applied
- * @param tempFilePath Path to the temporary file
  * @returns Cypress Chainable
  */
-export const applyOpenShiftYaml = (yamlContent: string, tempFilePath: string) => {
-  cy.writeFile(tempFilePath, yamlContent);
-
-  const ocCommand = `oc apply -f ${tempFilePath}`;
-
+export const applyOpenShiftYaml = (yamlContent: string) => {
+  const ocCommand = `oc apply -f - <<EOF\n${yamlContent}EOF`;
   return cy.exec(ocCommand, { failOnNonZeroExit: false }).then((result) => {
+    if (result.code !== 0) {
+      // If there is an error, log the error and fail the test
+      cy.log(`ERROR applying YAML content
+              stdout: ${result.stdout}
+              stderr: ${result.stderr}`);
+      throw new Error(`Command failed with code ${result.code}`);
+    }
     return result;
   });
 };
@@ -43,4 +46,4 @@ export const deleteOpenShiftProject = (projectName: string) => {
   return cy.exec(ocCommand, { failOnNonZeroExit: false, timeout: 180000 }).then((result) => {
     return result;
   });
-};
+};