Replace object-storage-client with maester-client (#199)

* #6414 replace object-storage-client with maester-client * #6414 update version
elasticio · Oct 17, 2022 · f9e31cf · f9e31cf
1 parent 971e101
commit f9e31cf
Show file tree

Hide file tree

Showing 4 changed files with 893 additions and 87 deletions.
diff --git a/lib/sailor.js b/lib/sailor.js
@@ -10,7 +10,7 @@ const RestApiClient = require('elasticio-rest-node');
 const assert = require('assert');
 const co = require('co');
 const pThrottle = require('p-throttle');
-const { ObjectStorage } = require('@elastic.io/object-storage-client');
+const { ObjectStorage } = require('@elastic.io/maester-client');
 const { Readable } = require('stream');
 
 const AMQP_HEADER_META_PREFIX = 'x-eio-meta-';
@@ -280,7 +280,7 @@ class Sailor {
         logger.info('Going to fetch message body.', { objectId });
 
         try {
-            object = await this.objectStorage.getAsJSON(
+            object = await this.objectStorage.getOne(
                 objectId,
                 { jwtPayloadOrToken: this.settings.OBJECT_STORAGE_TOKEN }
             );
@@ -297,7 +297,7 @@ class Sailor {
 
     uploadMessageBody(bodyBuf) {
         const stream = () => Readable.from(bodyBuf);
-        return this.objectStorage.addAsStream(
+        return this.objectStorage.add(
             stream,
             { jwtPayloadOrToken: this.settings.OBJECT_STORAGE_TOKEN }
         );

diff --git a/mocha_spec/unit/sailor.spec.js b/mocha_spec/unit/sailor.spec.js
@@ -1061,7 +1061,7 @@ describe('Sailor', () => {
                     let passthroughRequestStub;
                     let runExecSpy;
                     beforeEach(async () => {
-                        const getObjectStub = sandbox.stub(sailor.objectStorage, 'getAsJSON');
+                        const getObjectStub = sandbox.stub(sailor.objectStorage, 'getOne');
                         bodyRequestStub = getObjectStub
                             .withArgs(bodyObjectId, { jwtPayloadOrToken: settings.OBJECT_STORAGE_TOKEN })
                             .resolves(body);
@@ -1142,7 +1142,7 @@ describe('Sailor', () => {
                     let passthroughRequestStub;
                     let runExecSpy;
                     beforeEach(async () => {
-                        const getObjectStub = sandbox.stub(sailor.objectStorage, 'getAsJSON');
+                        const getObjectStub = sandbox.stub(sailor.objectStorage, 'getOne');
                         bodyRequestStub = getObjectStub
                             .withArgs(bodyObjectId, { jwtPayloadOrToken: settings.OBJECT_STORAGE_TOKEN })
                             .resolves(body);
@@ -1194,7 +1194,7 @@ describe('Sailor', () => {
                     runExecSpy = sandbox.spy(sailor, 'runExec');
 
                     passthroughRequestStub = sandbox
-                        .stub(sailor.objectStorage, 'getAsJSON')
+                        .stub(sailor.objectStorage, 'getOne')
                         .withArgs(passthroughObjectId, { jwtPayloadOrToken: settings.OBJECT_STORAGE_TOKEN })
                         .resolves(passThroughBody);
 
@@ -1309,7 +1309,7 @@ describe('Sailor', () => {
                         });
                     });
 
-                    sandbox.stub(sailor.objectStorage, 'getAsJSON')
+                    sandbox.stub(sailor.objectStorage, 'getOne')
                         .withArgs(passthroughObjectId, { jwtPayloadOrToken: settings.OBJECT_STORAGE_TOKEN })
                         .resolves({ passthrough: 'body' });
 
@@ -1322,7 +1322,7 @@ describe('Sailor', () => {
                     let bodyObjectId;
                     beforeEach(async () => {
                         bodyObjectId = 'body-object-id';
-                        addObjectStub = sandbox.stub(sailor.objectStorage, 'addAsStream').resolves(bodyObjectId);
+                        addObjectStub = sandbox.stub(sailor.objectStorage, 'add').resolves(bodyObjectId);
                     });
 
                     it('should send lightweight', async () => {
@@ -1382,7 +1382,7 @@ describe('Sailor', () => {
                 describe('and objects can not be uploaded successfully', () => {
                     let addObjectStub;
                     beforeEach(async () => {
-                        addObjectStub = sandbox.stub(sailor.objectStorage, 'addAsStream').rejects(new Error());
+                        addObjectStub = sandbox.stub(sailor.objectStorage, 'add').rejects(new Error());
                     });
 
                     it('should not upload lightweight', async () => {
@@ -1416,7 +1416,7 @@ describe('Sailor', () => {
                         });
                     });
 
-                    sandbox.stub(sailor.objectStorage, 'getAsJSON')
+                    sandbox.stub(sailor.objectStorage, 'getOne')
                         .withArgs(passthroughObjectId, { jwtPayloadOrToken: settings.OBJECT_STORAGE_TOKEN })
                         .resolves({ passthrough: 'body' });
 
@@ -1427,7 +1427,7 @@ describe('Sailor', () => {
                 describe('and all objects can be uploaded successfully', () => {
                     let addObjectSpy;
                     beforeEach(async () => {
-                        addObjectSpy = sandbox.spy(sailor.objectStorage, 'addAsStream');
+                        addObjectSpy = sandbox.spy(sailor.objectStorage, 'add');
                     });
 
                     it('should not send lightweight', async () => {