Skip to content
Merged
Changes from all commits
Commits
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
85 changes: 40 additions & 45 deletions lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,20 +521,19 @@ Lambda.prototype.package = function (program) {
var _this = this;
if (!program.packageDirectory) {
throw 'packageDirectory not specified!';
} else {
try {
var isDir = fs.lstatSync(program.packageDirectory).isDirectory();
}
try {
var isDir = fs.lstatSync(program.packageDirectory).isDirectory();

if (!isDir) {
throw program.packageDirectory + ' is not a directory!';
}
} catch(err) {
if (err.code === 'ENOENT') {
console.log('=> Creating package directory');
fs.mkdirsSync(program.packageDirectory);
} else {
throw err;
}
if (!isDir) {
throw program.packageDirectory + ' is not a directory!';
}
} catch(err) {
if (err.code === 'ENOENT') {
console.log('=> Creating package directory');
fs.mkdirsSync(program.packageDirectory);
} else {
throw err;
}
}

Expand Down Expand Up @@ -604,54 +603,50 @@ Lambda.prototype.deploy = function (program) {
return _this._uploadNew(lambda, params, function(err, results) {
if (err) {
throw err;
} else {
console.log('=> Zip file(s) done uploading. Results follow: ');
console.log(results);

// Updating event source(s)
_this._updateEventSources(lambda, params.FunctionName, [], eventSourceList, function(err, results) {
cb(null, results);
});
}
console.log('=> Zip file(s) done uploading. Results follow: ');
console.log(results);

// Updating event source(s)
_this._updateEventSources(lambda, params.FunctionName, [], eventSourceList, function(err, results) {
cb(null, results);
});
});
} else {
_this._listEventSourceMappings(lambda, {
'FunctionName': params.FunctionName
}, function(err, existingEventSourceList) {
if (err) {
throw err;
} else {
return async.parallel([
function(_callback) {
_this._uploadExisting(lambda, params, function(err, results) {
if (err) {
throw err;
} else {
console.log('=> Zip file(s) done uploading. Results follow: ');
console.log(results);
_callback(err, results);
}
})
},
function(_callback) {
_this._updateEventSources(lambda, params.FunctionName, existingEventSourceList, eventSourceList, function(err, results) {
_callback(err, results)
})
}
], function(err, results) {
cb(err, results);
});
}
return async.parallel([
function(_callback) {
_this._uploadExisting(lambda, params, function(err, results) {
if (err) {
throw err;
}
console.log('=> Zip file(s) done uploading. Results follow: ');
console.log(results);
_callback(err, results);
})
},
function(_callback) {
_this._updateEventSources(lambda, params.FunctionName, existingEventSourceList, eventSourceList, function(err, results) {
_callback(err, results)
})
}
], function(err, results) {
cb(err, results);
});
});
}
});
}, function (err, results) {
if (err) {
throw err;
} else {
console.log('=> All tasks done. Results follow: ');
console.log(results);
}
console.log('=> All tasks done. Results follow: ');
console.log(results);
});
});
};
Expand Down