Similar fixes for storage-file-datalake

Azure · Jun 26, 2021 · 48d8c02 · 48d8c02
1 parent 95e0c4e
commit 48d8c02
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/sdk/storage/storage-file-datalake/rollup.base.config.js b/sdk/storage/storage-file-datalake/rollup.base.config.js
@@ -140,7 +140,7 @@ export function browserConfig(test = false) {
       shim({
         dotenv: `export function config() { }`,
         fs: `
-          export function stat() { }
+          export function statSync() { }
           export function createReadStream() { }
           export function createWriteStream() { }
         `,

diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts
@@ -96,7 +96,8 @@ import {
   setURLPath,
   setURLQueries
 } from "./utils/utils.common";
-import { fsCreateReadStream, fsStat } from "./utils/utils.node";
+import { fsCreateReadStream } from "./utils/utils.node";
+import { statSync } from "fs";
 
 /**
  * A DataLakePathClient represents a URL to the Azure Storage path (directory or file).
@@ -1432,7 +1433,8 @@ export class DataLakeFileClient extends DataLakePathClient {
   ): Promise<FileUploadResponse> {
     const { span, updatedOptions } = createSpan("DataLakeFileClient-uploadFile", options);
     try {
-      const size = (await fsStat(filePath)).size;
+      const stats = statSync(filePath);
+      const size = stats.size;
       return await this.uploadSeekableInternal(
         (offset: number, size: number) => {
           return () =>

diff --git a/sdk/storage/storage-file-datalake/src/utils/utils.node.ts b/sdk/storage/storage-file-datalake/src/utils/utils.node.ts
@@ -2,8 +2,6 @@
 // Licensed under the MIT license.
 
 import * as fs from "fs";
-import * as util from "util";
-import { isNode } from "@azure/core-http";
 
 /**
  * Reads a readable stream into buffer. Fill the buffer from offset to end.
@@ -19,7 +17,7 @@ export async function streamToBuffer(
   buffer: Buffer,
   offset: number,
   end: number,
-  encoding?: string
+  encoding?: BufferEncoding
 ): Promise<void> {
   let pos = 0; // Position in stream
   const count = end - offset; // Total amount of data needed in stream
@@ -73,7 +71,7 @@ export async function streamToBuffer(
 export async function streamToBuffer2(
   stream: NodeJS.ReadableStream,
   buffer: Buffer,
-  encoding?: string
+  encoding?: BufferEncoding
 ): Promise<number> {
   let pos = 0; // Position in stream
   const bufferSize = buffer.length;
@@ -105,11 +103,4 @@ export async function streamToBuffer2(
   });
 }
 
-/**
- * ONLY AVAILABLE IN NODE.JS RUNTIME.
- *
- * Promisified version of fs.stat().
- */
-export const fsStat = util.promisify(isNode ? fs.stat : function stat() {});
-
 export const fsCreateReadStream = fs.createReadStream;