Skip to content

fix(downloader): replace zip with adm-zip #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(downloader): replace zip with adm-zip #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions lib/binary/downloader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const _ = require('lodash');
const rp = require('request-promise');
const request = require('request');
const compareVersions = require('compare-versions');
const zip = require('zip');
const AdmZip = require('adm-zip');
const tarStream = require('tar-stream');
const {
resolve, join,
Expand All @@ -12,7 +12,7 @@ const {
homedir, arch,
} = require('os');
const {
existsSync, mkdirSync, readFileSync, createWriteStream, writeFile, readFile,
existsSync, mkdirSync, readFileSync, createWriteStream, writeFile,
createReadStream,
} = require('fs');
const { createGunzip } = require('zlib');
Expand All @@ -25,20 +25,9 @@ pipeline = promisify(pipeline);
const CODEFRESH_PATH = resolve(homedir(), '.Codefresh');

async function unzipFile(zipPath, outputPath) {
const zipBuffer = await Promise.fromCallback((cb) => readFile(zipPath, cb));
const zr = zip.Reader(zipBuffer);

const fileWrites = [];
zr.forEach((entry) => {
if (!entry.isFile()) {
return;
}

const outputFilePath = join(outputPath, entry.getName());
fileWrites.push(Promise.fromCallback((cb) => writeFile(outputFilePath, entry.getData(), { mode: entry.getMode() }, cb)));
});

return Promise.all(fileWrites);
const zip = new AdmZip(zipPath);
const extractAll = promisify(zip.extractAllToAsync.bind(zip));
return extractAll(outputPath, true, true);
}

async function untarFile(tarPath, outputPath) {
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"dependencies": {
"@codefresh-io/docker-reference": "^0.0.5",
"adm-zip": "^0.5.5",
"adm-zip": "^0.5.10",
"ajv": "^6.12.6",
"bluebird": "^3.5.1",
"cf-errors": "^0.1.16",
Expand Down Expand Up @@ -87,8 +87,7 @@
"uuid": "^3.1.0",
"yaml": "^1.10.0",
"yargs": "^15.4.1",
"yargs-parser": "^13.0.0",
"zip": "^1.2.0"
"yargs-parser": "^13.0.0"
},
"devDependencies": {
"@types/node-forge": "^1.0.1",
Expand All @@ -115,4 +114,4 @@
"./test-setup.js"
]
}
}
}
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,10 @@ acorn@^7.4.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

adm-zip@^0.5.5:
version "0.5.5"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.5.tgz#b6549dbea741e4050309f1bb4d47c47397ce2c4f"
integrity sha512-IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w==
adm-zip@^0.5.10:
version "0.5.10"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.10.tgz#4a51d5ab544b1f5ce51e1b9043139b639afff45b"
integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==

agent-base@6:
version "6.0.2"
Expand Down