From fb9ebf05b0dce4b5bdd58332367e1ba77bd50eda Mon Sep 17 00:00:00 2001
From: Jeremy Meng <yumeng@microsoft.com>
Date: Sun, 20 Oct 2019 23:52:19 -0700
Subject: [PATCH] [Storage][File] use sourceConditions field name in public API

for consistency with Blob.

In PR #5672 we adopted the field names `conditions` and `sourceConditions`.
This change fixes the only place in File where `SourceModifiedAccessConditions`
is used in public API to be consistent.
---
 sdk/storage/storage-file/src/FileClient.ts    | 21 +++++++++++++++----
 .../storage-file/src/generatedModels.ts       |  3 ++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/sdk/storage/storage-file/src/FileClient.ts b/sdk/storage/storage-file/src/FileClient.ts
index d5e1a123146b..0f89ac7d7ded 100644
--- a/sdk/storage/storage-file/src/FileClient.ts
+++ b/sdk/storage/storage-file/src/FileClient.ts
@@ -19,7 +19,7 @@ import {
   FileSetHTTPHeadersResponse,
   FileSetMetadataResponse,
   FileStartCopyResponse,
-  FileUploadRangeFromURLOptionalParams,
+  SourceModifiedAccessConditions,
   FileUploadRangeFromURLResponse,
   FileUploadRangeResponse,
   HandleItem,
@@ -220,9 +220,7 @@ export interface FileUploadRangeOptions extends CommonOptions {
  * @export
  * @interface FileUploadRangeFromURLOptions
  */
-export interface FileUploadRangeFromURLOptions
-  extends FileUploadRangeFromURLOptionalParams,
-    CommonOptions {
+export interface FileUploadRangeFromURLOptions extends CommonOptions {
   /**
    * An implementation of the `AbortSignalLike` interface to signal the request to cancel the operation.
    * For example, use the &commat;azure/abort-controller to create an `AbortSignal`.
@@ -231,6 +229,20 @@ export interface FileUploadRangeFromURLOptions
    * @memberof FileUploadRangeFromURLOptions
    */
   abortSignal?: AbortSignalLike;
+  /**
+   * The timeout parameter is expressed in seconds. For more information, see <a
+   * href="https://docs.microsoft.com/en-us/rest/api/storageservices/Setting-Timeouts-for-File-Service-Operations?redirectedfrom=MSDN">Setting
+   * Timeouts for File Service Operations.</a>
+   */
+  timeoutInSeconds?: number;
+  /**
+   * Specify the crc64 calculated for the range of bytes that must be read from the copy source.
+   */
+  sourceContentCrc64?: Uint8Array;
+  /**
+   * Additional parameters for the operation
+   */
+  sourceConditions?: SourceModifiedAccessConditions;
 }
 
 /**
@@ -1200,6 +1212,7 @@ export class FileClient extends StorageClient {
         0,
         {
           abortSignal: options.abortSignal,
+          sourceModifiedAccessConditions: options.sourceConditions,
           ...options,
           spanOptions
         }
diff --git a/sdk/storage/storage-file/src/generatedModels.ts b/sdk/storage/storage-file/src/generatedModels.ts
index a121c195dce5..279ec7bddf17 100644
--- a/sdk/storage/storage-file/src/generatedModels.ts
+++ b/sdk/storage/storage-file/src/generatedModels.ts
@@ -51,5 +51,6 @@ export {
   ShareSetAccessPolicyResponse,
   ShareSetMetadataResponse,
   ShareSetQuotaResponse,
-  SignedIdentifier as SignedIdentifierModel
+  SignedIdentifier as SignedIdentifierModel,
+  SourceModifiedAccessConditions
 } from "./generated/src/models";