From 36b40f0963c4a50e2bc562934fbe7f1d71535038 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:11:51 -0500
Subject: [PATCH] [8.11] [security_solution] Fix junit_transformer (#171669)
 (#171693)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.11`:
- [[security_solution] Fix junit_transformer
(#171669)](https://github.com/elastic/kibana/pull/171669)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Patryk
Kopyciński","email":"contact@patrykkopycinski.com"},"sourceCommit":{"committedDate":"2023-11-21T21:50:37Z","message":"[security_solution]
Fix junit_transformer (#171669)\n\n## Summary\r\n\r\nCurrently, Cypress
is writing junit XML files that we are trying to map\r\nto the expected
CI format, but if the job fails the broken files are\r\nstill being
uploaded and passed to the Flaky Test Reporter which causes\r\nit to
fail.\r\n\r\nSo the solution is to just delete the broken files before
they are sent\r\nto the Flaky Tests Reporter\r\n\r\nCo-authored-by:
Tiago Costa
<tiago.costa@elastic.co>","sha":"043f0501874108eeb133d59ecded2d1e7a871bd6","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Defend
Workflows","backport:prev-minor","v8.12.0","v8.11.2"],"number":171669,"url":"https://github.com/elastic/kibana/pull/171669","mergeCommit":{"message":"[security_solution]
Fix junit_transformer (#171669)\n\n## Summary\r\n\r\nCurrently, Cypress
is writing junit XML files that we are trying to map\r\nto the expected
CI format, but if the job fails the broken files are\r\nstill being
uploaded and passed to the Flaky Test Reporter which causes\r\nit to
fail.\r\n\r\nSo the solution is to just delete the broken files before
they are sent\r\nto the Flaky Tests Reporter\r\n\r\nCo-authored-by:
Tiago Costa
<tiago.costa@elastic.co>","sha":"043f0501874108eeb133d59ecded2d1e7a871bd6"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171669","number":171669,"mergeCommit":{"message":"[security_solution]
Fix junit_transformer (#171669)\n\n## Summary\r\n\r\nCurrently, Cypress
is writing junit XML files that we are trying to map\r\nto the expected
CI format, but if the job fails the broken files are\r\nstill being
uploaded and passed to the Flaky Test Reporter which causes\r\nit to
fail.\r\n\r\nSo the solution is to just delete the broken files before
they are sent\r\nto the Flaky Tests Reporter\r\n\r\nCo-authored-by:
Tiago Costa
<tiago.costa@elastic.co>","sha":"043f0501874108eeb133d59ecded2d1e7a871bd6"}},{"branch":"8.11","label":"v8.11.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Patryk Kopyciński <contact@patrykkopycinski.com>
---
 .../scripts/junit_transformer/lib.ts                  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/scripts/junit_transformer/lib.ts b/x-pack/plugins/security_solution/scripts/junit_transformer/lib.ts
index d9033c75d485b..725baa689cd20 100644
--- a/x-pack/plugins/security_solution/scripts/junit_transformer/lib.ts
+++ b/x-pack/plugins/security_solution/scripts/junit_transformer/lib.ts
@@ -16,6 +16,7 @@ import * as t from 'io-ts';
 import { isLeft } from 'fp-ts/lib/Either';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import globby from 'globby';
+import del from 'del';
 
 /**
  * Updates the `name` and `classname` attributes of each testcase.
@@ -195,6 +196,9 @@ ${boilerplate}
 
     if ('error' in maybeValidationResult) {
       logError(maybeValidationResult.error);
+      // Sending broken XML to Failed Test Reporter will cause a job to fail
+      await del(path);
+      log.warning(`${path} file was deleted.`);
       // If there is an error, continue trying to process other files.
       continue;
     }
@@ -203,9 +207,11 @@ ${boilerplate}
 
     const { processed, hadTestCases } = isReportAlreadyProcessed(reportJson);
     if (hadTestCases === false) {
-      log.warning(`${path} had no test cases. Skipping it.
+      log.warning(`${path} had no test cases.
 ${boilerplate}
 `);
+      await del(path);
+      log.warning(`${path} file was deleted.`);
       // If there is an error, continue trying to process other files.
       continue;
     }
@@ -222,6 +228,9 @@ ${boilerplate}
 
     if ('error' in maybeSpecFilePath) {
       logError(maybeSpecFilePath.error);
+      // Sending broken XML to Failed Test Reporter will cause a job to fail
+      await del(path);
+      log.warning(`${path} file was deleted.`);
       // If there is an error, continue trying to process other files.
       continue;
     }