Debug build (#44)

Tracking down #43
Bumping node runtime to latest
Added suffix to template

Author: rferreira

.circleci/config.yml

@@ -9,8 +9,8 @@ jobs:
       - run:
           name: update-npm
           command: 'sudo npm install -g npm@latest'
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+#      - restore_cache:
+#          key: dependency-cache-{{ checksum "package.json" }}
       - run:
           name: install-npm-wee
           command: npm install
@@ -39,8 +39,8 @@ jobs:
       - run:
           name: update-npm
           command: 'sudo npm install -g npm@latest'
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+#      - restore_cache:
+#          key: dependency-cache-{{ checksum "package.json" }}
       - run:
           name: install-npm-wee
           command: npm install

lib/ag-handler.js

@@ -11,6 +11,7 @@ const pkg = require('../package.json');
  */
 exports.handler = async (event, context, callback) => {
   console.log(`handling callback event using ${pkg.name}/v${pkg.version}`);
+  console.log(`environment:${JSON.stringify(process.env)}`);
 
   try {
     assert.ok(event.body !== undefined, "event had no body");

lib/s3-handler.js

@@ -17,6 +17,7 @@ exports.handler = async (event, context, callback) => {
 
   try {
     console.log(`handling s3 event using ${pkg.name}/v${pkg.version}`);
+    console.log(`environment:${JSON.stringify(process.env)}`);
 
     // pre-flight checks:
     assert.ok(CONFIG.CALLBACK_URL !== null, "api callback url cannot be null");

template.yml

@@ -12,6 +12,10 @@ Parameters:
   scaniiApiSecret:
     Description: Your scanii.com API secret
     Type: String
+  envSuffix:
+    Description: The environment name (a suffix really) to be appended to your lambda functions
+    Type: String
+    Default: prod
   actionTagObject:
     Description: Should custom tags be added to S3 objects after processing?
     Type: String
@@ -33,9 +37,9 @@ Resources:
     DependsOn: ScaniiCallbackFn
     Properties:
       CodeUri: .
-      FunctionName: uvasoftware-scanii-lambda-submit
+      FunctionName: !Sub "uvasoftware-scanii-lambda-submit-${envSuffix}"
       Handler: lib/s3-handler.handler
-      Runtime: nodejs10.x
+      Runtime: nodejs12.x
       MemorySize: 256
       Timeout: 60
       Description: Submits objects to be analyzed by scanii.com
@@ -56,9 +60,9 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: .
-      FunctionName: uvasoftware-scanii-lambda-callback
+      FunctionName: !Sub "uvasoftware-scanii-lambda-callback-${envSuffix}"
       Handler: lib/ag-handler.handler
-      Runtime: nodejs10.x
+      Runtime: nodejs12.x
       MemorySize: 256
       Timeout: 60
       Description: Handles scanii.com's result callbacks

tests/actions.js

@@ -1,6 +1,8 @@
 const assert = require('assert');
 const it = require("mocha/lib/mocha.js").it;
 const describe = require("mocha/lib/mocha.js").describe;
+const beforeEach = require("mocha/lib/mocha.js").beforeEach;
+const afterEach = require("mocha/lib/mocha.js").afterEach;
 const actions = require('../lib/actions');
 const AWS = require('aws-sdk-mock');
 

tests/ag-handler.js

@@ -2,6 +2,8 @@ const handler = require('../lib/ag-handler.js').handler;
 const assert = require('assert');
 const it = require("mocha/lib/mocha.js").it;
 const describe = require("mocha/lib/mocha.js").describe;
+const beforeEach = require("mocha/lib/mocha.js").beforeEach;
+const afterEach = require("mocha/lib/mocha.js").afterEach;
 const utils = require('../lib/utils.js');
 const CONFIG = require('../lib/config').CONFIG;
 const AWS = require('aws-sdk-mock');

tests/config.js

@@ -1,6 +1,8 @@
 const assert = require('assert');
 const it = require("mocha/lib/mocha.js").it;
 const describe = require("mocha/lib/mocha.js").describe;
+const beforeEach = require("mocha/lib/mocha.js").beforeEach;
+const afterEach = require("mocha/lib/mocha.js").afterEach;
 const CONFIG = require('../lib/config').CONFIG;
 const actions = require('../lib/actions');
 const AWS = require('aws-sdk-mock');

tests/s3-handler.js

@@ -2,6 +2,8 @@ const handler = require('../lib/s3-handler').handler;
 const assert = require('assert');
 const it = require("mocha/lib/mocha.js").it;
 const describe = require("mocha/lib/mocha.js").describe;
+const beforeEach = require("mocha/lib/mocha.js").beforeEach;
+const afterEach = require("mocha/lib/mocha.js").afterEach;
 const AWS = require('aws-sdk');
 const nock = require('nock');
 const CONFIG = require('../lib/config').CONFIG;

tests/utils.js

@@ -1,6 +1,7 @@
 const assert = require('assert');
 const it = require("mocha/lib/mocha.js").it;
 const describe = require("mocha/lib/mocha.js").describe;
+const beforeEach = require("mocha/lib/mocha.js").beforeEach;
 const utils = require('../lib/utils');
 
 describe('Util tests', () => {