Skip to content

Remove function _nativeZip #279

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

Merged
DeviaVir merged 1 commit into from
May 15, 2017
Merged

Remove function _nativeZip #279

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
40 changes: 2 additions & 38 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,6 @@ Lambda.prototype._eventSourceList = function (program) {
return list;
};

/**
* @deprecated
*/
Lambda.prototype._zipfileTmpPath = function (program) {
var msSinceEpoch = +new Date();
var filename = program.functionName + '-' + msSinceEpoch + '.zip';
var zipfile = path.join(os.tmpdir(), filename);

return zipfile;
};

Lambda.prototype._fileCopy = function (program, src, dest, excludeNodeModules, callback) {
const srcAbsolutePath = path.resolve(src);
const excludes = (function () {
Expand Down Expand Up @@ -353,24 +342,6 @@ Lambda.prototype._zip = function (program, codeDirectory, callback) {
});
};

Lambda.prototype._nativeZip = function (program, codeDirectory, callback) {
var zipfile = this._zipfileTmpPath(program),
cmd = 'zip -r ' + zipfile + ' .';

exec(cmd, {
env: process.env,
cwd: codeDirectory,
maxBuffer: maxBufferSize
}, function (err) {
if (err !== null) {
return callback(err, null);
}

var data = fs.readFileSync(zipfile);
callback(null, data);
});
};

Lambda.prototype._codeDirectory = function () {
return path.resolve('.', '.lambda');
};
Expand Down Expand Up @@ -487,10 +458,7 @@ Lambda.prototype._archivePrebuilt = function (program, archiveCallback) {
}

console.log('=> Zipping deployment package');
var archive = process.platform !== 'win32' ? _this._nativeZip : _this._zip;
archive = archive.bind(_this);

archive(program, codeDirectory, archiveCallback);
_this._zip(program, codeDirectory, archiveCallback);
});
};

Expand Down Expand Up @@ -543,11 +511,7 @@ Lambda.prototype._buildAndArchive = function (program, archiveCallback) {
}

console.log('=> Zipping deployment package');

var archive = process.platform !== 'win32' ? _this._nativeZip : _this._zip;
archive = archive.bind(_this);

archive(program, codeDirectory, archiveCallback);
_this._zip(program, codeDirectory, archiveCallback);
});
});
});
Expand Down
9 changes: 1 addition & 8 deletions test/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,6 @@ describe('node-lambda', function () {
});
});

describe('_zipfileTmpPath', function () {
it('has the correct path', function () {
var zipfileTmpPath = lambda._zipfileTmpPath(program);
var value = zipfileTmpPath.indexOf(program.functionName) > 0;
assert.equal(value, true);
});
});

describe('_cleanDirectory', function () {
it('`codeDirectory` is empty', function (done) {
lambda._cleanDirectory(codeDirectory, function () {
Expand Down Expand Up @@ -469,6 +461,7 @@ describe('node-lambda', function () {
});

it('packages a prebuilt module without installing', function (done) {
_timeout({ this: this, sec: 30 }); // give it time to zip
var buildDir = '.build_' + Date.now();
after(function() {
rimraf.sync(buildDir, fs);
Expand Down