Merge pull request #4621 from snyk/fix/stream-snyk-iac-test

Download snyk-iac-test using streamRequest()
snyk · May 25, 2023 · 6989e20 · 6989e20
2 parents b6d2aab + 69bf8aa
commit 6989e20
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 35 deletions.
diff --git a/src/lib/iac/test/v2/local-cache/utils.ts b/src/lib/iac/test/v2/local-cache/utils.ts
@@ -2,7 +2,8 @@ import * as createDebugLogger from 'debug';
 import * as path from 'path';
 
 import { CustomError } from '../../../../errors';
-import { makeRequest } from '../../../../request';
+import { streamRequest } from '../../../../request/request';
+import { ReadableStream } from 'needle';
 
 const debugLogger = createDebugLogger('snyk-iac');
 
@@ -41,13 +42,30 @@ export class InvalidUserPathError extends CustomError {
 }
 
 export async function fetchCacheResource(url: string): Promise<Buffer> {
-  const { res, body: cacheResourceBuffer } = await makeRequest({
-    url,
+  const stream = await streamRequest({
+    body: null,
+    headers: {},
+    method: 'get',
+    url: url,
   });
 
-  if (res.statusCode !== 200) {
-    throw new CustomError(`Failed to download cache resource from ${url}`);
-  }
+  return streamToBuffer(stream);
+}
+
+async function streamToBuffer(stream: ReadableStream): Promise<Buffer> {
+  return new Promise((resolve, reject) => {
+    const chunks: Buffer[] = [];
 
-  return cacheResourceBuffer;
+    stream.on('data', (chunk) => {
+      chunks.push(chunk);
+    });
+
+    stream.on('end', () => {
+      resolve(Buffer.concat(chunks));
+    });
+
+    stream.on('error', (err) => {
+      reject(err);
+    });
+  });
 }
diff --git a/test/jest/unit/lib/iac/test/v2/setup/local-cache/utils.spec.ts b/test/jest/unit/lib/iac/test/v2/setup/local-cache/utils.spec.ts
@@ -1,13 +1,13 @@
 import * as pathLib from 'path';
 import * as cloneDeep from 'lodash.clonedeep';
 
-import * as requestLib from '../../../../../../../../../src/lib/request';
+import * as requestLib from '../../../../../../../../../src/lib/request/request';
 import {
   fetchCacheResource,
   InvalidUserPathError,
   lookupLocal,
 } from '../../../../../../../../../src/lib/iac/test/v2/local-cache/utils';
-import { CustomError } from '../../../../../../../../../src/lib/errors';
+import { Readable } from 'stream';
 
 describe('lookupLocal', () => {
   const iacCachePath = pathLib.join('iac', 'cache', 'path');
@@ -115,21 +115,18 @@ describe('fetchCacheResource', () => {
     const testCacheResourcBuffer = Buffer.from('test-cache-resource-content');
 
     const makeRequestSpy = jest
-      .spyOn(requestLib, 'makeRequest')
-      .mockResolvedValue({
-        body: testCacheResourcBuffer,
-        res: {
-          statusCode: 200,
-          body: testCacheResourcBuffer,
-        } as any,
-      } as any);
+      .spyOn(requestLib, 'streamRequest')
+      .mockResolvedValue(Readable.from(testCacheResourcBuffer));
 
     // Act
     await fetchCacheResource(testCacheResourceUrl);
 
     // Assert
     expect(makeRequestSpy).toHaveBeenCalledWith({
       url: testCacheResourceUrl,
+      body: null,
+      headers: {},
+      method: 'get',
     });
   });
 
@@ -146,22 +143,4 @@ describe('fetchCacheResource', () => {
       ).rejects.toThrowError();
     });
   });
-  describe('when an error response is received', () => {
-    it('throws an error', async () => {
-      // Arrange
-      const testCacheResourceUrl = 'test-cache-resource-url';
-
-      jest.spyOn(requestLib, 'makeRequest').mockResolvedValue({
-        body: '',
-        res: {
-          statusCode: 500,
-        },
-      } as any);
-
-      // Act + Assert
-      await expect(fetchCacheResource(testCacheResourceUrl)).rejects.toThrow(
-        CustomError,
-      );
-    });
-  });
 });