From 6c1b90a31db9d4fde2728e97149eac15dcf53ebe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 12:07:03 +0000 Subject: [PATCH 1/2] Bump form-data from 4.0.4 to 4.0.6 Bumps [form-data](https://github.com/form-data/form-data) from 4.0.4 to 4.0.6. - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v4.0.4...v4.0.6) --- updated-dependencies: - dependency-name: form-data dependency-version: 4.0.6 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 33 +++++++++++---------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 93566358..2973e3f7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "uuid": "9.0.1", "axios": "1.13.5", "commander": "13.1.0", - "form-data": "4.0.4", + "form-data": "4.0.6", "openid-client": "5.6.1", "hpagent": "1.2.0", "@github/keytar": "7.10.6", diff --git a/yarn.lock b/yarn.lock index 96364aef..be810534 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1441,27 +1441,16 @@ follow-redirects@^1.15.11: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc" integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw== -form-data@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4" - integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - es-set-tostringtag "^2.1.0" - hasown "^2.0.2" - mime-types "^2.1.12" - -form-data@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053" - integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w== +form-data@4.0.6, form-data@^4.0.5: + version "4.0.6" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.6.tgz#28e864e1b786dbebb68db1f452f9635278665827" + integrity sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" es-set-tostringtag "^2.1.0" - hasown "^2.0.2" - mime-types "^2.1.12" + hasown "^2.0.4" + mime-types "^2.1.35" fs.realpath@^1.0.0: version "1.0.0" @@ -1579,10 +1568,10 @@ has-tostringtag@^1.0.2: dependencies: has-symbols "^1.0.3" -hasown@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== +hasown@^2.0.2, hasown@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003" + integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A== dependencies: function-bind "^1.1.2" @@ -2291,7 +2280,7 @@ mime-db@1.52.0: resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12: +mime-types@^2.1.35: version "2.1.35" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== From 2acf668f500b1ccdb07a63b693449bfc38b0bf5c Mon Sep 17 00:00:00 2001 From: Jing Sun Date: Tue, 23 Jun 2026 09:53:21 +0200 Subject: [PATCH 2/2] wrap rmSymc --- tests/core/utils/file.service.spec.ts | 15 ++++----------- tests/jest.setup.ts | 7 ++----- tests/utls/fs-utils.ts | 11 ++++++++++- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/tests/core/utils/file.service.spec.ts b/tests/core/utils/file.service.spec.ts index b6ec8c23..ec5c492b 100644 --- a/tests/core/utils/file.service.spec.ts +++ b/tests/core/utils/file.service.spec.ts @@ -4,6 +4,7 @@ import * as os from "os"; import * as AdmZip from "adm-zip"; import { FileService } from "../../../src/core/utils/file-service"; import { FatalError, logger } from "../../../src/core/utils/logger"; +import { rmTempDir } from "../../utls/fs-utils"; describe("FileService", () => { let fileService: FileService; @@ -26,19 +27,11 @@ describe("FileService", () => { afterAll(() => { if (fs.existsSync(tempDir)) { - try { - fs.rmSync(tempDir, { recursive: true, force: true }); - } catch (e) { - logger.warn(`Could not delete: ${tempDir}`); - } + rmTempDir(tempDir); } if (fs.existsSync(symLinkSourceTempDir)) { - try { - fs.rmSync(symLinkSourceTempDir, { recursive: true, force: true }); - } catch (e) { - logger.warn(`Could not delete: ${tempDir}`); - } + rmTempDir(tempDir); } }); @@ -159,7 +152,7 @@ describe("FileService", () => { expect(fs.existsSync(path.join(extractedDir, "nodes", "node-1.json"))).toBe(true); expect(JSON.parse(fs.readFileSync(path.join(extractedDir, "package.json"), "utf-8"))).toEqual({ key: "pkg-1" }); } finally { - fs.rmSync(extractedDir, { recursive: true, force: true }); + rmTempDir(extractedDir); } }); }); diff --git a/tests/jest.setup.ts b/tests/jest.setup.ts index bd916be5..35f4797b 100644 --- a/tests/jest.setup.ts +++ b/tests/jest.setup.ts @@ -7,6 +7,7 @@ import { tmpdir } from "os" import { join } from "path"; import process = require("process"); +import { rmTempDir } from "./utls/fs-utils"; mockAxios(); @@ -30,11 +31,7 @@ afterEach(() => { afterAll(() => { if (tempDir !== null) { logger.info(`Removing tempdir: ${tempDir}`); - try { - fs.rmSync(tempDir, { recursive: true, force: true }); - } catch (e) { - logger.warn(`Could not delete tempdir: ${tempDir}`, e); - } + rmTempDir(tempDir); } }); diff --git a/tests/utls/fs-utils.ts b/tests/utls/fs-utils.ts index b026934f..ac3afaf4 100644 --- a/tests/utls/fs-utils.ts +++ b/tests/utls/fs-utils.ts @@ -1,9 +1,10 @@ -import { readFileSync, mkdirSync, writeFileSync } from "node:fs"; +import { readFileSync, mkdirSync, writeFileSync, rmSync } from "node:fs"; import { resolve } from "node:path"; import { loggingTestTransport } from "../jest.setup"; import { FileService } from "../../src/core/utils/file-service"; import { v4 as uuid } from "uuid"; import AdmZip = require("adm-zip"); +import { logger } from "../../src/core/utils/logger"; export function getDownloadedFileName(): string { const filename = loggingTestTransport.logMessages[0].message.split(FileService.fileDownloadedMessage)[1]; @@ -42,4 +43,12 @@ export function zipToTempFolder(zip: AdmZip): string { const fullPath = resolve(process.cwd(), `${uuid()}.zip`); zip.writeZip(fullPath); return fullPath; +} + +export function rmTempDir(folder: string): void { + try { + rmSync(folder, { recursive: true, force: true }); + } catch (e) { + logger.warn(`Could not delete: ${folder}`, e); + } } \ No newline at end of file