Upload attachments through Maester (#56)

Author: EmptyInfinity

CHANGELOG.md

@@ -1,4 +1,6 @@
-## 1.2.1 (January 14, 2022)
+## 2.0.0 (January 14, 2022)
+* Now method `uploadAttachment` from `AttachmentProcessor` saves attachments directly to `Maester`
+* Now method `uploadAttachment` from `AttachmentProcessor` accepts additional argument `contentType`
 * Update dev dependencies
 
 ## 1.2.0 (November 12, 2021)

README.md

@@ -199,7 +199,8 @@ Contains functions to transform platform data that contains JSONata expressions
 ## Attachment Processor
 The attachment processor function can be used to store attachments on the platform. It exposes the following functions
 
-- `uploadAttachment(streamContent)`, which will upload an attachment to the platform and return the result and file url
+- `uploadAttachment(body, contentType)`, which will upload an attachment to the platform `Maester` storage and return the result object.
+Where `body` - attachment content, `contentType` - it's corresponding `Content-Type` value.
 - `getAttachment(url, contentType)`, which will retrieve an attachment from `steward` or `maester` storage. To specify the storage - query parameter
 `storage_type` must be provided. To get items from `maester` storage - `?storage_type=maester` should added to the `url` argument. By default attachments are retrieved from `steward` storage, so `?storage_type=steward` is not obligated to be added to the `url` argument. `contentType` -
 one of [`stream`, `arraybuffer` ]
@@ -210,9 +211,9 @@ Example:
 const { AttachmentProcessor } = require('@elastic.io/component-commons-library');
 
 const stream = new Stream();
-const result = await new AttachmentProcessor().uploadAttachment(stream);
+const result = await new AttachmentProcessor().uploadAttachment(body, 'application/octet-stream');
 
-const storedFileUrl = result.config.url;
+const { objectId } = result.data;
 ```
 ```javascript
 const { AttachmentProcessor } = require('@elastic.io/component-commons-library');

lib/attachment/AttachmentProcessor.ts

@@ -1,12 +1,11 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import { URL } from 'url';
 import { StorageClient, ObjectStorage } from '@elastic.io/maester-client/dist';
-const restNodeClient = require('elasticio-rest-node')();
 
 export const STORAGE_TYPE_PARAMETER = 'storage_type';
 export const DEFAULT_STORAGE_TYPE = 'steward';
 export const MAESTER_OBJECT_ID_ENDPOINT = '/objects/';
-const { ELASTICIO_OBJECT_STORAGE_TOKEN = '' , ELASTICIO_OBJECT_STORAGE_URI = '' } = process.env;
+const { ELASTICIO_OBJECT_STORAGE_TOKEN = '', ELASTICIO_OBJECT_STORAGE_URI = '' } = process.env;
 const maesterCreds = { jwtSecret: ELASTICIO_OBJECT_STORAGE_TOKEN, uri: ELASTICIO_OBJECT_STORAGE_URI };
 const REQUEST_TIMEOUT = process.env.REQUEST_TIMEOUT ? parseInt(process.env.REQUEST_TIMEOUT, 10) : 10000; // 10s
 const REQUEST_MAX_RETRY = process.env.REQUEST_MAX_RETRY ? parseInt(process.env.REQUEST_MAX_RETRY, 10) : 7; // 10s
@@ -33,15 +32,19 @@ export class AttachmentProcessor {
     }
   }
 
-  async uploadAttachment(body) {
-    const putUrl = await AttachmentProcessor.preparePutUrl();
+  async uploadAttachment(body, contentType) {
     const ax = axios.create();
     AttachmentProcessor.addRetryCountInterceptorToAxios(ax);
+    const url = `${ELASTICIO_OBJECT_STORAGE_URI}${MAESTER_OBJECT_ID_ENDPOINT}`;
 
     const axConfig = {
-      url: putUrl,
+      url,
       data: body,
-      method: 'put',
+      method: 'post',
+      headers: {
+        Authorization: `Bearer ${ELASTICIO_OBJECT_STORAGE_TOKEN}`,
+        'Content-Type': contentType,
+      },
       timeout: REQUEST_TIMEOUT,
       retry: REQUEST_MAX_RETRY,
       delay: REQUEST_RETRY_DELAY,
@@ -51,11 +54,6 @@ export class AttachmentProcessor {
     return ax(axConfig);
   }
 
-  static async preparePutUrl() {
-    const signedUrl = await restNodeClient.resources.storage.createSignedUrl();
-    return signedUrl.put_url;
-  }
-
   static async getStewardAttachment(axConfig) {
     const ax = axios.create();
     AttachmentProcessor.addRetryCountInterceptorToAxios(ax);

lib/platformApi/PlatformApiLogicClient.ts

@@ -91,7 +91,7 @@ export class PlatformApiLogicClient extends PlatformApiRestClient {
    */
   async fetchAllSecretsForWorkspace(options: any = {}) {
     const { workspaceId } = options;
-    if (!workspaceId) throw new Error(`workspaceId not provided, can't fetch secrets`)
+    if (!workspaceId) throw new Error("workspaceId not provided, can't fetch secrets");
     const secrets = await this.makeRequest({ method: 'GET', url: `/workspaces/${workspaceId}/secrets` });
     const resp: any = [];
 
@@ -107,7 +107,7 @@ export class PlatformApiLogicClient extends PlatformApiRestClient {
           componentIds = clientResponse.data.relationships.components.data.map(x => x.id);
         }
       } catch (e: any) {
-        this.emitter.logger.info(`Can't find related to secret component - ${e.message}`)
+        this.emitter.logger.info(`Can't find related to secret component - ${e.message}`);
       }
       resp.push({ secretId, secretName, componentIds });
     }