user-agent (#74)

* update

* update

* update

* Update component.json

* Update package.json

Co-authored-by: Oleg Oshurkov <[email protected]>

Author: EmptyInfinity

.circleci/config.yml

@@ -79,13 +79,13 @@ jobs:
           node-version: << pipeline.parameters.node-version >>
       - run:
           name: Audit Dependencies
-          command: npm audit --audit-level=high
+          command: npm audit --production --audit-level=high
       - node/install-packages:
           cache-path: ./node_modules
           override-ci-command: npm install
       - run:
-          name: Running Mocha Unit&Integration Tests
-          command: npm test && npm run integration-test
+          name: Running Mocha Tests
+          command: npm test
   build:
     docker:
       - image: circleci/node:16-stretch

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.5.2 (September 23, 2022)
+
+* Update Sailor version to 2.6.29
+* Get rid of vulnerabilities in dependencies
+* Update component-commons-library version to 3.0.2
+* Update oih-standard-library version to 2.0.3
+
 # 1.5.1 (May 20, 2022)
 * Fixed bug in `Get New and Updated S3 Objects` trigger when selected Emit Behaviour - Fetch All
 

component.json

@@ -1,6 +1,6 @@
 {
   "title": "AWS S3",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Integration component that can read and write to AWS S3",
   "docsUrl": "https://github.com/elasticio/amazon-s3-component",
   "credentials": {

lib/actions/readFile2.js

@@ -6,14 +6,13 @@ const iconv = require('iconv-lite');
 const { AttachmentProcessor } = require('@elastic.io/component-commons-library');
 const { Client } = require('../client');
 const params = require('../parameters');
-
+const { getUserAgent } = require('../utils/utils');
 
 exports.process = async function (msg, cfg) {
   const client = new Client(this.logger, cfg);
   const bucketName = msg.body.bucketName ? msg.body.bucketName : cfg.bucketName;
   const { filename } = msg.body;
 
-  // const result = await client.getObjectReadStream(bucketName, filename);
   const result = await client.getObjectMetadata(bucketName, filename);
 
   if (result.ContentLength > params.ATTACHMENT_MAX_SIZE) {
@@ -34,9 +33,10 @@ exports.process = async function (msg, cfg) {
     if (contentType === 'application/xml') doc = JSON.parse(convert.xml2json(fileContent));
     await this.emit('data', messages.newMessageWithBody(doc));
   } else {
-    const readStream = client.getObjectReadStream(bucketName, filename);
-    const results = await new AttachmentProcessor().uploadAttachment(readStream);
-    const attachmentUrl = `${results.config.url}${results.data.objectId}?storage_type=maester`;
+    const getAttachment = () => client.getObjectReadStream(bucketName, filename);
+    const attachmentProcessor = new AttachmentProcessor(getUserAgent(), msg.id);
+    const attachmentId = await attachmentProcessor.uploadAttachment(getAttachment);
+    const attachmentUrl = attachmentProcessor.getMaesterAttachmentUrlById(attachmentId);
 
     const attachments = {
       [filename]: {

lib/actions/upsertFile.js

@@ -1,6 +1,7 @@
 /* eslint-disable func-names */
 const { UpsertObjectById } = require('@elastic.io/oih-standard-library/lib/actions/upsert');
 const { AttachmentProcessor } = require('@elastic.io/component-commons-library');
+const { getUserAgent } = require('../utils/utils');
 
 const { Client } = require('../client');
 
@@ -25,7 +26,7 @@ class S3UpsertObject extends UpsertObjectById {
 
   // eslint-disable-next-line no-unused-vars,class-methods-use-this
   async getObjectFromMessage(msg, cfg) {
-    const fileStream = await new AttachmentProcessor().getAttachment(msg.body.attachmentUrl, 'stream');
+    const fileStream = await new AttachmentProcessor(getUserAgent(), msg.id).getAttachment(msg.body.attachmentUrl, 'stream');
     return fileStream.data;
   }
 

lib/utils/pollingUtil.js

@@ -4,15 +4,15 @@ const { AttachmentProcessor } = require('@elastic.io/component-commons-library')
 const { messages } = require('elasticio-node');
 const path = require('path');
 
-const { createAWSInputs } = require('./utils');
+const { createAWSInputs, getUserAgent } = require('./utils');
 const params = require('../parameters');
 
 class AwsS3Polling extends PollingTrigger {
   constructor(logger, context, client, cfg) {
     super(logger, context);
     this.client = client;
     this.cfg = cfg;
-    this.attachmentProcessor = new AttachmentProcessor();
+    this.attachmentProcessor = new AttachmentProcessor(getUserAgent());
   }
 
   async getObjects({ startTime, endTime }) {
@@ -81,10 +81,10 @@ class AwsS3Polling extends PollingTrigger {
 
   async s3FileToAttachment(msg, filename, size) {
     this.logger.info('Adding file to attachment...');
-    const s3Stream = this.client.getObjectReadStream(this.cfg.bucketName, filename);
-    const results = await new AttachmentProcessor().uploadAttachment(s3Stream);
+    const getAttachment = () => this.client.getObjectReadStream(this.cfg.bucketName, filename);
+    const attachmentId = await this.attachmentProcessor.uploadAttachment(getAttachment);
     this.logger.info('File successfully uploaded to attachment storage');
-    const attachmentUrl = `${results.config.url}${results.data.objectId}?storage_type=maester`;
+    const attachmentUrl = this.attachmentProcessor.getMaesterAttachmentUrlById(attachmentId);
     /* eslint-disable-next-line no-param-reassign */
     msg.attachments = {
       [filename]: {

lib/utils/utils.js

@@ -1,3 +1,13 @@
+const packageJson = require('../../package.json');
+const compJson = require('../../component.json');
+
+exports.getUserAgent = () => {
+  const { name: compName } = packageJson;
+  const { version: compVersion } = compJson;
+  const libVersion = packageJson.dependencies['@elastic.io/component-commons-library'];
+  return `${compName}/${compVersion} component-commons-library/${libVersion}`;
+};
+
 function createAWSInputs(bucketName) {
   let name = bucketName;
   if (bucketName.startsWith('/')) {