Update ⬆️ to newest Azure Storage SDK for blobs 🗄

package.json

@@ -736,6 +736,7 @@
 		"ms-vscode.azure-account"
 	],
 	"dependencies": {
+		"@azure/storage-blob": "^12.0.0",
 		"@types/mime": "^2.0.1",
 		"azure-arm-resource": "^3.1.1-preview",
 		"azure-arm-storage": "^5.1.1-preview",

src/azureStorageExplorer/AzureStorageFS.ts

@@ -9,9 +9,10 @@ import * as querystring from "querystring";
 import * as vscode from "vscode";
 import { AzExtTreeItem, callWithTelemetryAndErrorHandling, IActionContext, parseError } from "vscode-azureextensionui";
 import { ext } from "../extensionVariables";
-import { BlobContainerTreeItem, IBlobContainerCreateChildContext } from "./blobContainers/blobContainerNode";
-import { BlobDirectoryTreeItem } from "./blobContainers/BlobDirectoryTreeItem";
+import { BlobContainerTreeItem } from "./blobContainers/blobContainerNode";
+import { BlobDirectoryTreeItem } from "./blobContainers/blobDirectoryNode";
 import { BlobTreeItem } from "./blobContainers/blobNode";
+import { createBlockBlob, doesBlobExist, IBlobContainerCreateChildContext } from './blobContainers/blobUtils';
 import { DirectoryTreeItem, IDirectoryDeleteContext } from "./fileShares/directoryNode";
 import { FileTreeItem } from "./fileShares/fileNode";
 import { FileShareTreeItem, IFileShareCreateChildContext } from "./fileShares/fileShareNode";
@@ -149,17 +150,9 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
                         });
                     });
                 } else {
-                    let service: azureStorage.BlobService = treeItem.root.createBlobService();
-                    let containerName: string = treeItem.container.name;
-                    result = await new Promise<string | undefined>((resolve, reject) => {
-                        service.getBlobToText(containerName, parsedUri.filePath, (error?: Error, text?: string) => {
-                            if (!!error) {
-                                reject(error);
-                            } else {
-                                resolve(text);
-                            }
-                        });
-                    });
+                    const blobClient = treeItem.root.createBlobClient(treeItem.container.name, parsedUri.filePath);
+                    let downloaded = await blobClient.download();
+                    result = await this.streamToString(downloaded.readableStreamBody);
                 }
             } catch (error) {
                 let pe = parseError(error);
@@ -189,7 +182,7 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
             if (treeItem instanceof FileShareTreeItem) {
                 childExists = await doesFileExist(parsedUri.baseName, treeItem, parsedUri.parentDirPath, treeItem.share);
             } else {
-                childExists = await treeItem.doesBlobExist(parsedUri.filePath);
+                childExists = await doesBlobExist(treeItem, parsedUri.filePath);
             }
 
             if (!childExists && !options.create) {
@@ -204,7 +197,8 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
                         if (treeItem instanceof FileShareTreeItem) {
                             await updateFileFromText(parsedUri.parentDirPath, parsedUri.baseName, treeItem.share, treeItem.root, content.toString());
                         } else {
-                            await treeItem.updateBlockBlobFromText(parsedUri.filePath, content.toString());
+                            await createBlockBlob(treeItem, parsedUri.filePath, content.toString());
+
                         }
                     } else {
                         progress.report({ message: `Creating ${writeToFileShare ? 'file' : 'blob'} ${parsedUri.filePath}` });
@@ -240,7 +234,7 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
             await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (progress) => {
                 if (treeItem instanceof FileTreeItem || treeItem instanceof DirectoryTreeItem || treeItem instanceof BlobTreeItem || treeItem instanceof BlobDirectoryTreeItem) {
                     if (!(treeItem instanceof BlobDirectoryTreeItem)) {
-                        // The deletion message from deleteTreeItem is not supressed for BlobDirectoryTreeItems so avoid duplicate notifications
+                        // The deletion message from deleteTreeItem is not suppressed for BlobDirectoryTreeItems so avoid duplicate notifications
                         progress.report({ message: `Deleting ${parsedUri.filePath}` });
                     }
 
@@ -259,7 +253,7 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
 
             context.errorHandling.rethrow = true;
             if (oldUriParsed.baseName === newUriParsed.baseName) {
-                // Set suppressDisplay true when trying to move the files because VS code will hanlde the error.
+                // Set suppressDisplay true when trying to move the files because VS code will handle the error.
                 context.errorHandling.suppressDisplay = true;
                 throw new Error('Moving folders or files not supported.');
             } else {
@@ -408,6 +402,23 @@ export class AzureStorageFS implements vscode.FileSystemProvider {
     private isFileShareUri(uri: vscode.Uri): boolean {
         return this.verifyUri(uri).query.indexOf('File Shares') > 0;
     }
+
+    private async streamToString(readableStream: NodeJS.ReadableStream | undefined): Promise<string | undefined> {
+        if (!readableStream) {
+            return undefined;
+        }
+        return new Promise((resolve, reject) => {
+            const chunks: string[] = [];
+            readableStream.on("data", (data) => {
+                // tslint:disable-next-line: no-unsafe-any
+                chunks.push(data.toString());
+            });
+            readableStream.on("end", () => {
+                resolve(chunks.join(""));
+            });
+            readableStream.on("error", reject);
+        });
+    }
 }
 
 /**

src/azureStorageExplorer/IStorageRoot.ts

@@ -3,13 +3,17 @@
  *  Licensed under the MIT License. See License.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as azureStorageBlob from "@azure/storage-blob";
 import * as azureStorage from "azure-storage";
 import { ISubscriptionContext } from "vscode-azureextensionui";
 import { StorageAccountWrapper } from "../components/storageWrappers";
 
 export interface IStorageRoot extends ISubscriptionContext {
     storageAccount: StorageAccountWrapper;
-    createBlobService(): azureStorage.BlobService;
+    createBlobServiceClient(): azureStorageBlob.BlobServiceClient;
+    createBlobContainerClient(containerName: string): azureStorageBlob.ContainerClient;
+    createBlobClient(containerName: string, blobName: string): azureStorageBlob.BlobClient;
+    createBlockBlobClient(containerName: string, blobName: string): azureStorageBlob.BlockBlobClient;
     createFileService(): azureStorage.FileService;
     createQueueService(): azureStorage.QueueService;
     createTableService(): azureStorage.TableService;