feat: fix s3 get object

adobe · Aug 29, 2024 · 6eefe49 · 6eefe49
1 parent e6fd210
commit 6eefe49
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 52 deletions.
diff --git a/src/utils/s3-utils.js b/src/utils/s3-utils.js
@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { ListObjectsV2Command } from '@aws-sdk/client-s3';
+import { GetObjectCommand, ListObjectsV2Command } from '@aws-sdk/client-s3';
 
 export async function getObjectKeysUsingPrefix(s3Client, bucketName, prefix, log) {
   const objectKeys = [];
@@ -31,12 +31,12 @@ export async function getObjectKeysUsingPrefix(s3Client, bucketName, prefix, log
 }
 
 export async function getObjectFromKey(s3Client, bucketName, key, log) {
-  const params = {
+  const command = new GetObjectCommand({
     Bucket: bucketName,
     Key: key,
-  };
+  });
   try {
-    return await s3Client.getObject(params).promise();
+    return await s3Client.send(command);
   } catch (err) {
     log.error(`Error while fetching S3 object from bucket ${bucketName} using key ${key}`, err);
     return null;

diff --git a/test/audits/metatags.test.js b/test/audits/metatags.test.js
@@ -21,7 +21,7 @@ import {
   notFound,
   internalServerError,
 } from '@adobe/spacecat-shared-http-utils';
-import { ListObjectsV2Command } from '@aws-sdk/client-s3';
+import { GetObjectCommand, ListObjectsV2Command } from '@aws-sdk/client-s3';
 import {
   TITLE,
   DESCRIPTION,
@@ -250,24 +250,23 @@ describe('Meta Tags', () => {
           ],
         });
 
-      s3ClientStub.getObject.withArgs({
-        Bucket: 'test-bucket',
-        Key: 'scrapes/site-id/blog/page1.json',
-      }).returns({
-        promise: sinon.stub().resolves({
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand).and(sinon.match.has('input', {
+          Bucket: 'test-bucket',
+          Key: 'scrapes/site-id/blog/page1.json',
+        }))).returns({
           Body: {
             tags: {
               title: 'Test Page',
               description: '',
             },
           },
-        }),
-      });
-      s3ClientStub.getObject.withArgs({
-        Bucket: 'test-bucket',
-        Key: 'scrapes/site-id/blog/page2.json',
-      }).returns({
-        promise: sinon.stub().resolves({
+        });
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand).and(sinon.match.has('input', {
+          Bucket: 'test-bucket',
+          Key: 'scrapes/site-id/blog/page2.json',
+        }))).returns({
           Body: {
             tags: {
               title: 'Test Page',
@@ -276,8 +275,7 @@ describe('Meta Tags', () => {
               ],
             },
           },
-        }),
-      });
+        });
       const addAuditStub = sinon.stub().resolves();
       dataAccessStub.addAudit = addAuditStub;
 
@@ -369,11 +367,12 @@ describe('Meta Tags', () => {
           ],
         });
 
-      s3ClientStub.getObject.withArgs({
-        Bucket: 'test-bucket',
-        Key: 'scrapes/site-id/blog/page1.json',
-      }).returns({
-        promise: sinon.stub().resolves({
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand).and(sinon.match.has('input', {
+          Bucket: 'test-bucket',
+          Key: 'scrapes/site-id/blog/page1.json',
+        }))).returns({
+
           Body: {
             tags: {
               title: 'This is an SEO optimal page1 valid title.',
@@ -384,13 +383,12 @@ describe('Meta Tags', () => {
               ],
             },
           },
-        }),
-      });
-      s3ClientStub.getObject.withArgs({
-        Bucket: 'test-bucket',
-        Key: 'scrapes/site-id/blog/page2.json',
-      }).returns({
-        promise: sinon.stub().resolves({
+        });
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand).and(sinon.match.has('input', {
+          Bucket: 'test-bucket',
+          Key: 'scrapes/site-id/blog/page2.json',
+        }))).returns({
           Body: {
             tags: {
               title: 'This is a SEO wise optimised page2 title.',
@@ -400,8 +398,7 @@ describe('Meta Tags', () => {
               ],
             },
           },
-        }),
-      });
+        });
       const addAuditStub = sinon.stub().resolves();
       dataAccessStub.addAudit = addAuditStub;
 
@@ -475,15 +472,14 @@ describe('Meta Tags', () => {
           ],
         });
 
-      s3ClientStub.getObject.withArgs({
-        Bucket: 'test-bucket',
-        Key: 'scrapes/site-id/blog/page1.json',
-      }).returns({
-        promise: sinon.stub().resolves({
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand).and(sinon.match.has('input', {
+          Bucket: 'test-bucket',
+          Key: 'scrapes/site-id/blog/page1.json',
+        }))).returns({
           Body: {
           },
-        }),
-      });
+        });
       const addAuditStub = sinon.stub().resolves();
       dataAccessStub.addAudit = addAuditStub;
 
@@ -517,13 +513,13 @@ describe('Meta Tags', () => {
           ],
         });
 
-      s3ClientStub.getObject.returns({
-        promise: sinon.stub().resolves({
+      s3ClientStub.send
+        .withArgs(sinon.match.instanceOf(GetObjectCommand))
+        .returns({
           Body: {
             tags: 5,
           },
-        }),
-      });
+        });
       const result = await auditMetaTags(message, context);
 
       expect(JSON.stringify(result)).to.equal(JSON.stringify(notFound('Site tags data not available')));

diff --git a/test/utils/s3-utils.test.js b/test/utils/s3-utils.test.js
@@ -78,9 +78,7 @@ describe('S3 Utility Functions', () => {
       const expectedObject = { Body: 'file contents' };
 
       const s3ClientMock = {
-        getObject: () => ({
-          promise: async () => expectedObject,
-        }),
+        send: () => expectedObject,
       };
 
       const result = await getObjectFromKey(s3ClientMock, bucketName, key, logMock);
@@ -92,11 +90,9 @@ describe('S3 Utility Functions', () => {
       const key = 'test-key';
 
       const s3ClientMock = {
-        getObject: () => ({
-          promise: async () => {
-            throw new Error('S3 getObject error');
-          },
-        }),
+        send: () => {
+          throw new Error('S3 getObject error');
+        },
       };
       const logMock2 = {
         error: (msg, err) => {