[Storage] validate and update the samples (#4683)

Azure · Aug 6, 2019 · c7ce347 · c7ce347
1 parent 6e83f54
commit c7ce347
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 37 deletions.
diff --git a/sdk/storage/storage-blob/samples/javascript/advanced.js b/sdk/storage/storage-blob/samples/javascript/advanced.js
@@ -3,10 +3,10 @@
 */
 
 const fs = require("fs");
+const { AbortController } = require("@azure/abort-controller");
 const {
   AnonymousCredential,
   HttpPipelineLogLevel,
-  Aborter,
   BlobServiceClient,
   newPipeline
 } = require("../.."); // Change to "@azure/storage-blob" in your package
@@ -75,7 +75,7 @@ async function main() {
   // Parallel uploading a Readable stream with BlockBlobClient.uploadStream() in Node.js runtime
   // BlockBlobClient.uploadStream() is only available in Node.js
   await blockBlobClient.uploadStream(fs.createReadStream(localFilePath), 4 * 1024 * 1024, 20, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
     progress: (ev) => console.log(ev)
   });
   console.log("uploadStream success");
@@ -96,7 +96,7 @@ async function main() {
   const fileSize = fs.statSync(localFilePath).size;
   const buffer = Buffer.alloc(fileSize);
   await blockBlobClient.downloadToBuffer(buffer, 0, undefined, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
     blockSize: 4 * 1024 * 1024, // 4MB block size
     parallelism: 20, // 20 concurrency
     progress: (ev) => console.log(ev)

diff --git a/sdk/storage/storage-blob/samples/typescript/advanced.ts b/sdk/storage/storage-blob/samples/typescript/advanced.ts
@@ -3,8 +3,8 @@
 */
 
 import fs from "fs";
+import { AbortController } from "@azure/abort-controller";
 import {
-  Aborter,
   AnonymousCredential,
   BlobServiceClient,
   newPipeline,
@@ -75,15 +75,10 @@ async function main() {
 
   // Parallel uploading a Readable stream with BlockBlobClient.uploadStream() in Node.js runtime
   // BlockBlobClient.uploadStream() is only available in Node.js
-  await blockBlobClient.uploadStream(
-    fs.createReadStream(localFilePath),
-    4 * 1024 * 1024,
-    20,
-    {
-      abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
-      progress: (ev) => console.log(ev)
-    }
-  );
+  await blockBlobClient.uploadStream(fs.createReadStream(localFilePath), 4 * 1024 * 1024, 20, {
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    progress: (ev) => console.log(ev)
+  });
   console.log("uploadStream success");
 
   // Parallel uploading a browser File/Blob/ArrayBuffer in browsers with BlockBlobClient.uploadBrowserData()
@@ -101,17 +96,12 @@ async function main() {
   // downloadToBuffer is only available in Node.js
   const fileSize = fs.statSync(localFilePath).size;
   const buffer = Buffer.alloc(fileSize);
-  await blockBlobClient.downloadToBuffer(
-    buffer,
-    0,
-    undefined,
-    {
-      abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
-      blockSize: 4 * 1024 * 1024, // 4MB block size
-      parallelism: 20, // 20 concurrency
-      progress: ev => console.log(ev)
-    }
-  );
+  await blockBlobClient.downloadToBuffer(buffer, 0, undefined, {
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    blockSize: 4 * 1024 * 1024, // 4MB block size
+    parallelism: 20, // 20 concurrency
+    progress: (ev) => console.log(ev)
+  });
   console.log("downloadToBuffer success");
 
   // Delete container

diff --git a/sdk/storage/storage-file/samples/javascript/advanced.js b/sdk/storage/storage-file/samples/javascript/advanced.js
@@ -3,9 +3,9 @@
 */
 
 const fs = require("fs");
+const { AbortController } = require("@azure/abort-controller");
 const {
   AnonymousCredential,
-  Aborter,
   FileServiceClient,
   HttpPipelineLogLevel,
   newPipeline
@@ -82,7 +82,7 @@ async function main() {
   // Parallel uploading a Readable stream with FileClient.uploadStream() in Node.js runtime
   // FileClient.uploadStream() is only available in Node.js
   await fileClient.uploadStream(fs.createReadStream(localFilePath), fileSize, 4 * 1024 * 1024, 20, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
     progress: (ev) => console.log(ev)
   });
   console.log("uploadStream success");
@@ -102,7 +102,7 @@ async function main() {
   // FileClient.downloadToBuffer() is only available in Node.js
   const buffer = Buffer.alloc(fileSize);
   await fileClient.downloadToBuffer(buffer, 0, undefined, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000),
+    abortSignal: AbortController.timeout(30 * 60 * 1000),
     rangeSize: 4 * 1024 * 1024, // 4MB range size
     parallelism: 20, // 20 concurrency
     progress: (ev) => console.log(ev)
@@ -119,6 +119,6 @@ main()
   .then(() => {
     console.log("Successfully executed sample.");
   })
-  .catch(err => {
+  .catch((err) => {
     console.log(err.message);
   });
diff --git a/sdk/storage/storage-file/samples/typescript/advanced.ts b/sdk/storage/storage-file/samples/typescript/advanced.ts
@@ -3,7 +3,13 @@
 */
 
 import fs from "fs";
-import { Aborter, AnonymousCredential, FileServiceClient, newPipeline, HttpPipelineLogLevel } from "../../src"; // Change to "@azure/storage-file" in your package
+import { AbortController } from "@azure/abort-controller";
+import {
+  AnonymousCredential,
+  FileServiceClient,
+  newPipeline,
+  HttpPipelineLogLevel
+} from "../../src"; // Change to "@azure/storage-file" in your package
 
 class ConsoleHttpPipelineLogger {
   minimumLogLevel: any;
@@ -77,7 +83,7 @@ async function main() {
   // Parallel uploading a Readable stream with FileClient.uploadStream() in Node.js runtime
   // FileClient.uploadStream() is only available in Node.js
   await fileClient.uploadStream(fs.createReadStream(localFilePath), fileSize, 4 * 1024 * 1024, 20, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
+    abortSignal: AbortController.timeout(30 * 60 * 1000), // Abort uploading with timeout in 30mins
     progress: (ev: any) => console.log(ev)
   });
   console.log("uploadStream success");
@@ -97,7 +103,7 @@ async function main() {
   // FileClient.downloadToBuffer() is only available in Node.js
   const buffer = Buffer.alloc(fileSize);
   await fileClient.downloadToBuffer(buffer, 0, undefined, {
-    abortSignal: Aborter.timeout(30 * 60 * 1000),
+    abortSignal: AbortController.timeout(30 * 60 * 1000),
     rangeSize: 4 * 1024 * 1024, // 4MB range size
     parallelism: 20, // 20 concurrency
     progress: (ev) => console.log(ev)

diff --git a/sdk/storage/storage-queue/samples/typescript/basic.ts b/sdk/storage/storage-queue/samples/typescript/basic.ts
@@ -2,12 +2,7 @@
  Setup: Enter your storage account name and shared key in main()
 */
 
-import {
-  QueueServiceClient,
-  newPipeline,
-  SharedKeyCredential,
-  RawTokenCredential
-} from "../../src"; // Change to "@azure/storage-queue" in your package
+import { QueueServiceClient, newPipeline, SharedKeyCredential } from "../../src"; // Change to "@azure/storage-queue" in your package
 
 async function main() {
   // Enter your storage account name and shared key