Azure blob service support

src/models/BlobService.ts

@@ -0,0 +1,6 @@
+export interface BlobService {
+  azure?: {
+    azureStorageUrl?: string;
+    azureStorageSAS?: string;
+  };
+}

src/models/index.ts

@@ -1,2 +1,3 @@
+export * from "./BlobService";
 export * from "./DisplayLevel";
 export * from "./GitHubActionOptions";

src/utils/getHtmlTable.ts

@@ -6,16 +6,19 @@ import { getTestTitle } from "./getTestTitle";
 import { getTestTags } from "./getTestTags";
 import { getTestAnnotations } from "./getTestAnnotations";
 import { getTestDuration } from "./getTestDuration";
-import { DisplayLevel } from "../models";
+import { BlobService, DisplayLevel } from "../models";
+import { processAttachments } from "./processAttachments";
 
 export const getHtmlTable = async (
   tests: TestCase[],
   showAnnotations: boolean,
   showTags: boolean,
   showError: boolean,
-  displayLevel: DisplayLevel[]
+  displayLevel: DisplayLevel[],
+  blobService?: BlobService
 ): Promise<string | undefined> => {
   const convert = new Convert();
+  const hasBlobService = blobService && blobService.azure;
 
   const content: string[] = [];
 
@@ -32,6 +35,10 @@ export const getHtmlTable = async (
   }
   if (showError) {
     content.push(`<th>Error</th>`);
+
+    if (hasBlobService) {
+      content.push(`<th>Attachments</th>`);
+    }
   }
   content.push(`</tr>`);
   content.push(`</thead>`);
@@ -53,6 +60,10 @@ export const getHtmlTable = async (
       }
       if (showError) {
         colLength++;
+
+        if (hasBlobService) {
+          colLength++;
+        }
       }
 
       const annotations = await getTestAnnotations(test);
@@ -81,6 +92,24 @@ export const getHtmlTable = async (
     if (showError) {
       const error = result?.error?.message || "";
       testRows.push(`<td>${convert.toHtml(error)}</td>`);
+
+      if (hasBlobService) {
+        const mediaFiles = await processAttachments(
+          blobService,
+          result.attachments
+        );
+
+        if (mediaFiles) {
+          const mediaLinks = mediaFiles
+            .map(
+              (m) =>
+                `<p align="center"><img src="${m.url}" alt="${m.name}" width="250"></p>
+<p align="center"><b>${m.name}</b></p>`
+            )
+            .join(", ");
+          testRows.push(`<td>${mediaLinks}</td>`);
+        }
+      }
     }
     testRows.push(`</tr>`);
   }

src/utils/getTableRows.ts

@@ -7,7 +7,7 @@ import { getTestTags } from "./getTestTags";
 import { getTestAnnotations } from "./getTestAnnotations";
 import { getTestDuration } from "./getTestDuration";
 import { getTestStatusIcon } from "./getTestStatusIcon";
-import { DisplayLevel } from "../models";
+import { BlobService, DisplayLevel } from "../models";
 import { processAttachments } from "./processAttachments";
 
 export const getTableRows = async (
@@ -16,12 +16,10 @@ export const getTableRows = async (
   showTags: boolean,
   showError: boolean,
   displayLevel: DisplayLevel[],
-  azure?: {
-    azureStorageUrl?: string;
-    azureStorageSAS?: string;
-  }
+  blobService?: BlobService
 ): Promise<SummaryTableRow[]> => {
   const convert = new Convert();
+  const hasBlobService = blobService && blobService.azure;
 
   const tableHeaders = [
     {
@@ -54,10 +52,13 @@ export const getTableRows = async (
       data: "Error",
       header: true,
     });
-    tableHeaders.push({
-      data: "Attachments",
-      header: true,
-    });
+
+    if (hasBlobService) {
+      tableHeaders.push({
+        data: "Attachments",
+        header: true,
+      });
+    }
   }
 
   const tableRows: SummaryTableRow[] = [];
@@ -79,7 +80,10 @@ export const getTableRows = async (
       }
       if (showError) {
         colLength++;
-        colLength++;
+
+        if (hasBlobService) {
+          colLength++;
+        }
       }
 
       const annotations = await getTestAnnotations(test);
@@ -127,26 +131,24 @@ export const getTableRows = async (
         header: false,
       });
 
-      const mediaFiles =
-        (azure &&
-          (await processAttachments(
-            azure?.azureStorageUrl,
-            azure?.azureStorageSAS,
-            result.attachments
-          ))) ||
-        [];
-
-      tableRow.push({
-        data: (mediaFiles || [])
-          .map(
-            (
-              m
-            ) => `<p align="center"><img src="${m.url}" alt="${m.name}" width="250"></p>
+      if (hasBlobService) {
+        const mediaFiles = await processAttachments(
+          blobService,
+          result.attachments
+        );
+
+        tableRow.push({
+          data: (mediaFiles || [])
+            .map(
+              (
+                m
+              ) => `<p align="center"><img src="${m.url}" alt="${m.name}" width="250"></p>
 <p align="center"><b>${m.name}</b></p>`
-          )
-          .join("\n\n"),
-        header: false,
-      });
+            )
+            .join("\n\n"),
+          header: false,
+        });
+      }
     }
 
     tableRows.push(tableRow);

src/utils/processAttachments.ts

@@ -1,11 +1,14 @@
 import { parse } from "path";
 import { readFile } from "fs/promises";
+import { BlobService } from "../models";
 
 export const processAttachments = async (
-  azureContainerUrl?: string,
-  azureContainerSas?: string,
+  blobService: BlobService,
   attachments?: { name: string; path?: string; contentType: string }[]
 ) => {
+  const azureContainerUrl = blobService.azure?.azureStorageUrl;
+  const azureContainerSas = blobService.azure?.azureStorageSAS;
+
   if (
     !attachments ||
     attachments.length === 0 ||

src/utils/processResults.ts

@@ -10,7 +10,7 @@ import { getSummaryTitle } from "./getSummaryTitle";
 import { getSummaryDetails } from "./getSummaryDetails";
 import { getTestsPerFile } from "./getTestsPerFile";
 import { getTestHeading } from "./getTestHeading";
-import { DisplayLevel, GitHubActionOptions } from "../models";
+import { BlobService, DisplayLevel, GitHubActionOptions } from "../models";
 
 export const processResults = async (
   suite: Suite | undefined,
@@ -30,6 +30,14 @@ export const processResults = async (
     const os = process.platform;
     const summary = core.summary;
 
+    let blobService: BlobService | undefined = undefined;
+    if (options.azureStorageSAS && options.azureStorageUrl) {
+      blobService = {};
+      blobService.azure = {};
+      blobService.azure.azureStorageSAS = options.azureStorageSAS;
+      blobService.azure.azureStorageUrl = options.azureStorageUrl;
+    }
+
     const summaryTitle = getSummaryTitle(options.title);
     if (summaryTitle) {
       summary.addHeading(summaryTitle, 1);
@@ -56,7 +64,8 @@ export const processResults = async (
             options.showAnnotations,
             options.showTags,
             !!options.showError,
-            options.includeResults as DisplayLevel[]
+            options.includeResults as DisplayLevel[],
+            blobService
           );
 
           if (!content) {
@@ -77,10 +86,7 @@ export const processResults = async (
             options.showTags,
             !!options.showError,
             options.includeResults as DisplayLevel[],
-            {
-              azureStorageSAS: options.azureStorageSAS,
-              azureStorageUrl: options.azureStorageUrl,
-            }
+            blobService
           );
 
           if (tableRows.length !== 0) {