From 02c5ce979c49aac15b6e4dde159905598d75e79a Mon Sep 17 00:00:00 2001
From: Taras <tarasm@gmail.com>
Date: Tue, 16 Feb 2021 12:52:32 -0500
Subject: [PATCH] Throwing errors

---
 .../stages/publish/azureBlobStorage.test.ts   | 23 +++++++---
 .../src/stages/publish/azureBlobStorage.ts    | 43 +++++++++++++------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts b/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
index baeb644301..62c81df5c4 100644
--- a/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
+++ b/packages/techdocs-common/src/stages/publish/azureBlobStorage.test.ts
@@ -124,7 +124,7 @@ describe('publishing with valid credentials', () => {
         })
         .catch(error =>
           expect(error.message).toContain(
-            'Unable to upload file(s) to Azure Blob Storage. Error Failed to read template directory: ENOENT, no such file or directory',
+            'Unable to upload file(s) to Azure Blob Storage. Failed to read template directory: ENOENT, no such file or directory',
           ),
         );
       mockFs.restore();
@@ -219,13 +219,24 @@ describe('error reporting', () => {
       },
     });
 
-    await publisher.publish({
-      entity,
-      directory: entityRootDir,
-    });
+    let error;
+    try {
+      await publisher.publish({
+        entity,
+        directory: entityRootDir,
+      });
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error.message).toContain(
+      `Unable to upload file(s) to Azure Blob Storage.`,
+    );
 
     expect(logger.error).toHaveBeenCalledWith(
-      `Unable to upload 1 file(s) to Azure Blob Storage.`,
+      expect.stringContaining(
+        `Unable to upload file(s) to Azure Blob Storage. Upload failed for test-namespace/TestKind/test-component-name/index.html with status code 500`,
+      ),
     );
 
     mockFs.restore();
diff --git a/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts b/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
index f73417156a..07e1053b99 100644
--- a/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
+++ b/packages/techdocs-common/src/stages/publish/azureBlobStorage.ts
@@ -80,13 +80,13 @@ export class AzureBlobStoragePublish implements PublisherBase {
     );
 
     try {
-      const metadata = await storageClient
+      const response = await storageClient
         .getContainerClient(containerName)
         .getProperties();
 
-      if (metadata._response.status >= 400) {
+      if (response._response.status >= 400) {
         throw new Error(
-          `Failed to retrieve metadata from ${metadata._response.request.url} with status code ${metadata._response.status}.`,
+          `Failed to retrieve metadata from ${response._response.request.url} with status code ${response._response.status}.`,
         );
       }
     } catch (e) {
@@ -137,31 +137,46 @@ export class AzureBlobStoragePublish implements PublisherBase {
           `${entityRootDir}/${relativeFilePath}`,
         ); // Azure Blob Storage Container file relative path
 
-        return limiter(() => {
-          return this.storageClient
+        return limiter(async () => {
+          const response = await this.storageClient
             .getContainerClient(this.containerName)
             .getBlockBlobClient(destination)
             .uploadFile(filePath);
+
+          if (response._response.status >= 400) {
+            return {
+              ...response,
+              error: new Error(
+                `Upload failed for ${filePath} with status code ${response._response.status}`,
+              ),
+            };
+          }
+          return {
+            ...response,
+            error: undefined,
+          };
         });
       });
 
-      let responses: BlobUploadCommonResponse[] = [];
+      const responses = await Promise.all(promises);
 
-      responses = await Promise.all(promises);
-
-      const failed = responses.filter(r => r?._response?.status >= 400);
+      const failed = responses.filter(r => r.error);
       if (failed.length === 0) {
         this.logger.info(
-          `Successfully uploaded all the generated files for Entity ${entity.metadata.name}. Total number of files: ${allFilesToUpload.length}`,
+          `Successfully uploaded the ${responses.length} generated file(s) for Entity ${entity.metadata.name}. Total number of files: ${allFilesToUpload.length}`,
         );
       } else {
-        const errorMessage = `Unable to upload ${failed.length} file(s) to Azure Blob Storage.`;
-        this.logger.error(errorMessage);
+        throw new Error(
+          failed
+            .map(r => r.error?.message)
+            .filter(Boolean)
+            .join(' '),
+        );
       }
     } catch (e) {
-      const errorMessage = `Unable to upload file(s) to Azure Blob Storage. Error ${e.message}`;
+      const errorMessage = `Unable to upload file(s) to Azure Blob Storage. ${e.message}`;
       this.logger.error(errorMessage);
-      return;
+      throw new Error(errorMessage);
     }
   }