fix bug (#73)

* Fixed bug in `Get New and Updated S3 Objects` trigger when selected Emit Behaviour - Fetch All

Author: if0s

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.5.1 (May 20, 2022)
+* Fixed bug in `Get New and Updated S3 Objects` trigger when selected Emit Behaviour - Fetch All
+
 # 1.5.0 (May 20, 2022)
 * Created new `Read file` action instead of existing due to incorrect output metadata, old one set as deprecated 
 * Fix memory leak for `Read file` action and `Get New and Updated S3 Objects` trigger, also added attachment url in message body to them

README.md

@@ -46,7 +46,6 @@ The component is based on [AWS S3 SDK](https://aws.amazon.com/sdk-for-node-js/ '
 #### Environment variables
 Name|Mandatory|Description|Values|
 |----|---------|-----------|------|
-|`LOG_LEVEL`| false | Controls logger level | `trace`, `debug`, `info`, `warning`, `error` |
 |`ATTACHMENT_MAX_SIZE`| false | For `elastic.io` attachments configuration. Maximal possible attachment size in bytes. By default set to `104857600` and according to platform limitations **CAN'T** be bigger than that. | Up to `104857600` bytes (100MB)|
 |`ACCESS_KEY_ID`| false | For integration-tests is required to specify this variable |  |
 |`ACCESS_KEY_SECRET`| false | For integration-tests is required to specify this variable |  |

component.json

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

lib/utils/pollingUtil.js

@@ -31,15 +31,15 @@ class AwsS3Polling extends PollingTrigger {
     for (let i = 0; i < files.length; i += 1) {
       const file = files[i];
       this.logger.info('Processing file with size: %d', file.Size);
-      if (file.Size > params.ATTACHMENT_MAX_SIZE) {
-        const err = `File "${file.Key}" with size ${file.Size} bytes is too big for attachment usage. `
-          + `Current attachment max size is ${params.ATTACHMENT_MAX_SIZE} bytes`;
-        this.logger.error(err);
-        throw new Error(err);
-      }
       const resultMessage = messages.newMessageWithBody(file);
 
       if (this.cfg.enableFileAttachments) {
+        if (file.Size > params.ATTACHMENT_MAX_SIZE) {
+          const err = `File "${file.Key}" with size ${file.Size} bytes is too big for attachment usage. `
+            + `Current ATTACHMENT_MAX_SIZE is ${params.ATTACHMENT_MAX_SIZE} bytes`;
+          this.logger.error(err);
+          throw new Error(err);
+        }
         await this.s3FileToAttachment(resultMessage, path.basename(file.Key), file.Size);
         resultMessage.body.attachmentUrl = resultMessage.attachments[path.basename(file.Key)].url;
       }
@@ -61,14 +61,14 @@ class AwsS3Polling extends PollingTrigger {
       for (let i = 0; i < results.length; i += 1) {
         if (results[i].Size > params.ATTACHMENT_MAX_SIZE) {
           const err = `File "${results[i].Key}" with size ${results[i].Size} bytes is too big for attachment usage. `
-            + `Current attachment max size is ${params.ATTACHMENT_MAX_SIZE} bytes`;
+            + `Current ATTACHMENT_MAX_SIZE is ${params.ATTACHMENT_MAX_SIZE} bytes`;
           this.logger.error(err);
           throw new Error(err);
         }
         const dummyMessage = messages.newEmptyMessage();
         await this.s3FileToAttachment(dummyMessage, path.basename(results[i].Key), results[i].Size);
         attachments[results[i].Key] = dummyMessage.attachments[results[i].Key];
-        resultMessage.results[i].attachmentUrl = dummyMessage.attachments[results[i].Key].url;
+        resultMessage.body.results[i].attachmentUrl = dummyMessage.attachments[path.basename(results[i].Key)].url;
       }
 
       resultMessage.attachments = attachments;