Update sailor version to 2.6.17 (#3)

Olha Virolainen · web-flow · commit 37e6a2d70678 · 2020-10-24T10:32:10.000+03:00
Update sailor version to 2.6.17
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.1 (October 23, 2020)
+
+* Update sailor version to 2.6.17
+
 ## 2.0.0 (October 2, 2020)
 
 * First commit of v2 branch. See https://github.com/elasticio/salesforce-component for the v1 component version details
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![CircleCI](https://circleci.com/gh/elasticio/salesforce-component.svg)](https://circleci.com/gh/elasticio/salesforce-component)
+[![CircleCI](https://circleci.com/gh/elasticio/salesforce-component-v2.svg?style=svg&circle-token=4407ac16eb7e472a4533a176ca180c2c89d41777)](https://circleci.com/gh/elasticio/salesforce-component-v2)
 # Salesforce Component
 ## Table of Contents
 
diff --git a/lib/actions/lookupObject.js b/lib/actions/lookupObject.js
@@ -83,7 +83,6 @@ module.exports.process = async function processAction(message, configuration) {
 
   lookupCache.useCache(configuration.enableCacheUsage);
   const queryKey = lookupCache.generateKeyFromDataArray(configuration.sobject, whereCondition);
-  this.logger.trace(`Current request key hash: "${queryKey}"`);
   if (lookupCache.hasKey(queryKey)) {
     this.logger.info('Cached response found!');
     const response = lookupCache.getResponse(queryKey);
diff --git a/lib/actions/lookupObjects.js b/lib/actions/lookupObjects.js
@@ -188,7 +188,6 @@ module.exports.process = async function processAction(message, configuration) {
   this.logger.debug(`Preparing to query ${configuration.sobject} objects...`);
   this.logger.debug('Building a wherePart...');
   const wherePart = await getWherePart.call(this, message, configuration);
-  this.logger.trace('Where part: ', wherePart);
 
   let limit;
   let offset;
@@ -217,7 +216,6 @@ module.exports.process = async function processAction(message, configuration) {
   lookupCache.useCache(configuration.enableCacheUsage);
   const queryKey = lookupCache.generateKeyFromDataArray(configuration.sobject, wherePart,
     offset, limit, configuration.includeDeleted);
-  this.logger.trace(`Current request key hash: "${queryKey}"`);
   if (lookupCache.hasKey(queryKey)) {
     this.logger.info('Cached response found!');
     records = lookupCache.getResponse(queryKey);
diff --git a/lib/actions/query.js b/lib/actions/query.js
@@ -9,7 +9,7 @@ exports.process = async function processAction(message, configuration) {
     throw new Error('batchSize must be a number');
   }
   const { query } = message.body;
-  this.logger.trace('Starting SOQL Select batchSize=%s query=%s', batchSize, query);
+  this.logger.debug('Starting SOQL Select: batchSize=%s', batchSize);
   if (configuration.allowResultAsSet) {
     this.logger.info('Selected EmitAllHandler');
     const result = await callJSForceMethod.call(this, configuration, 'queryEmitAll', query);
diff --git a/lib/actions/upsert.js b/lib/actions/upsert.js
@@ -37,23 +37,22 @@ module.exports.process = async function upsertObject(message, configuration) {
   const { sobject } = configuration;
   if (message.body.Id) {
     configuration.lookupField = 'Id';
-    this.logger.info('Upserting sobject=%s by internalId', sobject);
-    this.logger.trace('Upserting sobject=%s by internalId=%s, data: %j', sobject, message.body.Id, message);
+    this.logger.debug('Upserting sobject=%s by internalId', sobject);
+    this.logger.trace('Upserting sobject=%s by internalId=%s', sobject, message.body.Id);
     await callJSForceMethod.call(this, configuration, 'sobjectUpdate', message);
   } else {
     if (!configuration.extIdField) {
       throw Error('Can not find internalId/externalId ids');
     }
     configuration.lookupField = configuration.extIdField;
-    this.logger.info('Upserting sobject=%s by externalId', sobject);
-    this.logger.trace('Upserting sobject=%s by externalId=%s, data: %j', sobject, configuration.extIdField, message);
+    this.logger.debug('Upserting sobject=%s by externalId', sobject);
+    this.logger.trace('Upserting sobject=%s by externalId=%s', sobject, configuration.extIdField);
     await callJSForceMethod.call(this, configuration, 'sobjectUpsert', message);
   }
 
   const lookupResults = await callJSForceMethod.call(this, configuration, 'sobjectLookup', message);
   if (lookupResults.length === 1) {
-    this.logger.info('sobject=%s was successfully upserted by %s', sobject, configuration.lookupField);
-    this.logger.trace('sobject=%s was successfully upserted by %s=%s', sobject, configuration.lookupField, message.body[configuration.lookupField]);
+    this.logger.debug('sobject=%s was successfully upserted by %s', sobject, configuration.lookupField);
     await this.emit('data', messages.newMessageWithBody(lookupResults[0]));
     return;
   }
diff --git a/lib/entry.js b/lib/entry.js
@@ -25,20 +25,19 @@ module.exports.process = async function process(message, configuration, snapshot
     snapshot = {
       previousLastModified: configuration.startTime || '1970-01-01T00:00:00.000Z',
     };
-    this.logger.trace('Created snapshot: %j', snapshot);
   } else if (typeof snapshot === 'string') {
     // for backward compatibility
     snapshot = { previousLastModified: snapshot };
-    this.logger.trace('Snapshot has been converted to: %j', snapshot);
+    this.logger.debug('Snapshot has been converted');
   } else {
-    this.logger.trace('Got snapshot: %j', snapshot);
+    this.logger.debug('Snapshot received');
   }
   const { linkedObjects = [] } = configuration;
   const singlePagePerInterval = (configuration.singlePagePerInterval !== 'no');
   const maxTime = configuration.endTime ? ` AND LastModifiedDate <= ${configuration.endTime}` : '';
   let hasMorePages = true;
   let lastSeenTime = snapshot.previousLastModified;
-  let maxFetch = configuration.maxFetch ? configuration.parseInt(configuration.maxFetch, 10) : 1000;
+  let maxFetch = configuration.maxFetch ? parseInt(configuration.maxFetch, 10) : 1000;
 
   if (configuration.sizeOfPollingPage) {
     this.logger.debug('Current sizeOfPollingPage=%s, maxFetch=%s', configuration.sizeOfPollingPage, maxFetch);
@@ -98,7 +97,7 @@ module.exports.process = async function process(message, configuration, snapshot
 
   if (snapshot.previousLastModified !== lastSeenTime) {
     snapshot.previousLastModified = lastSeenTime;
-    this.logger.trace('emitting new snapshot: %j', snapshot);
+    this.logger.debug('emitting new snapshot...');
     await this.emit('snapshot', snapshot);
   }
   await this.emit('end');
diff --git a/lib/helpers/wrapper.js b/lib/helpers/wrapper.js
@@ -27,7 +27,6 @@ exports.callJSForceMethod = async function callJSForceMethod(configuration, meth
     iteration -= 1;
     try {
       this.logger.debug('Iteration: %s', REFRESH_TOKEN_RETRIES - iteration);
-      this.logger.trace('AccessToken = %s, Iteration: %s', accessToken, REFRESH_TOKEN_RETRIES - iteration);
       const cfg = {
         ...configuration,
         access_token: accessToken,
@@ -44,15 +43,15 @@ exports.callJSForceMethod = async function callJSForceMethod(configuration, meth
       this.logger.debug('Method %s was successfully executed', method);
       break;
     } catch (e) {
-      this.logger.error('Got error: ', e);
+      this.logger.error('Got error %s', e.name || '');
       if (e.name === 'INVALID_SESSION_ID') {
         try {
           this.logger.debug('Session is expired, trying to refresh token...');
           accessToken = await refreshToken(this, secretId);
           this.logger.debug('Token is successfully refreshed');
           client = undefined;
         } catch (err) {
-          this.logger.error(err, 'Failed to refresh token');
+          this.logger.error('Failed to refresh token');
         }
       } else {
         throw e;
diff --git a/lib/salesForceClient.js b/lib/salesForceClient.js
@@ -241,7 +241,6 @@ class SalesForceClient {
         })
         .execute({ autoFetch: true, maxFetch: limit });
     } catch (e) {
-      this.logger.trace('Lookup query failed', e);
       this.logger.error('Lookup query failed');
       throw e;
     }
diff --git a/lib/triggers/query.js b/lib/triggers/query.js
@@ -4,7 +4,16 @@ const { callJSForceMethod } = require('../helpers/wrapper');
 exports.process = async function processTrigger(msg, configuration) {
   this.logger.info('Starting Query trigger');
   const { query, outputMethod = 'emitIndividually' } = configuration;
-  const records = await callJSForceMethod.call(this, configuration, 'queryEmitAll', query);
+  let records;
+  try {
+    records = await callJSForceMethod.call(this, configuration, 'queryEmitAll', query);
+  } catch (e) {
+    const errorMsg = e.message ? e.message.replace(query, '').replace(/\s+/g, ' ').trim() : 'Error occurred during query execution';
+    const error = new Error(errorMsg);
+    error.name = e.name || 'unknown error';
+    this.logger.error(errorMsg);
+    throw errorMsg;
+  }
   if (records.length === 0) {
     await this.emit('data', messages.newEmptyMessage());
   } else if (outputMethod === 'emitAll') {
diff --git a/lib/triggers/streamPlatformEvents.js b/lib/triggers/streamPlatformEvents.js
@@ -22,7 +22,6 @@ async function processTrigger(msg, configuration) {
   const { credentials } = await getSecret(this, secretId);
   const accessToken = credentials.access_token;
   const instanceUrl = credentials.undefined_params.instance_url;
-  this.logger.trace('AccessToken = %s', accessToken);
   this.logger.debug('Preparing SalesForce connection...');
   const connection = new jsforce.Connection({
     instanceUrl,
@@ -36,16 +35,15 @@ async function processTrigger(msg, configuration) {
     fayeClient = connection.streaming.createClient([
       new jsforce.StreamingExtension.Replay(topic, replayId),
       new jsforce.StreamingExtension.AuthFailure(async (err) => {
-        this.logger.trace('AuthFailure: %j', err);
+        this.logger.trace('AuthFailure error occurred');
         if (err.ext && err.ext.sfdc && err.ext.sfdc.failureReason && (err.ext.sfdc.failureReason === '401::Authentication invalid')) {
           try {
             this.logger.debug('Session is expired, trying to refresh token');
             await refreshToken(this, secretId);
             this.logger.debug('Token is successfully refreshed');
           } catch (error) {
-            this.logger.trace('Refresh token error: %j', error);
-            this.logger.error('Failed to fetch and/or refresh token');
-            throw new Error('Failed to fetch and/or refresh token');
+            this.logger.error('Failed to fetch refresh token');
+            throw new Error('Failed to fetch refresh token');
           }
           fayeClient = undefined;
           this.logger.info('Lets call processTrigger one more time');
@@ -59,7 +57,6 @@ async function processTrigger(msg, configuration) {
 
     fayeClient.subscribe(topic, async (message) => {
       this.logger.info('Incoming message found, going to emit...');
-      this.logger.trace('Incoming Message: %j', message);
       await this.emit('data', messages.newMessageWithBody(message));
     })
       .then(() => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "salesforce-component-v2",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "elastic.io component that connects to Salesforce API (node.js) v2",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "axios": "0.20.0",
     "elasticio-node": "0.0.9",
     "elasticio-rest-node": "1.2.6",
-    "elasticio-sailor-nodejs": "2.6.14",
+    "elasticio-sailor-nodejs": "2.6.17",
     "jsforce": "1.10.0",
     "mime-types": "2.1.27",
     "request": "2.88.2",
diff --git a/spec-integration/actions/lookupObject.spec.js b/spec-integration/actions/lookupObject.spec.js
@@ -29,13 +29,13 @@ describe('lookupObject', () => {
     configuration = {
       apiVersion: '45.0',
       oauth: {
-        instance_url: 'https://na38.salesforce.com',
+        undefined_params: {
+          instance_url: process.env.INSTANCE_URL,
+        },
         refresh_token: process.env.REFRESH_TOKEN,
         access_token: process.env.ACCESS_TOKEN,
       },
-      prodEnv: 'login',
       sobject: 'Contact',
-      _account: '5be195b7c99b61001068e1d0',
       lookupField: 'Id',
       typeOfSearch: 'uniqueFields',
     };
diff --git a/spec-integration/actions/lookupObjects.spec.js b/spec-integration/actions/lookupObjects.spec.js
@@ -0,0 +1,56 @@
+/* eslint-disable no-return-assign */
+const fs = require('fs');
+const sinon = require('sinon');
+const chai = require('chai');
+const logger = require('@elastic.io/component-logger')();
+const lookupObjects = require('../../lib/actions/lookupObjects');
+
+const { expect } = chai;
+let configuration;
+let emitter;
+
+describe('lookupObjects', () => {
+  before(async () => {
+    if (fs.existsSync('.env')) {
+      // eslint-disable-next-line global-require
+      require('dotenv').config();
+    }
+    configuration = {
+      apiVersion: '45.0',
+      oauth: {
+        undefined_params: {
+          instance_url: process.env.INSTANCE_URL,
+        },
+        refresh_token: process.env.REFRESH_TOKEN,
+        access_token: process.env.ACCESS_TOKEN,
+      },
+    };
+
+    emitter = {
+      emit: sinon.spy(),
+      logger,
+    };
+  });
+
+  it('looks up Contact Objects', async () => {
+    const cfg = {
+      ...configuration,
+      sobject: 'Contact',
+      termNumber: 1,
+      outputMethod: 'emitIndividually',
+    };
+    const message = {
+      body: {
+        sTerm_1: {
+          fieldName: 'extID',
+          condition: '=',
+          fieldValue: '22016aa0-2222-4048-4048-4e191e1a1638',
+        },
+      },
+    };
+    await lookupObjects.process.call(emitter, message, cfg);
+    expect(emitter.emit.callCount).to.eql(1);
+    expect(emitter.emit.args[0][0]).to.eql('data');
+    expect(emitter.emit.args[0][1].body.results[0].attributes.type).to.eql(cfg.sobject);
+  });
+});
diff --git a/spec-integration/triggers/query.spec.js b/spec-integration/triggers/query.spec.js
@@ -0,0 +1,65 @@
+/* eslint-disable no-return-assign */
+const fs = require('fs');
+const sinon = require('sinon');
+const logger = require('@elastic.io/component-logger')();
+const chaiAsPromised = require('chai-as-promised');
+const chai = require('chai');
+const queryTrigger = require('../../lib/triggers/query');
+
+chai.use(chaiAsPromised);
+const { expect } = chai;
+
+describe('queryTrigger', () => {
+  let configuration;
+  const snapshot = {};
+  const message = {};
+
+  before(async () => {
+    if (fs.existsSync('.env')) {
+      // eslint-disable-next-line global-require
+      require('dotenv').config();
+    }
+
+    configuration = {
+      apiVersion: '39.0',
+      oauth: {
+        undefined_params: {
+          instance_url: process.env.INSTANCE_URL,
+        },
+        refresh_token: process.env.REFRESH_TOKEN,
+        access_token: process.env.ACCESS_TOKEN,
+      },
+    };
+  });
+
+  const emitter = {
+    emit: sinon.spy(),
+    logger,
+  };
+
+  it('queryTrigger should succeed with valid query', async () => {
+    const query = 'SELECT Id, Name FROM Contact LIMIT 2';
+    const outputMethod = 'emitAll';
+    const cfg = {
+      ...configuration,
+      query,
+      outputMethod,
+    };
+    await queryTrigger.process.call(emitter, message, cfg, snapshot);
+    expect(emitter.emit.callCount).to.eql(1);
+    expect(emitter.emit.args[0][0]).to.eql('data');
+    expect(emitter.emit.args[0][1].body.records.length).to.eql(2);
+  });
+
+  it('queryTrigger should fail with invalid query', async () => {
+    const query = 'SELECT Id FROM Contact123';
+    const cfg = {
+      ...configuration,
+      query,
+    };
+    await expect(queryTrigger.process.call(emitter, message, cfg, snapshot)).be.rejectedWith('^ ERROR at Row:1:Column:16 '
+      + 'sObject type \'Contact123\' is not supported. '
+      + 'If you are attempting to use a custom object, be sure to append the \'__c\' after the entity name. '
+      + 'Please reference your WSDL or the describe call for the appropriate names.');
+  });
+});
diff --git a/verifyCredentials.js b/verifyCredentials.js
@@ -2,7 +2,6 @@ const { callJSForceMethod } = require('./lib/helpers/wrapper');
 
 module.exports = async function verify(credentials) {
   try {
-    this.logger.trace('Incoming credentials: %j', credentials);
     this.logger.info('Going to make request describeGlobal() for verifying credentials...');
     const result = await callJSForceMethod.call(this, credentials, 'describeGlobal');
     this.logger.info('Credentials are valid, it was found sobjects count: %s', result.sobjects.length);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![CircleCI](https://circleci.com/gh/elasticio/salesforce-component.svg)](https://circleci.com/gh/elasticio/salesforce-component)`
	`1`	`+[![CircleCI](https://circleci.com/gh/elasticio/salesforce-component-v2.svg?style=svg&circle-token=4407ac16eb7e472a4533a176ca180c2c89d41777)](https://circleci.com/gh/elasticio/salesforce-component-v2)`
`2`	`2`	`# Salesforce Component`
`3`	`3`	`## Table of Contents`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ exports.process = async function processAction(message, configuration) {`
`9`	`9`	`throw new Error('batchSize must be a number');`
`10`	`10`	`}`
`11`	`11`	`const { query } = message.body;`
`12`		`- this.logger.trace('Starting SOQL Select batchSize=%s query=%s', batchSize, query);`
	`12`	`+ this.logger.debug('Starting SOQL Select: batchSize=%s', batchSize);`
`13`	`13`	`if (configuration.allowResultAsSet) {`
`14`	`14`	`this.logger.info('Selected EmitAllHandler');`
`15`	`15`	`const result = await callJSForceMethod.call(this, configuration, 'queryEmitAll', query);`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,6 @@ class SalesForceClient {`
`241`	`241`	`})`
`242`	`242`	`.execute({ autoFetch: true, maxFetch: limit });`
`243`	`243`	`} catch (e) {`
`244`		`- this.logger.trace('Lookup query failed', e);`
`245`	`244`	`this.logger.error('Lookup query failed');`
`246`	`245`	`throw e;`
`247`	`246`	`}`