From c13dba102f4bb92b3f679fa086db9e2973960ca7 Mon Sep 17 00:00:00 2001 From: bethanyj28 Date: Wed, 24 Apr 2024 10:05:20 -0400 Subject: [PATCH 1/2] update @actions/artifact dependency --- dist/index.js | 52 ++++------------------------------------------- package-lock.json | 16 +++++++-------- package.json | 2 +- 3 files changed, 13 insertions(+), 57 deletions(-) diff --git a/dist/index.js b/dist/index.js index a2cd9f8..4c35f93 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2328,9 +2328,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.downloadArtifactInternal = exports.downloadArtifactPublic = exports.streamExtractExternal = void 0; const promises_1 = __importDefault(__nccwpck_require__(73292)); -const stream = __importStar(__nccwpck_require__(12781)); -const fs_1 = __nccwpck_require__(57147); -const path = __importStar(__nccwpck_require__(71017)); const github = __importStar(__nccwpck_require__(95438)); const core = __importStar(__nccwpck_require__(42186)); const httpClient = __importStar(__nccwpck_require__(96255)); @@ -2371,9 +2368,6 @@ function streamExtract(url, directory) { return; } catch (error) { - if (error.message.includes('Malformed extraction path')) { - throw new Error(`Artifact download failed with unretryable error: ${error.message}`); - } retryCount++; core.debug(`Failed to download artifact after ${retryCount} retries due to ${error.message}. Retrying in 5 seconds...`); // wait 5 seconds before retrying @@ -2396,8 +2390,6 @@ function streamExtractExternal(url, directory) { response.message.destroy(new Error(`Blob storage chunk did not respond in ${timeout}ms`)); }; const timer = setTimeout(timerFn, timeout); - const createdDirectories = new Set(); - createdDirectories.add(directory); response.message .on('data', () => { timer.refresh(); @@ -2407,47 +2399,11 @@ function streamExtractExternal(url, directory) { clearTimeout(timer); reject(error); }) - .pipe(unzip_stream_1.default.Parse()) - .pipe(new stream.Transform({ - objectMode: true, - transform: (entry, _, callback) => __awaiter(this, void 0, void 0, function* () { - const fullPath = path.normalize(path.join(directory, entry.path)); - if (!directory.endsWith(path.sep)) { - directory += path.sep; - } - if (!fullPath.startsWith(directory)) { - reject(new Error(`Malformed extraction path: ${fullPath}`)); - } - if (entry.type === 'Directory') { - if (!createdDirectories.has(fullPath)) { - createdDirectories.add(fullPath); - yield resolveOrCreateDirectory(fullPath).then(() => { - entry.autodrain(); - callback(); - }); - } - else { - entry.autodrain(); - callback(); - } - } - else { - core.info(`Extracting artifact entry: ${fullPath}`); - if (!createdDirectories.has(path.dirname(fullPath))) { - createdDirectories.add(path.dirname(fullPath)); - yield resolveOrCreateDirectory(path.dirname(fullPath)); - } - const writeStream = (0, fs_1.createWriteStream)(fullPath); - writeStream.on('finish', callback); - writeStream.on('error', reject); - entry.pipe(writeStream); - } - }) - })) - .on('finish', () => __awaiter(this, void 0, void 0, function* () { + .pipe(unzip_stream_1.default.Extract({ path: directory })) + .on('close', () => { clearTimeout(timer); resolve(); - })) + }) .on('error', (error) => { reject(error); }); @@ -130415,7 +130371,7 @@ module.exports = index; /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"name":"@actions/artifact","version":"2.1.6","preview":true,"description":"Actions artifact lib","keywords":["github","actions","artifact"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/artifact","license":"MIT","main":"lib/artifact.js","types":"lib/artifact.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/artifact"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"cd ../../ && npm run test ./packages/artifact","bootstrap":"cd ../../ && npm run bootstrap","tsc-run":"tsc","tsc":"npm run bootstrap && npm run tsc-run","gen:docs":"typedoc --plugin typedoc-plugin-markdown --out docs/generated src/artifact.ts --githubPages false --readme none"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.10.0","@actions/github":"^5.1.1","@actions/http-client":"^2.1.0","@azure/storage-blob":"^12.15.0","@octokit/core":"^3.5.1","@octokit/plugin-request-log":"^1.0.4","@octokit/plugin-retry":"^3.0.9","@octokit/request-error":"^5.0.0","@protobuf-ts/plugin":"^2.2.3-alpha.1","archiver":"^7.0.1","crypto":"^1.0.1","jwt-decode":"^3.1.2","twirp-ts":"^2.5.0","unzip-stream":"^0.3.1"},"devDependencies":{"@types/archiver":"^5.3.2","@types/unzip-stream":"^0.3.4","typedoc":"^0.25.4","typedoc-plugin-markdown":"^3.17.1","typescript":"^5.2.2"}}'); +module.exports = JSON.parse('{"name":"@actions/artifact","version":"2.1.7","preview":true,"description":"Actions artifact lib","keywords":["github","actions","artifact"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/artifact","license":"MIT","main":"lib/artifact.js","types":"lib/artifact.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/artifact"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"cd ../../ && npm run test ./packages/artifact","bootstrap":"cd ../../ && npm run bootstrap","tsc-run":"tsc","tsc":"npm run bootstrap && npm run tsc-run","gen:docs":"typedoc --plugin typedoc-plugin-markdown --out docs/generated src/artifact.ts --githubPages false --readme none"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.10.0","@actions/github":"^5.1.1","@actions/http-client":"^2.1.0","@azure/storage-blob":"^12.15.0","@octokit/core":"^3.5.1","@octokit/plugin-request-log":"^1.0.4","@octokit/plugin-retry":"^3.0.9","@octokit/request-error":"^5.0.0","@protobuf-ts/plugin":"^2.2.3-alpha.1","archiver":"^7.0.1","crypto":"^1.0.1","jwt-decode":"^3.1.2","twirp-ts":"^2.5.0","unzip-stream":"^0.3.1"},"devDependencies":{"@types/archiver":"^5.3.2","@types/unzip-stream":"^0.3.4","typedoc":"^0.25.4","typedoc-plugin-markdown":"^3.17.1","typescript":"^5.2.2"}}'); /***/ }), diff --git a/package-lock.json b/package-lock.json index beeca2b..8b30fee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "download-artifact", - "version": "4.1.6", + "version": "4.1.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "download-artifact", - "version": "4.1.6", + "version": "4.1.7", "license": "MIT", "dependencies": { "@actions/artifact": "^2.1.6", @@ -36,9 +36,9 @@ } }, "node_modules/@actions/artifact": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.6.tgz", - "integrity": "sha512-IYdauOIXyCMsGaNlqiTkNHlPwWOmRiJTMLOlLZY/S8mnWbkxXprlks3aV2a4PHeDEHg4MVC6+2y8rtVnEG5uPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.7.tgz", + "integrity": "sha512-iIFsTPZnb182dBc+Is5v7ZqojC4ydO8Ru4/PD8Azg2diV//fdW3H6biEH/utUlNhwfOuHxZpC/QSQsU5KDEuuw==", "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^5.1.1", @@ -6172,9 +6172,9 @@ "dev": true }, "@actions/artifact": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.6.tgz", - "integrity": "sha512-IYdauOIXyCMsGaNlqiTkNHlPwWOmRiJTMLOlLZY/S8mnWbkxXprlks3aV2a4PHeDEHg4MVC6+2y8rtVnEG5uPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.7.tgz", + "integrity": "sha512-iIFsTPZnb182dBc+Is5v7ZqojC4ydO8Ru4/PD8Azg2diV//fdW3H6biEH/utUlNhwfOuHxZpC/QSQsU5KDEuuw==", "requires": { "@actions/core": "^1.10.0", "@actions/github": "^5.1.1", diff --git a/package.json b/package.json index 6207ff3..2fddd61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "download-artifact", - "version": "4.1.6", + "version": "4.1.7", "description": "Download an Actions Artifact from a workflow run", "main": "dist/index.js", "scripts": { From fdd1595981c1a29187d3de99c28c28a166bc38f7 Mon Sep 17 00:00:00 2001 From: bethanyj28 Date: Wed, 24 Apr 2024 10:10:29 -0400 Subject: [PATCH 2/2] licensed --- .licenses/npm/@actions/artifact.dep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.licenses/npm/@actions/artifact.dep.yml b/.licenses/npm/@actions/artifact.dep.yml index 4ee8179..269eb2b 100644 --- a/.licenses/npm/@actions/artifact.dep.yml +++ b/.licenses/npm/@actions/artifact.dep.yml @@ -1,6 +1,6 @@ --- name: "@actions/artifact" -version: 2.1.6 +version: 2.1.7 type: npm summary: Actions artifact lib homepage: https://github.com/actions/toolkit/tree/main/packages/artifact