Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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
blairg wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow. #26

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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules
218 changes: 119 additions & 99 deletions index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
let loggerImpl;
let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
}

if(!lambda) {
if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
if (!lambdaNew) {
if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
AWS.config.credentials = credentials;
}

if (process.env.HTTPS_PROXY) {
if (!AWS.config.httpOptions) {
AWS.config.httpOptions = {};
}
var HttpsProxyAgent = require('https-proxy-agent');
AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
}

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
region: config.region,
accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
sessionToken: "sessionToken" in config ? config.sessionToken : ""
accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
sessionToken: 'sessionToken' in config ? config.sessionToken : '',
});
}

var params = {
const params = {
FunctionName: config.functionName,
Description: config.description,
Handler: config.handler,
Role: config.role,
Timeout: config.timeout,
MemorySize: config.memorySize
MemorySize: config.memorySize,
VpcConfig: null,
BatchSize: null,
Code: {},
Runtime: '',
Publish: false,
};
if (config.vpc) params.VpcConfig = config.vpc;
var isPublish = (config.publish === true);

var updateEventSource = function(eventSource, callback) {
var params = extend({
FunctionName: config.functionName
if (config.vpc) {
params.VpcConfig = config.vpc;
}

const isPublish = (config.publish === true);

const updateEventSource = (eventSource, updateEventSourceCallback) => {
const eventSourceParams = extend({
FunctionName: config.functionName,
}, eventSource);

lambda.listEventSourceMappings({
FunctionName: params.FunctionName,
EventSourceArn: params.EventSourceArn
}, function(err, data) {
if(err) {
logger("List event source mapping failed, please make sure you have permission");
callback(err);
lambdaNew.listEventSourceMappings({
FunctionName: eventSourceParams.FunctionName,
EventSourceArn: eventSourceParams.EventSourceArn,
}, (err, data) => {
if (err) {
loggerImpl('List event source mapping failed, please make sure you have permission');
updateEventSourceCallback(err);
}

if (data.EventSourceMappings.length === 0) {
lambdaNew.createEventSourceMapping(eventSourceParams,
(eventSourceError) => {
if (eventSourceError) {
loggerImpl('Failed to create event source mapping!');
updateEventSourceCallback(eventSourceError);
} else {
updateEventSourceCallback();
}
});
} else {
if (data.EventSourceMappings.length === 0) {
lambda.createEventSourceMapping(params, function(err, data) {
if(err) {
logger("Failed to create event source mapping!");
callback(err);
} else {
callback();
}
});
} else {
async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
lambda.updateEventSourceMapping({
UUID: mapping.UUID,
BatchSize: params.BatchSize
}, iteratorCallback);
}, function(err) {
if(err) {
logger("Update event source mapping failed");
callback(err);
} else {
callback();
}
});
}
async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
lambdaNew.updateEventSourceMapping({
UUID: mapping.UUID,
BatchSize: params.BatchSize,
}, iteratorCallback);
}, (eventSourceMappingsError) => {
if (eventSourceMappingsError) {
loggerImpl('Update event source mapping failed');
updateEventSourceCallback(eventSourceMappingsError);
} else {
updateEventSourceCallback();
}
});
}
});
};

var updateEventSources = function(callback) {
var eventSources;

if(!config.eventSource) {
callback();
const updateEventSources = (updateEventSourcesCallback) => {
if (!config.eventSource) {
updateEventSourcesCallback();
return;
}

eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
? config.eventSource : [config.eventSource];
async.eachSeries(
eventSources,
updateEventSource,
function(err) {
callback(err);
}
(err) => {
callback(err);
},
);
};

var updateFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
if(err) {
return callback('Error reading specified package "'+ codePackage + '"');
const updateFunction = (updateFunctionCallback) => {
stat.readFile(codePackage, (err, data) => {
if (err) {
const returnMessage = `Error reading specified package, ${codePackage}`;
return callback(returnMessage);
}

lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
if (err) {
var warning = 'Package upload failed. '
warning += 'Check your iam:PassRole permissions.'
logger(warning);
callback(err)
} else {
lambda.updateFunctionConfiguration(params, function(err, data) {
if (err) {
var warning = 'Update function configuration failed. '
logger(warning);
callback(err);
} else {
updateEventSources(callback);
}
});
}
});
lambdaNew.updateFunctionCode({
FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
(updateFunctionCodeError) => {
if (updateFunctionCodeError) {
let warning = 'Package upload failed. ';
warning += 'Check your iam:PassRole permissions.';
logger(warning);
updateFunctionCallback(updateFunctionCodeError);
} else {
lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
if (updateFunctionConfigurationError) {
const warning = 'Update function configuration failed. ';
logger(warning);
updateFunctionCallback(updateFunctionConfigurationError);
} else {
updateEventSources(updateFunctionCallback);
}
});
}
});

return true;
});
};

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
if(err) {
return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
if (createFunctionError) {
return callback(`Error reading specified package ${codePackage}`);
}

params['Code'] = { ZipFile: data };
params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
params.Code = { ZipFile: createFunctionData };
params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
if (err) {
var warning = 'Create function failed. '
warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
warning += 'Check your iam:PassRole permissions.';
logger(warning);
callback(err)
createFunctionCallback(err);
} else {
updateEventSources(callback);
}
});

return true;
});
};


lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
if (err) {
if (err.statusCode === 404) {
createFunction(callback);
} else {
var warning = 'AWS API request failed. '
warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
warning += 'Check your AWS credentials and permissions.';
logger(warning);
callback(err);
}
Expand Down
19 changes: 15 additions & 4 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
"name": "node-aws-lambda",
"version": "0.1.8",
"version": "0.1.9",
"description": "A module help you automate AWS lambda function deployment.",
"scripts": {
"test": "./node_modules/mocha/bin/mocha test/all.js"
"test": "./node_modules/mocha/bin/mocha test/all.js",
"lint": "./node_modules/.bin/eslint **.js",
"flow": "flow; test $? -eq 0 -o $? -eq 2"
},
"repository": {
"type": "git",
Expand All@@ -22,11 +24,20 @@
"dependencies": {
"async": "^1.0.0",
"aws-sdk": "2.x.x",
"https-proxy-agent": "^1.0.0"
"babel-eslint": "^7.1.1",
"eslint-plugin-flowtype": "^2.25.0",
"fs": "0.0.1-security",
"https-proxy-agent": "^1.0.0",
"loggerpro": "^1.0.2",
"util-extend": "^1.0.3"
},
"devDependencies": {
"mocha": "^2.2.1",
"chai": "^2.1.1",
"eslint": "^3.10.2",
"eslint-config-airbnb-base": "^10.0.1",
"eslint-plugin-import": "^2.2.0",
"flow-bin": "^0.35.0",
"mocha": "^2.2.1",
"node-uuid": "^1.4.3"
}
}
40 changes: 40 additions & 0 deletions test/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.#26

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

blairg
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Upgraded to ES6. Added AirBnb EsLint file. Added support for Flow.
#26
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


3 changes: 2 additions & 1 deletion
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
/node_modules/*
node_modules
test/node_modules

218 changes: 119 additions & 99 deletions
index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,163 +1,183 @@
var fs = require('fs');
var AWS = require('aws-sdk');
var extend = require('util')._extend;
var async = require('async');
// @flow

import { stat } from 'fs';
import { AWS } from 'aws-sdk';
import { extend } from 'util-extend';
import { async } from 'async';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { loggerpro } from 'loggerpro';

exports.deploy = (codePackage: string, config: any, callback: any, logger: any, lambda: any) => {
 let loggerImpl;
 let lambdaNew = lambda;

exports.deploy = function(codePackage, config, callback, logger, lambda) {
 if (!logger) {
logger = console.log;
loggerImpl = loggerpro;
 }

 if(!lambda) {
 if("profile" in config) {
var credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 if (!lambdaNew) {
 if ('profile' in config) {
const credentials = new AWS.SharedIniFileCredentials({profile: config.profile});
 AWS.config.credentials = credentials;
 }

 if (process.env.HTTPS_PROXY) {
 if (!AWS.config.httpOptions) {
 AWS.config.httpOptions = {};
 }
 var HttpsProxyAgent = require('https-proxy-agent');
 AWS.config.httpOptions.agent = new HttpsProxyAgent(process.env.HTTPS_PROXY);
 }

lambda = new AWS.Lambda({
lambdaNew = new AWS.Lambda({
 region: config.region,
 accessKeyId: "accessKeyId" in config ? config.accessKeyId : "",
 secretAccessKey: "secretAccessKey" in config ? config.secretAccessKey : "",
 sessionToken: "sessionToken" in config ? config.sessionToken : ""
 accessKeyId: 'accessKeyId' in config ? config.accessKeyId : '',
 secretAccessKey: 'secretAccessKey' in config ? config.secretAccessKey : '',
 sessionToken: 'sessionToken' in config ? config.sessionToken : '',
 });
 }

var params = {
const params = {
 FunctionName: config.functionName,
 Description: config.description,
 Handler: config.handler,
 Role: config.role,
 Timeout: config.timeout,
 MemorySize: config.memorySize
 MemorySize: config.memorySize,
 VpcConfig: null,
 BatchSize: null,
 Code: {},
 Runtime: '',
 Publish: false,
 };
 if (config.vpc) params.VpcConfig = config.vpc;
 var isPublish = (config.publish === true);

 var updateEventSource = function(eventSource, callback) {
 var params = extend({
 FunctionName: config.functionName
 if (config.vpc) {
 params.VpcConfig = config.vpc;
 }

 const isPublish = (config.publish === true);

 const updateEventSource = (eventSource, updateEventSourceCallback) => {
 const eventSourceParams = extend({
 FunctionName: config.functionName,
 }, eventSource);

 lambda.listEventSourceMappings({
 FunctionName: params.FunctionName,
 EventSourceArn: params.EventSourceArn
 }, function(err, data) {
 if(err) {
 logger("List event source mapping failed, please make sure you have permission");
 callback(err);
 lambdaNew.listEventSourceMappings({
 FunctionName: eventSourceParams.FunctionName,
 EventSourceArn: eventSourceParams.EventSourceArn,
 }, (err, data) => {
 if (err) {
 loggerImpl('List event source mapping failed, please make sure you have permission');
 updateEventSourceCallback(err);
 }

 if (data.EventSourceMappings.length === 0) {
 lambdaNew.createEventSourceMapping(eventSourceParams,
 (eventSourceError) => {
 if (eventSourceError) {
 loggerImpl('Failed to create event source mapping!');
 updateEventSourceCallback(eventSourceError);
 } else {
 updateEventSourceCallback();
 }
 });
 } else {
 if (data.EventSourceMappings.length === 0) {
 lambda.createEventSourceMapping(params, function(err, data) {
 if(err) {
 logger("Failed to create event source mapping!");
 callback(err);
 } else {
 callback();
 }
 });
 } else {
 async.eachSeries(data.EventSourceMappings, function(mapping, iteratorCallback) {
 lambda.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize
 }, iteratorCallback);
 }, function(err) {
 if(err) {
 logger("Update event source mapping failed");
 callback(err);
 } else {
 callback();
 }
 });
 }
 async.eachSeries(data.EventSourceMappings, (mapping, iteratorCallback) => {
 lambdaNew.updateEventSourceMapping({
 UUID: mapping.UUID,
 BatchSize: params.BatchSize,
 }, iteratorCallback);
 }, (eventSourceMappingsError) => {
 if (eventSourceMappingsError) {
 loggerImpl('Update event source mapping failed');
 updateEventSourceCallback(eventSourceMappingsError);
 } else {
 updateEventSourceCallback();
 }
 });
 }
 });
 };

 var updateEventSources = function(callback) {
 var eventSources;

 if(!config.eventSource) {
 callback();
 const updateEventSources = (updateEventSourcesCallback) => {
 if (!config.eventSource) {
 updateEventSourcesCallback();
 return;
 }

 eventSources = Array.isArray(config.eventSource) ? config.eventSource : [ config.eventSource ];

const eventSources = Array.isArray(config.eventSource)
 ? config.eventSource : [config.eventSource];
 async.eachSeries(
 eventSources,
 updateEventSource,
function(err) {
 callback(err);
}
(err) => {
callback(err);
 },
 );
 };

 var updateFunction = function(callback) {
 fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
 const updateFunction = (updateFunctionCallback) => {
 stat.readFile(codePackage, (err, data) => {
 if (err) {
 const returnMessage = `Error reading specified package, ${codePackage}`;
 return callback(returnMessage);
 }

 lambda.updateFunctionCode({FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish}, function(err, data) {
 if (err) {
 var warning = 'Package upload failed. '
 warning += 'Check your iam:PassRole permissions.'
 logger(warning);
 callback(err)
 } else {
 lambda.updateFunctionConfiguration(params, function(err, data) {
 if (err) {
 var warning = 'Update function configuration failed. '
 logger(warning);
 callback(err);
 } else {
 updateEventSources(callback);
 }
 });
 }
 });
 lambdaNew.updateFunctionCode({
 FunctionName: params.FunctionName, ZipFile: data, Publish: isPublish },
 (updateFunctionCodeError) => {
 if (updateFunctionCodeError) {
 let warning = 'Package upload failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
 updateFunctionCallback(updateFunctionCodeError);
 } else {
 lambdaNew.updateFunctionConfiguration(params, (updateFunctionConfigurationError) => {
 if (updateFunctionConfigurationError) {
 const warning = 'Update function configuration failed. ';
 logger(warning);
 updateFunctionCallback(updateFunctionConfigurationError);
 } else {
 updateEventSources(updateFunctionCallback);
 }
 });
 }
 });

 return true;
 });
 };

var createFunction = function(callback) {
fs.readFile(codePackage, function(err, data) {
 if(err) {
 return callback('Error reading specified package "'+ codePackage + '"');
const createFunction = (createFunctionCallback) => {
stat.readFile(codePackage, (createFunctionError, createFunctionData) => {
 if (createFunctionError) {
 return callback(`Error reading specified package ${codePackage}`);
 }

 params['Code'] = { ZipFile: data };
 params['Runtime'] = "runtime" in config ? config.runtime : "nodejs4.3";
 params['Publish'] = isPublish;
lambda.createFunction(params, function(err, data) {
 params.Code = { ZipFile: createFunctionData };
 params.Runtime = 'runtime' in config ? config.runtime : 'nodejs4.3';
 params.Publish = isPublish;
lambdaNew.createFunction(params, (err) => {
 if (err) {
var warning = 'Create function failed. '
 warning += 'Check your iam:PassRole permissions.'
let warning = 'Create function failed. ';
 warning += 'Check your iam:PassRole permissions.';
 logger(warning);
callback(err)
createFunctionCallback(err);
 } else {
 updateEventSources(callback);
 }
 });

 return true;
 });
 };


 lambda.getFunction({FunctionName: params.FunctionName}, function(err, data) {
 lambdaNew.getFunction({ FunctionName: params.FunctionName }, (err) => {
 if (err) {
 if (err.statusCode === 404) {
 createFunction(callback);
 } else {
var warning = 'AWS API request failed. '
 warning += 'Check your AWS credentials and permissions.'
let warning = 'AWS API request failed. ';
 warning += 'Check your AWS credentials and permissions.';
 logger(warning);
 callback(err);
 }
Expand Down

19 changes: 15 additions & 4 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
{
 "name": "node-aws-lambda",
 "version": "0.1.8",
 "version": "0.1.9",
 "description": "A module help you automate AWS lambda function deployment.",
 "scripts": {
 "test": "./node_modules/mocha/bin/mocha test/all.js"
 "test": "./node_modules/mocha/bin/mocha test/all.js",
 "lint": "./node_modules/.bin/eslint **.js",
 "flow": "flow; test $? -eq 0 -o $? -eq 2"
 },
 "repository": {
 "type": "git",
Expand All@@ -22,11 +24,20 @@
 "dependencies": {
 "async": "^1.0.0",
 "aws-sdk": "2.x.x",
 "https-proxy-agent": "^1.0.0"
 "babel-eslint": "^7.1.1",
 "eslint-plugin-flowtype": "^2.25.0",
 "fs": "0.0.1-security",
 "https-proxy-agent": "^1.0.0",
 "loggerpro": "^1.0.2",
 "util-extend": "^1.0.3"
 },
 "devDependencies": {
 "mocha": "^2.2.1",
 "chai": "^2.1.1",
 "eslint": "^3.10.2",
 "eslint-config-airbnb-base": "^10.0.1",
 "eslint-plugin-import": "^2.2.0",
 "flow-bin": "^0.35.0",
 "mocha": "^2.2.1",
 "node-uuid": "^1.4.3"
 }
}

40 changes: 40 additions & 0 deletions
test/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
0.1.9
=====
* Converted to ES6 (by @blairg)
* Added AirBnb EsLint configuration (by @blairg)
* Support for Flow (by @blairg)

0.1.8
=====
* Support VPC (by @tilfin)
* Support authentication with sessionToken (by @JohnBloom)
* Support Publish flag (by @hiro-koba)

0.1.7
=====
* Support python and other runtime (by @kikusu)
* Support specifying multiple event sources (by @driadi)

0.1.6
=====
* Support specifying descriptions (by @dlhdesign)

0.1.5
=====
* HTTPS proxy support (by @dvonlehman)

0.1.4
=====
* Add "profile" option to enable load AWS credentials from custom profile (by @bryannaegele)

0.1.3
=====
* Add optional accessKeyId and secretAccessKey (by @ikait)

0.1.2
=====
* Add support for memorySize option (by @ikait)

0.1.1
=====
* Skip event source mapping if not specified.
Loading