Update sailor to 2.5.4 (#33)

Author: Olha Virolainen

CHANGELOG.md

@@ -1,4 +1,9 @@
-# 1.2.0 (December , 2019)
+# 1.2.1 (December 26, 2019)
+
+## General Changes
+    * Update sailor version to 2.5.4
+    
+# 1.2.0 (December 19, 2019)
 
 ## General Changes
     * Add `Rename file` action

README.md

@@ -41,10 +41,17 @@ The component is based on [AWS S3 SDK](https://aws.amazon.com/sdk-for-node-js/ '
 
 #### Environment variables
 For integration-tests is required to specify following environment variables:
+
 `ACCESS_KEY_ID` - access key ID;
+
 `ACCESS_KEY_SECRET` - secret access key.
+
 `REGION` - region.
 
+For debugging purposes there is: 
+
+`LOG_LEVEL` - `trace` | `debug` | `info` | `warning` | `error` that controls logger level.
+
 ## Credentials
 Access keys consist of two parts: an access key ID and a secret access key. 
 Like a user name and password, you must use both the access key ID and secret access key together to authenticate your requests.

lib/StatelessBasicAuthRestClient.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-param-reassign,no-underscore-dangle,no-console */
+/* eslint-disable no-param-reassign,no-underscore-dangle */
 // eslint-disable-next-line max-classes-per-file
 const { promisify } = require('util');
 const request = promisify(require('requestretry'));
@@ -23,7 +23,7 @@ const NoAuthRestClient = class NoAuthRestClient {
     const urlToCall = urlIsSegment
       ? `${removeTrailingSlash(this.cfg.resourceServerUrl.trim())}/${removeLeadingSlash(url.trim())}`
       : url.trim();
-    console.log(`Making ${method} request to ${urlToCall} ...`);
+    this.emitter.logger.info(`Making ${method} request to ${urlToCall} ...`);
 
     const requestOptions = {
       url: urlToCall,
@@ -50,13 +50,14 @@ const NoAuthRestClient = class NoAuthRestClient {
 
   // eslint-disable-next-line class-methods-use-this
   getRequest() {
+    const self = this;
     let counter = 0;
     return function retryRequest(options, retryCnt, inputStream) {
       if (counter === retryCnt) {
         inputStream.end();
         return;
       }
-      console.log('Client failed making request, attempt: %s', counter);
+      self.emitter.logger.info('Client failed making request, attempt: %s', counter);
       const stream = rawRequest(options)
         .on('response', (response) => {
           if ((response.statusCode >= 404 || response.toString().trim()
@@ -68,7 +69,7 @@ const NoAuthRestClient = class NoAuthRestClient {
           }
         })
         .on('error', (err) => {
-          console.error(err);
+          self.emitter.logger.error(err);
           counter += 1;
           setTimeout(retryRequest.bind(this), 3000, options, retryCnt, inputStream);
         });

lib/actions/readFile.js

@@ -24,7 +24,7 @@ exports.process = async function (msg, cfg) {
     const xmlDoc = JSON.parse(convert.xml2json(fileContent));
     await this.emit('data', messages.newMessageWithBody(xmlDoc));
   } else {
-    const response = await attachmentProcessor.addAttachment(msg, filename,
+    const response = await attachmentProcessor.addAttachment.call(this, msg, filename,
       fileContent, contentType);
     const output = messages.newMessageWithBody(response);
     output.attachments = response.attachments;

lib/actions/streamToCsv.js

@@ -44,7 +44,7 @@ function processAction(msg, cfg) {
       _.map(columnConfig, (column) => {
         columns[column.property] = column.title;
       });
-      console.log('Processing following column configuration columns=%j', columns);
+      self.logger.info('Processing following column configuration columns=%j', columns);
       const stringifier = csvParser.stringify({ header: true, columns });
       const upload = streamClient.upload({
         Bucket: cfg.bucketName,
@@ -55,9 +55,9 @@ function processAction(msg, cfg) {
       outStream = stringifier;
       // Register shutdown hook
       process.on('exit', () => {
-        console.log('Shutting down');
+        self.logger.info('Shutting down');
         stringifier.end();
-        console.log('Shutdown completed');
+        self.logger.info('Shutdown completed');
       });
     }
     return outStream;
@@ -67,7 +67,7 @@ function processAction(msg, cfg) {
     stream.write(msg.body);
     counter++;
     if (counter >= 10000) {
-      console.log('Flushing the log file');
+      self.logger.info('Flushing the log file');
       outStream.end();
       outStream = null;
       counter = 0;
@@ -81,12 +81,12 @@ function processAction(msg, cfg) {
   }
 
   function emitError(e) {
-    console.log('Oops! Error occurred', e.stack || e);
+    self.logger.info('Oops! Error occurred', e.stack || e);
     self.emit('error', e);
   }
 
   function emitEnd() {
-    console.log('Finished execution');
+    self.logger.info('Finished execution');
     self.emit('end');
   }
 

lib/utils/attachmentProcessor.js

@@ -1,22 +1,12 @@
-/* eslint-disable no-use-before-define,no-param-reassign,no-console */
-const debug = require('debug')('attachment');
+/* eslint-disable no-param-reassign */
 const request = require('request');
 const { Readable } = require('stream');
 const { BasicAuthRestClient } = require('../StatelessBasicAuthRestClient');
 
-exports.addAttachment = addAttachment;
-
 function addAttachment(msg, name, body, contentType) {
-  return getUrlsManualy().then((result) => {
-    debug('createSignedUrl result: %j', result);
-    debug('Uploading to url: %s', result.put_url);
-    debug('Content-Type: %s', contentType);
-    console.log('uploadFile is about to execute');
-    return uploadFile(result, contentType);
-  });
-
+  const self = this;
   async function getUrlsManualy() {
-    const attachmentClient = new BasicAuthRestClient(this, {
+    const attachmentClient = new BasicAuthRestClient(self, {
       resourceServerUrl: 'http://api-service.platform.svc.cluster.local.:9000',
     }, process.env.ELASTICIO_API_USERNAME, process.env.ELASTICIO_API_KEY);
 
@@ -27,7 +17,7 @@ function addAttachment(msg, name, body, contentType) {
   }
 
   async function uploadFile(urls) {
-    debug('Trying to upload file: %j', body);
+    self.logger.debug('Trying to upload file: %j', body);
 
     const stream = new Readable();
     stream.push(body.toString());
@@ -44,4 +34,14 @@ function addAttachment(msg, name, body, contentType) {
     };
     return msg;
   }
+
+  return getUrlsManualy().then((result) => {
+    self.logger.debug('createSignedUrl result: %j', result);
+    self.logger.debug('Uploading to url: %s', result.put_url);
+    self.logger.debug('Content-Type: %s', contentType);
+    self.logger.info('uploadFile is about to execute');
+    return uploadFile(result, contentType);
+  });
 }
+
+exports.addAttachment = addAttachment;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "amazon-s3-component",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "elastic.io integration component that can read and write to AWS S3",
   "homepage": "http://elastic.io",
   "author": {
@@ -34,7 +34,7 @@
     "csv": "0.4.6",
     "debug": "2.6.9",
     "elasticio-node": "0.0.9",
-    "elasticio-sailor-nodejs": "2.5.1",
+    "elasticio-sailor-nodejs": "2.5.4",
     "iconv-lite": "0.4.24",
     "lodash": "4.17.11",
     "mime-types": "2.1.21",

package.json

@@ -1,6 +1,7 @@
 /* eslint-disable func-names */
 const chai = require('chai');
 const sinon = require('sinon');
+const bunyan = require('bunyan');
 const readFile = require('../lib/actions/readFile');
 const { BasicAuthRestClient } = require('../lib/StatelessBasicAuthRestClient');
 require('dotenv').config();
@@ -16,8 +17,11 @@ const defaultCfg = {
 
 const defaultMsg = {};
 
+const logger = bunyan.createLogger({ name: 'readFile', level: 'info' });
+
 const self = {
   emit: sinon.spy(),
+  logger,
 };
 
 describe('readFile', () => {

spec-integration/readFile.spec.js

@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const { expect } = chai;
 const bunyan = require('bunyan');
 
-const logger = bunyan.createLogger({ name: 'RenameFile', level: 'trace' });
+const logger = bunyan.createLogger({ name: 'RenameFile', level: 'info' });
 const { Client } = require('../lib/client');
 const renameFile = require('../lib/actions/renameObject');