aws-lambda-runner 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e5c0d53686fa3db9d9e0ee802ef4b70f2a25d5
-  data.tar.gz: e85652219b0b1459d917d6723a3e0b916410b962
+  metadata.gz: 1072f1479b4079a9ad869e54f88e9d7868c5b43b
+  data.tar.gz: 8385219cdbf104fed5b41b7b44192e78023c0e25
 SHA512:
-  metadata.gz: a7d27ed31291f9a515c1d7dc9d7d079953c1888e9ca0778881367b7afc72fd75460402d469488877ab338d4e2d2667b97ac3e7f3adb65b8170c3e3878844e8d3
-  data.tar.gz: b9cd0da1e68c7f612cbb0b66e6a01642e15249f424ed1d230e374fafee5a1928fc929db7e024a42d7aa08d31cccfba66768a1c6bc6c00fc62dafc912bcc932ee
+  metadata.gz: a36af0663924daa993afb7eac23650e743f7687aa8169a2157959be3866f75e94663a18944da8fd599d8b985d7efb4c709c36abe2b30867d05eda29381a67cd2
+  data.tar.gz: fa743cd813123c3dc80dee145b0fee65d942a0dec0515c5c063bcd1b0c2978e4deb885a7fe1d7fb8113f6c2e887d67663fcc0cf9eaf74fc3ce99a5ff93bb7897

data/js/package.json

@@ -9,6 +9,7 @@
   "author": "",
   "license": " ",
   "devDependencies": {
+    "assert": "^1.3.0",
     "jshint": "^2.5.11",
     "mocha": "^2.1.0",
     "mocha-jshint": "0.0.9",
@@ -18,6 +19,7 @@
   "dependencies": {
     "aws-sdk": "^2.1.34",
     "istanbul": "^0.3.6",
+    "merge": "^1.2.0",
     "mock-req": "^0.1.0",
     "stdio": "^0.2.7"
   }

data/js/request.js

@@ -1,9 +1,14 @@
+var merge = require('merge');
 var url = require('url');
 
 var next_id = 0;
 // results[id] = { threw: error, completed: [ errorValue, successValue ], timedOut: bool };
 var results = {};
 
+var region = function () {
+    return process.env.AWS_DEFAULT_REGION || process.env.AWS_REGION || process.env.AMAZON_REGION || "xx-dummy-0";
+};
+
 exports.request = function(req, res, opts, handler) {
 
   if (req.method === 'POST') {
@@ -37,15 +42,37 @@ exports.request = function(req, res, opts, handler) {
       res.writeHead(200, {'Content-Type': 'text/plain'});
       res.end(String(id));
 
-      try {
-        handler(requestObject, {
-          done: function(err, message) {
-            results[id].completed = [ err, message ];
-            if (err) {
-              console.warn('Error:', err);
-            }
+      var approximateEndTime = (new Date().getTime()) + opts.timeout;
+
+      var context = {
+        done: function(err, message) {
+          results[id].completed = [ err, message ];
+          if (err) {
+            console.warn('Error:', err);
           }
-        });
+        },
+        getRemainingTimeInMillis: function () {
+          return approximateEndTime - (new Date().getTime());
+        },
+
+        // Fixed, but reasonably representative
+        functionName: "via-aws-lambda-runner",
+        functionVersion: "$LATEST",
+        invokedFunctionArn: "arn:aws:lambda:" + region() + ":000000000000:function:via-aws-lambda-runner:$LATEST",
+        memoryLimitInMB: 100,
+        awsRequestId: "00000000-0000-0000-0000-000000000000",
+        logGroupName: "/aws/lambda/via-aws-lambda-runner",
+        logStreamName: "some-log-stream-name",
+      };
+
+      context.fail = function(err) { context.done(err, null); };
+      context.succeed = function(data) { context.done(null, data); };
+
+      var event = requestObject.event;
+      merge(context, requestObject.context || {});
+
+      try {
+        handler(event, context);
       } catch (e) {
         console.log("Handler crashed", e);
         results[id].threw = e;
@@ -74,7 +101,7 @@ exports.request = function(req, res, opts, handler) {
       status = 404;
     } else {
       if (result.completed) {
-        if (result.completed[0] !== null) {
+        if (result.completed[0] !== null && result.completed[0] !== undefined) {
           status = 502;
           responseBody = result.completed[0];
         } else {
@@ -92,6 +119,9 @@ exports.request = function(req, res, opts, handler) {
       }
     }
 
+    // non-standard stringification of undefined
+    if (responseBody === undefined) responseBody = null;
+
     res.writeHead(status, {'Content-Type': 'application/json'});
     res.end(JSON.stringify(responseBody) + '\n');
 

data/lib/lambda_runner.rb

@@ -50,8 +50,9 @@ module LambdaRunner
       "http://localhost:#{@port}/"
     end
 
-    def send(message)
-      id = RestClient.post(url, message, content_type: :json).to_str
+    def process_event(event, context = {})
+      payload = JSON.generate({ event: event, context: context })
+      id = RestClient.post(url, payload, content_type: :json).to_str
       loop do
         response = RestClient.get(url, params: { id: id })
         data = JSON.parse('['+response.body+']').first

data/lib/sample_cloudwatch_event.json

@@ -0,0 +1,26 @@
+{
+  "AWSAccountId": "475907659466",
+  "AlarmDescription": null,
+  "AlarmName": "cw-sns-lambda-test-alarm",
+  "NewStateReason": "Insufficient Data: 1 datapoint was unknown.",
+  "NewStateValue": "INSUFFICIENT_DATA",
+  "OldStateValue": "ALARM",
+  "Region": "EU - Ireland",
+  "StateChangeTime": "2015-09-30T12:08:32.313+0000",
+  "Trigger": {
+    "ComparisonOperator": "GreaterThanOrEqualToThreshold",
+    "Dimensions": [
+      {
+        "name": "FunctionName",
+        "value": "echo"
+      }
+    ],
+    "EvaluationPeriods": 1,
+    "MetricName": "Invocations",
+    "Namespace": "AWS/Lambda",
+    "Period": 60,
+    "Statistic": "AVERAGE",
+    "Threshold": 0,
+    "Unit": null
+  }
+}

data/lib/sample_scheduled_event.json

@@ -0,0 +1,12 @@
+{
+  "account": "244376974009",
+  "detail": {},
+  "detail-type": "Scheduled Event",
+  "id": "f6a3b160-89b8-45ba-b934-a42790456ad8",
+  "region": "eu-west-1",
+  "resources": [
+    "arn:aws:events:eu-west-1:244376974009:rule/5min"
+  ],
+  "source": "aws.events",
+  "time": "2015-10-28T09:26:29Z"
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lambda-runner
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - andrew wheat
@@ -148,8 +148,10 @@ files:
 - js/request.js
 - js/startup.js
 - lib/lambda_runner.rb
+- lib/sample_cloudwatch_event.json
 - lib/sample_s3_event.json
 - lib/sample_s3_test_event.json
+- lib/sample_scheduled_event.json
 - lib/sample_sns_event.json
 - spec/lambda-runner_spec.rb
 homepage: https://github.com/bbc/aws-lambda-runner