Merge branch 'release/0.4.2'

SungardAS · Dec 17, 2016 · 61a2eeb · 61a2eeb
2 parents 1e17b8c + d6afe01
commit 61a2eeb
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.2] - 2016-12-16
+### Changed
+- replaced loglevel with winston logs
+
 ## [0.4.1] - 2016-12-14
 ### Added
 - logging levels with **loglevel** - set with environment

diff --git a/lib/log.js b/lib/log.js
@@ -0,0 +1,19 @@
+var properties = require("./properties");
+var winston = require("winston");
+
+
+module.exports.getLogger = function() {
+  var logger = new (winston.Logger)({
+    transports: [
+      new (winston.transports.Console)({
+        level: properties.logLevel,
+        json: true,
+        stringify: true,
+        timestamp: true
+      })
+    ]
+  });
+  return logger;
+};
+
+
diff --git a/lib/resources/elasticgroup/create.js b/lib/resources/elasticgroup/create.js
@@ -1,17 +1,21 @@
 var handler  = require('lambda-formation').resource.create;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var properties = require("../../properties");
 var request  = require('request');
 var spotUtil = require('../../util');
 
 var create = function(err, event, context) {
+
   if(err) {
+    log.error("Create Error", {data: err});
     return spotUtil.done(err);
   }
 
   spotUtil.getTokenAndConfig(event, function(err, tc) {
     if(err) return spotUtil.done(err, event, context);
 
+    log.debug("Spotinst Create Event", {data: event});
+
     var createOptions = {
       method:  'POST',
       url:     properties.restUrl + '/aws/ec2/group',
@@ -24,8 +28,11 @@ var create = function(err, event, context) {
       }
     };
 
-    log.info('Creating group: ' + JSON.stringify(tc.config, null, 2));
+    log.info('Creating group config', {data: tc.config});
     request(createOptions, function(err, res, body) {
+
+      log.debug("Create group payload",{data: body});
+
       spotUtil.validateResponse({
         err:       err,
         res:       res,
@@ -35,7 +42,7 @@ var create = function(err, event, context) {
         resource:  'elasticgroup',
         action:    'create',
         successCb: function(spotResponse) {
-          log.debug(err,event,body);
+          log.debug("Create Validation Successful");
           spotUtil.done(err, event, context, body, body.response.items[0].id);
         }
       });
@@ -45,6 +52,7 @@ var create = function(err, event, context) {
 
 /* Do not change this function */
 module.exports.handler = function(event, context) {
+  log.silly("Entering Spotinst Create Handler");
   handler.apply(this, [event, context, create]);
 };
 
diff --git a/lib/resources/elasticgroup/delete.js b/lib/resources/elasticgroup/delete.js
@@ -1,6 +1,6 @@
 var _        = require('lodash');
 var handler  = require('lambda-formation').resource.delete;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var request  = require('request');
 var spotUtil = require('../../util');
 var properties = require("../../properties");
@@ -43,7 +43,7 @@ var destroy = function(err, event, context) {
           spotUtil.done(err, event, context, body);
         },
         failureCb: function(spotResponse) {
-          log.error("Can't delete the group, check if the group even exists")
+          log.error("Can't delete the group, check if the group " + refId + "exists")
           validateGroup(refId, token, event, context);
         }
       });

diff --git a/lib/resources/elasticgroup/update.js b/lib/resources/elasticgroup/update.js
@@ -1,6 +1,6 @@
 var _        = require('lodash');
 var handler  = require('lambda-formation').resource.update;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var properties = require("../../properties");
 var request  = require('request');
 var spotUtil = require('../../util');
@@ -57,8 +57,8 @@ var update = function(err, event, context) {
       });
     };
 
-    log.info('Updating group ' + refId + ':' + JSON.stringify(tc.config, null, 2));
-    log.debug('Update Policy config: ' + JSON.stringify(updatePolicy, null, 2));
+    log.info('Updating group',{data: tc.config});
+    log.debug('Update Policy config', {data: updatePolicy});
 
     request(updateOptions, function(err, res, body) {
       spotUtil.validateResponse({

diff --git a/lib/resources/subscription/create.js b/lib/resources/subscription/create.js
@@ -1,5 +1,5 @@
 var handler = require('lambda-formation').resource.create;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var properties = require("../../properties");
 var request = require('request');
 var spotUtil = require('../../util');
@@ -24,7 +24,7 @@ var create = function (err, event, context) {
       }
     };
 
-    log.info('Creating subscription: ' + JSON.stringify(tc.config, null, 2));
+    log.info('Creating subscription', {data: tc.config});
     request(createOptions, function (err, res, body) {
       spotUtil.validateResponse({
         err: err,

diff --git a/lib/resources/subscription/delete.js b/lib/resources/subscription/delete.js
@@ -1,6 +1,6 @@
 var _ = require('lodash');
 var handler = require('lambda-formation').resource.delete;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var properties = require("../../properties");
 var request = require('request');
 var spotUtil = require('../../util');

diff --git a/lib/resources/subscription/update.js b/lib/resources/subscription/update.js
@@ -1,5 +1,5 @@
 var handler = require('lambda-formation').resource.update;
-var log = require("loglevel");
+var log = require("../../log").getLogger();
 var properties = require("../../properties");
 var request = require('request');
 var spotUtil = require('../../util');
@@ -27,7 +27,7 @@ var update = function (err, event, context) {
       }
     };
 
-    log.info('Updating subscription ' + refId + ' ' + JSON.stringify(tc.config, null, 2));
+    log.info('Updating subscription', {data: tc.config});
     request(createOptions, function (err, res, body) {
       spotUtil.validateResponse({
         err: err,

diff --git a/lib/util.js b/lib/util.js
@@ -1,6 +1,6 @@
 var _    = require('lodash');
 var diff = require('deep-diff');
-var log = require("loglevel");
+var log = require("./log").getLogger();
 var properties = require("./properties");
 var request = require('request');
 var util    = require('lambda-formation').util;
@@ -117,7 +117,8 @@ var validateResponse = module.exports.validateResponse = function(spotResponse)
   var event   = spotResponse.event;
   var context = spotResponse.context;
 
-  log.info('Spotinst response: ' + JSON.stringify(body, null, 2));
+  //log.info('Spotinst response',JSON.stringify(body, null, 2));
+  log.info('Spotinst response',{data: body});
 
   if(res.statusCode > 201) {
     var errMsg = '';

diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "spotinst-lambda",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "publishConfig": {
     "tag": "latest"
   },
   "description": "AWS Lambda scripts to interface with Spotinst",
   "main": "index.js",
   "scripts": {
-    "test": "./node_modules/.bin/mocha --recursive --timeout 7000",
+    "test": "spotinst_lambda_logLevel=silent ./node_modules/.bin/mocha --recursive --timeout 7000",
     "dist": "zip -FSr dist/spotinst-lambda.zip * -x \"*.git*\" \"dist/*\""
   },
   "author": {
@@ -28,6 +28,7 @@
     "lodash": "^4.17.2",
     "loglevel": "^1.4.1",
     "rc": "^1.1.6",
-    "request": "^2.79.0"
+    "request": "^2.79.0",
+    "winston": "^2.3.0"
   }
 }