Merge pull request #5 from fixpoint/support-mimetype

Support mimetype

Author: lambdalisue

.github/workflows/test.yml

@@ -31,27 +31,31 @@ jobs:
         uses: ./
         with:
           connection-string: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
+          container: 'azblob-upload-artifact'
           name: '${{ matrix.os }}/azblob-upload-artifact1'
           path: 'README.md'
 
       - name: Upload with path (file)
         uses: ./
         with:
           connection-string: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
+          container: 'azblob-upload-artifact'
           name: '${{ matrix.os }}/azblob-upload-artifact2'
           path: 'path/to/artifact1/hello.txt'
 
       - name: Upload with path (directory)
         uses: ./
         with:
           connection-string: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
+          container: 'azblob-upload-artifact'
           name: '${{ matrix.os }}/azblob-upload-artifact3'
           path: 'path/to/artifact2'
 
       - name: Upload with path (directory, overwrite)
         uses: ./
         with:
           connection-string: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
+          container: 'azblob-upload-artifact'
           name: '${{ matrix.os }}/azblob-upload-artifact3'
           path: 'path/to/artifact1'
           cleanup: 'true'

dist/index.js

@@ -19978,16 +19978,17 @@ function serial(list, iterator, callback)
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = __webpack_require__(422);
+const mime = tslib_1.__importStar(__webpack_require__(779));
 const storage_blob_1 = __webpack_require__(9);
 const core = tslib_1.__importStar(__webpack_require__(470));
 const fs_1 = __webpack_require__(747);
 const util_1 = __webpack_require__(648);
 const path_1 = __webpack_require__(622);
 async function upload(connectionString, name, path, container, cleanup) {
-    const serviceClient = await storage_blob_1.BlobServiceClient.fromConnectionString(connectionString);
+    const serviceClient = storage_blob_1.BlobServiceClient.fromConnectionString(connectionString);
     // Create container if necessary
     core.info(`Creating a container "${container}" ...`);
-    const containerClient = await serviceClient.getContainerClient(container);
+    const containerClient = serviceClient.getContainerClient(container);
     if (!(await containerClient.exists())) {
         await containerClient.create();
     }
@@ -19997,25 +19998,35 @@ async function upload(connectionString, name, path, container, cleanup) {
             if (!blob.name.startsWith(name + '/')) {
                 continue;
             }
-            const blockClient = await containerClient.getBlockBlobClient(blob.name);
+            const blockClient = containerClient.getBlockBlobClient(blob.name);
             await blockClient.delete();
         }
     }
+    const uploadFileWithContentType = async (src, dst) => {
+        const mt = mime.lookup(src);
+        const blobHTTPHeaders = mt
+            ? {
+                blobContentType: mt,
+            }
+            : {};
+        const blockClient = containerClient.getBlockBlobClient(dst);
+        await blockClient.uploadFile(src, {
+            blobHTTPHeaders,
+        });
+    };
     // Upload the file/directory
     const stat = await fs_1.promises.lstat(path);
     if (stat.isDirectory()) {
         for (const src of await util_1.walk(path)) {
             const dst = [name, path_1.relative(path, src).replace(/\\/g, '/')].join('/');
             core.info(`Uploading ${src} to ${dst} ...`);
-            const blockClient = await containerClient.getBlockBlobClient(dst);
-            await blockClient.uploadFile(src);
+            await uploadFileWithContentType(src, dst);
         }
     }
     else {
         const dst = [name, path_1.basename(path)].join('/');
         core.info(`Uploading ${path} to ${dst} ...`);
-        const blockClient = await containerClient.getBlockBlobClient(dst);
-        await blockClient.uploadFile(path);
+        await uploadFileWithContentType(path, dst);
     }
 }
 exports.upload = upload;

package-lock.json

@@ -32,9 +32,11 @@
   "dependencies": {
     "@actions/core": "^1.2.2",
     "@actions/exec": "^1.0.3",
-    "@azure/storage-blob": "^12.1.0"
+    "@azure/storage-blob": "^12.1.0",
+    "mime-types": "^2.1.26"
   },
   "devDependencies": {
+    "@types/mime-types": "^2.1.0",
     "@types/node": "^13.7.1",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",

package.json

@@ -1,3 +1,4 @@
+import * as mime from 'mime-types';
 import { BlobServiceClient } from '@azure/storage-blob';
 import * as core from '@actions/core';
 import { promises as fs } from 'fs';
@@ -11,13 +12,13 @@ export async function upload(
   container: string,
   cleanup: boolean,
 ) {
-  const serviceClient = await BlobServiceClient.fromConnectionString(
+  const serviceClient = BlobServiceClient.fromConnectionString(
     connectionString,
   );
 
   // Create container if necessary
   core.info(`Creating a container "${container}" ...`);
-  const containerClient = await serviceClient.getContainerClient(container);
+  const containerClient = serviceClient.getContainerClient(container);
   if (!(await containerClient.exists())) {
     await containerClient.create();
   }
@@ -28,24 +29,35 @@ export async function upload(
       if (!blob.name.startsWith(name + '/')) {
         continue;
       }
-      const blockClient = await containerClient.getBlockBlobClient(blob.name);
+      const blockClient = containerClient.getBlockBlobClient(blob.name);
       await blockClient.delete();
     }
   }
 
+  const uploadFileWithContentType = async (src: string, dst: string) => {
+    const mt = mime.lookup(src);
+    const blobHTTPHeaders = mt
+      ? {
+          blobContentType: mt,
+        }
+      : {};
+    const blockClient = containerClient.getBlockBlobClient(dst);
+    await blockClient.uploadFile(src, {
+      blobHTTPHeaders,
+    });
+  };
+
   // Upload the file/directory
   const stat = await fs.lstat(path);
   if (stat.isDirectory()) {
     for (const src of await walk(path)) {
       const dst = [name, relative(path, src).replace(/\\/g, '/')].join('/');
       core.info(`Uploading ${src} to ${dst} ...`);
-      const blockClient = await containerClient.getBlockBlobClient(dst);
-      await blockClient.uploadFile(src);
+      await uploadFileWithContentType(src, dst);
     }
   } else {
     const dst = [name, basename(path)].join('/');
     core.info(`Uploading ${path} to ${dst} ...`);
-    const blockClient = await containerClient.getBlockBlobClient(dst);
-    await blockClient.uploadFile(path);
+    await uploadFileWithContentType(path, dst);
   }
 }