Update for Node4.3 lamda env

Yves Richard · Yves Richard · commit c73bdfd00563 · 2017-02-23T12:52:38.000-07:00
diff --git a/deploy.sh b/deploy.sh
@@ -1,23 +1,12 @@
 #!/usr/bin/env bash
 
 # desc:   zips up lambda function resources and uploads to aws
-# docs:   http://docs.aws.amazon.com/cli/latest/reference/lambda/upload-function.html
+# docs:   http://docs.aws.amazon.com/lambda/latest/dg/API_UpdateFunctionCode.html
 
 zip -r function.zip package.json node_modules/* lib/* index.js
 
-aws lambda upload-function \
- --function-name pgexport \
- --function-zip function.zip  \
- --runtime nodejs  \
- --role arn:aws:iam::674223647607:role/pgexport_lambda_exec_role \
- --handler index.handler  \
- --mode event  \
- --timeout 60  \
- --memory-size 256  \
- --region us-east-1
-
-# aws lambda update-function-code \
-#     --function-name pgexport \
-#     --zip-file fileb://function.zip
+aws lambda update-function-code \
+    --function-name pgexport \
+    --zip-file fileb://function.zip
 
 rm function.zip
diff --git a/index.js b/index.js
@@ -1,13 +1,7 @@
 'use strict';
-var aws = require('aws-sdk');
-var pgp = require('pg-promise')();
-var admZip = require('adm-zip');
-var Q = require('q');
-var _ = require('underscore');
 var PGExport = require('./lib/pg-export');
-var RDSIngress = require('./lib/rds-ingress');
 
-exports.handler = function (event, context) {
+exports.handler = function (event, context, callback) {
 
     var options = {
         bucket: 'pgexport-awslambda',
@@ -34,7 +28,7 @@ exports.handler = function (event, context) {
     actions[event.action](event)
         .then(function (result) {
             console.log(event.action + ' succeeded ');
-            context.done(null, result);
+            callback(null, result);
         })
-        .fail(context.done);
+        .fail(callback);
 };
diff --git a/lib/pg-export.js b/lib/pg-export.js
@@ -98,8 +98,10 @@ PGExport.prototype.exportData = function (queries) {
             return self.put({Key: self.root + '/meta.json', Body: JSON.stringify(self.meta), ContentType: 'application/json'});
         })
         .then(function () {
-            console.log(fileUrl);
-            return fileUrl;
+            console.log('saved archive to: ' + self.key);
+            return {
+                key: self.key
+            };
         })
         .fail(function (e) {
             console.log('error in chain: ', e);
diff --git a/package.json b/package.json
@@ -5,12 +5,12 @@
   "main": "index.js",
   "dependencies": {
     "archiver": "^0.14.4",
+    "aws-sdk": "^2.18.0",
     "csv-stringify": "0.0.8",
     "pg-promise": "^1.0.7",
     "q": "^1.3.0",
     "request": "^2.55.0",
-    "underscore": "^1.8.3",
-    "underscore.string": "^3.0.3"
+    "underscore": "^1.8.3"
   },
   "scripts": {
     "test": "test.js"
diff --git a/test.js b/test.js
@@ -27,11 +27,9 @@ var evt = {
 //     "key": "yves.richard@tesera.com/reports/66f41e6a-d2e6-4f74-94b9-88d7888ece2d/strata.zip"
 // };
 
-var context = {
-    done: function(err, data) {
-        if(err) console.log('lambda exited with errors: ', err)
-        else console.log('lambda exited without errors ', data)
-    }
+var callback = function(err, data) {
+    if(err) console.log('lambda exited with errors: ', err)
+    else console.log('lambda exited without errors ', data)
 };
 
-lambda.handler(evt, context);
+lambda.handler(evt, {}, callback);
