Merge pull request #323 from opencomponents/upgrade-aws

Upgrade aws

Author: ricardo-devis-agullo

packages/oc-s3-storage-adapter/__mocks__/aws-sdk.js renamed to packages/oc-s3-storage-adapter/__mocks__/@aws-sdk/client-s3.js

@@ -1,4 +1,5 @@
-const awsSdk = jest.genMockFromModule('aws-sdk');
+const awsSdk = jest.genMockFromModule('@aws-sdk/client-s3');
+const stream = require('stream');
 const _config = { update: jest.fn() };
 
 jest.mock('fs-extra', () => {
@@ -31,7 +32,7 @@ let cachedTxt = 0;
 let cachedJson = 0;
 const _S3 = class {
   constructor() {
-    this.getObject = jest.fn((val, cb) => {
+    this.getObject = jest.fn(val => {
       cachedTxt++;
       cachedJson++;
       const contents = {
@@ -47,10 +48,14 @@ const _S3 = class {
       };
 
       const testResult = contents[val.Key];
-      cb(testResult.error || null, { Body: testResult.content });
+      if (testResult.error) throw testResult.error;
+
+      return {
+        Body: stream.Readable.from([Buffer.from(String(testResult.content))])
+      };
     });
 
-    this.listObjects = jest.fn((val, cb) => {
+    this.listObjects = jest.fn(val => {
       const CommonPrefixes =
         val.Bucket === 'my-empty-bucket'
           ? []
@@ -63,32 +68,27 @@ const _S3 = class {
               }
             ];
 
-      cb(null, { CommonPrefixes });
+      return Promise.resolve({ CommonPrefixes });
     });
 
-    this.upload = jest.fn(data => {
-      return {
-        send: jest.fn(cb => {
-          let error;
-          if (data && data.Key && data.Key.indexOf('error') >= 0) {
-            if (data.Key.indexOf('throw') >= 0) {
-              throw new Error('sorry');
-            }
+    this.putObject = jest.fn(data => {
+      if (data && data.Key && data.Key.indexOf('error') >= 0) {
+        if (data.Key.indexOf('throw') >= 0) {
+          throw new Error('sorry');
+        }
 
-            error = {
-              code: 1234,
-              message: 'an error message',
-              retryable: true,
-              statusCode: 500,
-              time: new Date(),
-              hostname: 'hostname',
-              region: 'us-west2'
-            };
-          }
+        throw {
+          code: 1234,
+          message: 'an error message',
+          retryable: true,
+          statusCode: 500,
+          time: new Date(),
+          hostname: 'hostname',
+          region: 'us-west2'
+        };
+      }
 
-          cb(error, data);
-        })
-      };
+      return data;
     });
   }
 };

packages/oc-s3-storage-adapter/__test__/config.test.js

@@ -1,3 +1,4 @@
+const { fromPromise } = require('universalify');
 const s3 = require('../lib');
 
 jest.mock('async', () => {
@@ -26,22 +27,16 @@ test('put directory recognizes server.js and .env to be private', done => {
 
   const client = new s3(options);
 
-  client.putDir('.', '.', (_, mockResult) => {
-    const separators = ['\\', '/'];
-    for (let separator of separators) {
-      expect(mockResult[`.${separator}.env`].res.ACL).toBe(
-        'authenticated-read'
-      );
-      expect(mockResult[`.${separator}server.js`].res.ACL).toBe(
-        'authenticated-read'
-      );
-      expect(mockResult[`.${separator}package.json`].res.ACL).toBe(
-        'public-read'
-      );
-      expect(mockResult[`.${separator}template.js`].res.ACL).toBe(
-        'public-read'
-      );
-    }
+  fromPromise(client.putDir)('.', '.', (_, mockResult) => {
+    const serverMock = mockResult.find(x => x.Key === `./server.js`);
+    const envMock = mockResult.find(x => x.Key === './.env');
+    const packageMock = mockResult.find(x => x.Key === './package.json');
+    const templateMock = mockResult.find(x => x.Key === './template.js');
+
+    expect(serverMock.ACL).toBe('authenticated-read');
+    expect(envMock.ACL).toBe('authenticated-read');
+    expect(packageMock.ACL).toBe('public-read');
+    expect(templateMock.ACL).toBe('public-read');
 
     done();
   });