Test file change add new integration of azure blob storage and review changes

Signed-off-by: NIKUNJ LALITKUMAR HUDKA <nk856850@dal.ca>

packages/backend-defaults/src/entrypoints/urlReader/lib/AzureBlobStorageUrlReader.ts

@@ -15,6 +15,7 @@
  */
 
 import {
+  BlobDownloadOptions,
   BlobServiceClient,
   ContainerClient,
   StorageSharedKeyCredential,
@@ -142,7 +143,8 @@ export class AzureBlobStorageUrlReader implements UrlReaderService {
 
       const abortController = new AbortController();
 
-      const getBlobOptions = {
+      const getBlobOptions: BlobDownloadOptions = {
+        abortSignal: abortController.signal,
         conditions: {
           ...(etag && { ifNoneMatch: etag }),
           ...(lastModifiedAfter && { ifModifiedSince: lastModifiedAfter }),
@@ -156,14 +158,13 @@ export class AzureBlobStorageUrlReader implements UrlReaderService {
         getBlobOptions,
       );
 
-      const data = await this.retrieveAzureBlobData(
+      return ReadUrlResponseFactory.fromReadable(
         downloadBlockBlobResponse.readableStreamBody as Readable,
+        {
+          etag: downloadBlockBlobResponse.etag,
+          lastModifiedAt: downloadBlockBlobResponse.lastModified,
+        },
       );
-
-      return ReadUrlResponseFactory.fromReadable(data, {
-        etag: downloadBlockBlobResponse.etag,
-        lastModifiedAt: downloadBlockBlobResponse.lastModified,
-      });
     } catch (e) {
       if (e.$metadata && e.$metadata.httpStatusCode === 304) {
         throw new NotModifiedError();
@@ -195,12 +196,11 @@ export class AzureBlobStorageUrlReader implements UrlReaderService {
           abortController.abort(),
         );
         const downloadBlockBlobResponse = await blobClient.download();
-        const data = await this.retrieveAzureBlobData(
-          downloadBlockBlobResponse.readableStreamBody as Readable,
-        );
 
         responses.push({
-          data: Readable.from(data),
+          data: Readable.from(
+            downloadBlockBlobResponse.readableStreamBody as Readable,
+          ),
           path: relative(path, blob.name),
           lastModifiedAt: blob.properties.lastModified,
         });
@@ -226,19 +226,4 @@ export class AzureBlobStorageUrlReader implements UrlReaderService {
       accountKey,
     )}}`;
   }
-
-  private async retrieveAzureBlobData(stream: Readable): Promise<Readable> {
-    return new Promise((resolve, reject) => {
-      try {
-        const chunks: any[] = [];
-        stream.on('data', chunk => chunks.push(chunk));
-        stream.on('error', (e: Error) =>
-          reject(new ForwardedError('Unable to read stream', e)),
-        );
-        stream.on('end', () => resolve(Readable.from(Buffer.concat(chunks))));
-      } catch (e) {
-        throw new ForwardedError('Unable to parse the response data', e);
-      }
-    });
-  }
 }

packages/integration-react/src/api/ScmIntegrationsApi.test.ts

@@ -26,6 +26,6 @@ describe('scmIntegrationsApiRef', () => {
 
   it('should be instantiated', () => {
     const i = ScmIntegrationsApi.fromConfig(new ConfigReader({}));
-    expect(i.list().length).toBe(6); // The default ones
+    expect(i.list().length).toBe(7); // The default ones
   });
 });