@datadog/datadog-ci-plugin-sarif 5.13.0 → 5.13.1

package/dist/bundle.js

@@ -5909,7 +5909,7 @@ var require_src$9 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_package$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		"name": "@datadog/datadog-ci-base",
-		"version": "5.13.0",
+		"version": "5.13.1",
 		"description": "Base package for Datadog CI",
 		"license": "Apache-2.0",
 		"keywords": ["datadog", "datadog-ci"],
@@ -7072,7 +7072,6 @@ var require_plugin = /* @__PURE__ */ __commonJSMin(((exports) => {
 		]);
 		console.log();
 		patchModulePaths(nodeModulesPath);
-		printPluginVersion(pluginPackage);
 	});
 	const handlePluginAutoInstall = (scope) => __awaiter(void 0, void 0, void 0, function* () {
 		if (!!process.env["DISABLE_PLUGIN_AUTO_INSTALL"]) {
@@ -65481,10 +65480,10 @@ var require_request = /* @__PURE__ */ __commonJSMin(((exports) => {
 			throw requestError;
 		}
 		const responseHeaders = parseResponseHeaders(response.headers);
-		const contentType = (_h = responseHeaders["content-type"]) !== null && _h !== void 0 ? _h : "";
+		const mediaType = ((_h = responseHeaders["content-type"]) !== null && _h !== void 0 ? _h : "").split(";")[0].trim();
 		const rawBody = yield response.text();
 		let data = rawBody;
-		if (contentType.includes("application/json") && rawBody.length > 0) try {
+		if (rawBody.length > 0 && (mediaType === "application/json" || mediaType === "application/vnd.api+json")) try {
 			data = JSON.parse(rawBody);
 		} catch (_j) {}
 		if (!response.ok) throw new RequestError(`Request failed with status code ${response.status}`, config, {
@@ -66538,19 +66537,35 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* Narrows the list of Worker log files to check by using ACTIONS_ORCHESTRATION_ID
 	* to identify the correct log for the current job on non-ephemeral runners.
+	*
+	* ACTIONS_ORCHESTRATION_ID format: <planId>.<jobId>.__default
+	*
+	* All jobs in the same GitHub Actions workflow run share the same planId.
+	* On multi-runners (non-ephemeral runners processing sequential jobs), multiple
+	* Worker log files can exist from different jobs of the same workflow run,
+	* all containing the same planId. Matching only on planId causes the first
+	* (chronologically oldest) log to be selected, which may belong to a previous
+	* job. The jobId (second segment of ACTIONS_ORCHESTRATION_ID) is unique per job
+	* and is serialized as "jobId" in the Worker log's job message JSON, allowing
+	* unambiguous identification of the current job's log.
 	*/
 	const getTargetWorkerLogFiles = (context, foundDiagDir, workerLogFiles) => {
 		const orchestrationId = process.env.ACTIONS_ORCHESTRATION_ID;
 		if (!orchestrationId) return workerLogFiles;
-		const planId = orchestrationId.split(".")[0];
+		const parts = orchestrationId.split(".");
+		const planId = parts[0];
+		const jobId = parts[1];
 		for (const logFile of workerLogFiles) {
 			const filePath = upath_1.default.join(foundDiagDir, logFile);
-			if (fs_1$2.default.readFileSync(filePath, "utf-8").includes(`"planId": "${planId}"`)) {
-				context.stdout.write(`Found Worker log for planId ${planId}: ${logFile}\n`);
+			const content = fs_1$2.default.readFileSync(filePath, "utf-8");
+			const matchesPlanId = content.includes(`"planId": "${planId}"`);
+			const matchesJobId = !jobId || content.includes(`"jobId": "${jobId}"`);
+			if (matchesPlanId && matchesJobId) {
+				context.stdout.write(`Found Worker log for planId ${planId}, jobId ${jobId !== null && jobId !== void 0 ? jobId : "N/A"}: ${logFile}\n`);
 				return [logFile];
 			}
 		}
-		context.stderr.write(`${chalk_1.default.yellow.bold("[WARNING]")} Could not find Worker log for planId ${planId}, checking all logs\n`);
+		context.stderr.write(`${chalk_1.default.yellow.bold("[WARNING]")} Could not find Worker log for planId ${planId}, jobId ${jobId !== null && jobId !== void 0 ? jobId : "N/A"}, checking all logs\n`);
 		return workerLogFiles;
 	};
 	const getGithubJobAttributeFromLogFiles = (context, foundDiagDir, workerLogFiles, jobAttributeRegex) => {