diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DirectoryClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeDirectoryClient.cs similarity index 85% rename from sdk/storage/Azure.Storage.Files.DataLake/src/DirectoryClient.cs rename to sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeDirectoryClient.cs index a5a7b7749db8..978c031595f2 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DirectoryClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeDirectoryClient.cs @@ -14,7 +14,7 @@ namespace Azure.Storage.Files.DataLake /// /// A DirectoryClient represents a URI to the Azure DataLake service allowing you to manipulate a directory. /// - public class DirectoryClient : PathClient + public class DataLakeDirectoryClient : DataLakePathClient { /// /// The name of the directory. @@ -35,15 +35,29 @@ public virtual string Name #region ctors /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class for mocking. /// - protected DirectoryClient() + protected DataLakeDirectoryClient() { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the directory that includes the + /// name of the account, the name of the file system, and the path of the + /// directory. + /// + public DataLakeDirectoryClient(Uri directoryUri) + : this(directoryUri, (HttpPipelinePolicy)null, null) + { + } + + /// + /// Initializes a new instance of the /// class. /// /// @@ -56,13 +70,13 @@ protected DirectoryClient() /// pipeline policies for authentication, retries, etc., that are /// applied to every request. /// - public DirectoryClient(Uri directoryUri, DataLakeClientOptions options = default) + public DataLakeDirectoryClient(Uri directoryUri, DataLakeClientOptions options) : this(directoryUri, (HttpPipelinePolicy)null, options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -73,18 +87,74 @@ public DirectoryClient(Uri directoryUri, DataLakeClientOptions options = default /// /// The shared key credential used to sign requests. /// + public DataLakeDirectoryClient(Uri directoryUri, StorageSharedKeyCredential credential) + : this(directoryUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the directory that includes the + /// name of the account, the name of the file system, and the path of the + /// directory. + /// + /// + /// The shared key credential used to sign requests. + /// + /// + /// Optional client options that define the transport pipeline + /// policies for authentication, retries, etc., that are applied to + /// every request. + /// + public DataLakeDirectoryClient(Uri directoryUri, StorageSharedKeyCredential credential, DataLakeClientOptions options) + : this(directoryUri, credential.AsPolicy(), options) + { + } + + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the directory that includes the + /// name of the account, the name of the file system, and the path of the + /// directory. + /// + /// + /// The token credential used to sign requests. + /// + public DataLakeDirectoryClient(Uri directoryUri, TokenCredential credential) + : this(directoryUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the directory that includes the + /// name of the account, the name of the file system, and the path of the + /// directory. + /// + /// + /// The token credential used to sign requests. + /// /// /// Optional client options that define the transport pipeline /// policies for authentication, retries, etc., that are applied to /// every request. /// - public DirectoryClient(Uri directoryUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) + public DataLakeDirectoryClient(Uri directoryUri, TokenCredential credential, DataLakeClientOptions options) : this(directoryUri, credential.AsPolicy(), options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -100,13 +170,13 @@ public DirectoryClient(Uri directoryUri, StorageSharedKeyCredential credential, /// policies for authentication, retries, etc., that are applied to /// every request. /// - internal DirectoryClient(Uri directoryUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) + internal DataLakeDirectoryClient(Uri directoryUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) : base(directoryUri, authentication, options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -117,37 +187,37 @@ internal DirectoryClient(Uri directoryUri, HttpPipelinePolicy authentication, Da /// /// The transport pipeline used to send every request. /// - internal DirectoryClient(Uri directoryUri, HttpPipeline pipeline) : base(directoryUri, pipeline) + internal DataLakeDirectoryClient(Uri directoryUri, HttpPipeline pipeline) : base(directoryUri, pipeline) { } #endregion ctors /// - /// Creates a new object by appending + /// Creates a new object by appending /// to the end of . The - /// new uses the same request policy - /// pipeline as the . + /// new uses the same request policy + /// pipeline as the . /// /// The name of the file. - /// A new instance. - public virtual FileClient GetFileClient(string fileName) - => new FileClient(Uri.AppendToPath(fileName), Pipeline); + /// A new instance. + public virtual DataLakeFileClient GetFileClient(string fileName) + => new DataLakeFileClient(Uri.AppendToPath(fileName), Pipeline); /// - /// Creates a new object by appending + /// Creates a new object by appending /// to the end of . - /// The new uses the same request policy - /// pipeline as the . + /// The new uses the same request policy + /// pipeline as the . /// /// The name of the subdirectory. - /// A new instance. - public virtual DirectoryClient GetSubDirectoryClient(string subdirectoryName) - => new DirectoryClient(Uri.AppendToPath(subdirectoryName), Pipeline); + /// A new instance. + public virtual DataLakeDirectoryClient GetSubDirectoryClient(string subdirectoryName) + => new DataLakeDirectoryClient(Uri.AppendToPath(subdirectoryName), Pipeline); /// /// Sets the various name fields if they are currently null. /// - protected override void SetNameFieldsIfNull() + internal override void SetNameFieldsIfNull() { base.SetNameFieldsIfNull(); @@ -204,7 +274,7 @@ protected override void SetNameFieldsIfNull() /// [ForwardsClientCalls] public virtual Response Create( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -264,7 +334,7 @@ public virtual Response Create( /// [ForwardsClientCalls] public virtual async Task> CreateAsync( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -376,20 +446,20 @@ await base.DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public new virtual Response Rename( + public new virtual Response Rename( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, CancellationToken cancellationToken = default) { - Response response = base.Rename( + Response response = base.Rename( destinationPath, sourceConditions, destinationConditions, cancellationToken); return Response.FromValue( - new DirectoryClient(response.Value.DfsUri, response.Value.Pipeline), + new DataLakeDirectoryClient(response.Value.DfsUri, response.Value.Pipeline), response.GetRawResponse()); } @@ -422,13 +492,13 @@ await base.DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public new virtual async Task> RenameAsync( + public new virtual async Task> RenameAsync( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, CancellationToken cancellationToken = default) { - Response response = await base.RenameAsync( + Response response = await base.RenameAsync( destinationPath, sourceConditions, destinationConditions, @@ -436,7 +506,7 @@ await base.DeleteAsync( .ConfigureAwait(false); return Response.FromValue( - new DirectoryClient(response.Value.DfsUri, response.Value.Pipeline), + new DataLakeDirectoryClient(response.Value.DfsUri, response.Value.Pipeline), response.GetRawResponse()); } #endregion Move @@ -489,16 +559,16 @@ await base.DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response CreateFile( + public virtual Response CreateFile( string fileName, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - FileClient fileClient = GetFileClient(fileName); + DataLakeFileClient fileClient = GetFileClient(fileName); Response response = fileClient.Create( httpHeaders, @@ -560,16 +630,16 @@ public virtual Response CreateFile( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> CreateFileAsync( + public virtual async Task> CreateFileAsync( string fileName, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - FileClient fileClient = GetFileClient(fileName); + DataLakeFileClient fileClient = GetFileClient(fileName); Response response = await fileClient.CreateAsync( httpHeaders, @@ -703,16 +773,16 @@ await GetFileClient(fileName).DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response CreateSubDirectory( + public virtual Response CreateSubDirectory( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - DirectoryClient directoryClient = GetSubDirectoryClient(path); + DataLakeDirectoryClient directoryClient = GetSubDirectoryClient(path); Response response = directoryClient.Create( PathResourceType.Directory, @@ -775,16 +845,16 @@ public virtual Response CreateSubDirectory( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> CreateSubDirectoryAsync( + public virtual async Task> CreateSubDirectoryAsync( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - DirectoryClient directoryClient = GetSubDirectoryClient(path); + DataLakeDirectoryClient directoryClient = GetSubDirectoryClient(path); Response response = await directoryClient.CreateAsync( PathResourceType.Directory, diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeExtensions.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeExtensions.cs index 01edfa1c6f29..32d2274cea05 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeExtensions.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeExtensions.cs @@ -98,7 +98,7 @@ internal static PathProperties ToPathProperties(this BlobProperties blobProperti AccessTierChangedOn = blobProperties.AccessTierChangedOn }; - internal static DataLakeLease ToDataLakeLease(this Blobs.Models.BlobLease blobLease) => + internal static DataLakeLease ToDataLakeLease(this BlobLease blobLease) => new DataLakeLease() { ETag = blobLease.ETag, @@ -107,16 +107,40 @@ internal static DataLakeLease ToDataLakeLease(this Blobs.Models.BlobLease blobLe LeaseTime = blobLease.LeaseTime }; - internal static BlobHttpHeaders ToBlobHttpHeaders(this PathHttpHeaders pathHttpHeaders) => - new BlobHttpHeaders() - { - ContentType = pathHttpHeaders.ContentType, - ContentHash = pathHttpHeaders.ContentHash, - ContentEncoding = new string[] { pathHttpHeaders.ContentEncoding }, - ContentLanguage = new string[] { pathHttpHeaders.ContentLanguage }, - ContentDisposition = pathHttpHeaders.ContentDisposition, - CacheControl = pathHttpHeaders.CacheControl - }; + internal static BlobHttpHeaders ToBlobHttpHeaders(this PathHttpHeaders pathHttpHeaders) + { + if (pathHttpHeaders == null) + { + return null; + } + + return new BlobHttpHeaders() + { + ContentType = pathHttpHeaders.ContentType, + ContentHash = pathHttpHeaders.ContentHash, + ContentEncoding = new string[] { pathHttpHeaders.ContentEncoding }, + ContentLanguage = new string[] { pathHttpHeaders.ContentLanguage }, + ContentDisposition = pathHttpHeaders.ContentDisposition, + CacheControl = pathHttpHeaders.CacheControl + }; + } + + internal static BlobRequestConditions ToBlobRequestConditions(this DataLakeRequestConditions dataLakeRequestConditions) + { + if (dataLakeRequestConditions == null) + { + return null; + } + + return new BlobRequestConditions() + { + IfMatch = dataLakeRequestConditions.IfMatch, + IfNoneMatch = dataLakeRequestConditions.IfNoneMatch, + IfModifiedSince = dataLakeRequestConditions.IfModifiedSince, + IfUnmodifiedSince = dataLakeRequestConditions.IfUnmodifiedSince, + LeaseId = dataLakeRequestConditions.LeaseId + }; + } internal static PathItem ToPathItem(this Dictionary dictionary) { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/FileClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs similarity index 90% rename from sdk/storage/Azure.Storage.Files.DataLake/src/FileClient.cs rename to sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs index 745e092746dd..c772cbbfde68 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/FileClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs @@ -13,9 +13,9 @@ namespace Azure.Storage.Files.DataLake { /// - /// The allows you to manipulate Azure Data Lake files. + /// The allows you to manipulate Azure Data Lake files. /// - public class FileClient : PathClient + public class DataLakeFileClient : DataLakePathClient { /// /// The name of the file. @@ -36,15 +36,28 @@ public virtual string Name #region ctors /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class for mocking. /// - protected FileClient() + protected DataLakeFileClient() { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. + /// + /// + /// A referencing the file that includes the + /// name of the account, the name of the file system, and the path of the + /// file. + /// + public DataLakeFileClient(Uri fileUri) + : this(fileUri, (HttpPipelinePolicy)null, null) + { + } + + /// + /// Initializes a new instance of the class. /// /// /// A referencing the file that includes the @@ -56,13 +69,13 @@ protected FileClient() /// pipeline policies for authentication, retries, etc., that are /// applied to every request. /// - public FileClient(Uri fileUri, DataLakeClientOptions options = default) + public DataLakeFileClient(Uri fileUri, DataLakeClientOptions options) : this(fileUri, (HttpPipelinePolicy)null, options) { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// A referencing the file that includes the @@ -72,18 +85,71 @@ public FileClient(Uri fileUri, DataLakeClientOptions options = default) /// /// The shared key credential used to sign requests. /// + public DataLakeFileClient(Uri fileUri, StorageSharedKeyCredential credential) + : this(fileUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// + /// A referencing the file that includes the + /// name of the account, the name of the file system, and the path of the + /// file. + /// + /// + /// The shared key credential used to sign requests. + /// + /// + /// Optional that define the transport + /// pipeline policies for authentication, retries, etc., that are + /// applied to every request. + /// + public DataLakeFileClient(Uri fileUri, StorageSharedKeyCredential credential, DataLakeClientOptions options) + : this(fileUri, credential.AsPolicy(), options) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// + /// A referencing the file that includes the + /// name of the account, the name of the file system, and the path of the + /// file. + /// + /// + /// The token credential used to sign requests. + /// + public DataLakeFileClient(Uri fileUri, TokenCredential credential) + : this(fileUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// + /// A referencing the file that includes the + /// name of the account, the name of the file system, and the path of the + /// file. + /// + /// + /// The token credential used to sign requests. + /// /// /// Optional that define the transport /// pipeline policies for authentication, retries, etc., that are /// applied to every request. /// - public FileClient(Uri fileUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) + public DataLakeFileClient(Uri fileUri, TokenCredential credential, DataLakeClientOptions options) : this(fileUri, credential.AsPolicy(), options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -99,13 +165,13 @@ public FileClient(Uri fileUri, StorageSharedKeyCredential credential, DataLakeCl /// policies for authentication, retries, etc., that are applied to /// every request. /// - internal FileClient(Uri fileUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) + internal DataLakeFileClient(Uri fileUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) : base(fileUri, authentication, options) { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// A referencing the file that includes the @@ -114,7 +180,7 @@ internal FileClient(Uri fileUri, HttpPipelinePolicy authentication, DataLakeClie /// /// The transport pipeline used to send every request. /// - internal FileClient(Uri fileUri, HttpPipeline pipeline) : base(fileUri, pipeline) + internal DataLakeFileClient(Uri fileUri, HttpPipeline pipeline) : base(fileUri, pipeline) { } #endregion ctors @@ -122,7 +188,7 @@ internal FileClient(Uri fileUri, HttpPipeline pipeline) : base(fileUri, pipeline /// /// Sets the various name fields if they are currently null. /// - protected override void SetNameFieldsIfNull() + internal override void SetNameFieldsIfNull() { base.SetNameFieldsIfNull(); if (_name == null) @@ -178,7 +244,7 @@ protected override void SetNameFieldsIfNull() /// [ForwardsClientCalls] public virtual Response Create( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -238,7 +304,7 @@ public virtual Response Create( /// [ForwardsClientCalls] public virtual async Task> CreateAsync( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -350,20 +416,20 @@ public virtual async Task DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public new virtual Response Rename( + public new virtual Response Rename( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, CancellationToken cancellationToken = default) { - Response response = base.Rename( + Response response = base.Rename( destinationPath, sourceConditions, destinationConditions, cancellationToken); return Response.FromValue( - new FileClient(response.Value.DfsUri, response.Value.Pipeline), + new DataLakeFileClient(response.Value.DfsUri, response.Value.Pipeline), response.GetRawResponse()); } @@ -396,13 +462,13 @@ public virtual async Task DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public new virtual async Task> RenameAsync( + public new virtual async Task> RenameAsync( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, CancellationToken cancellationToken = default) { - Response response = await base.RenameAsync( + Response response = await base.RenameAsync( destinationPath, sourceConditions, destinationConditions, @@ -410,7 +476,7 @@ public virtual async Task DeleteAsync( .ConfigureAwait(false); return Response.FromValue( - new FileClient(response.Value.DfsUri, response.Value.Pipeline), + new DataLakeFileClient(response.Value.DfsUri, response.Value.Pipeline), response.GetRawResponse()); } #endregion Move @@ -570,10 +636,10 @@ private async Task AppendInternal( bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(FileClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakeFileClient))) { Pipeline.LogMethodEnter( - nameof(FileClient), + nameof(DataLakeFileClient), message: $"{nameof(Uri)}: {Uri}\n" + $"{nameof(offset)}: {offset}\n" + @@ -602,7 +668,7 @@ private async Task AppendInternal( } finally { - Pipeline.LogMethodExit(nameof(FileClient)); + Pipeline.LogMethodExit(nameof(DataLakeFileClient)); } } } @@ -661,7 +727,7 @@ public virtual Response Flush( long position, bool? retainUncommittedData = default, bool? close = default, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) => FlushInternal( @@ -726,7 +792,7 @@ public virtual async Task> FlushAsync( long position, bool? retainUncommittedData = default, bool? close = default, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) => await FlushInternal( @@ -793,15 +859,15 @@ private async Task> FlushInternal( long position, bool? retainUncommittedData, bool? close, - PathHttpHeaders? httpHeaders, + PathHttpHeaders httpHeaders, DataLakeRequestConditions conditions, bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(FileClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakeFileClient))) { Pipeline.LogMethodEnter( - nameof(FileClient), + nameof(DataLakeFileClient), message: $"{nameof(Uri)}: {Uri}"); @@ -845,7 +911,7 @@ private async Task> FlushInternal( } finally { - Pipeline.LogMethodExit(nameof(FileClient)); + Pipeline.LogMethodExit(nameof(DataLakeFileClient)); } } } @@ -1013,7 +1079,7 @@ public virtual Response Read( { Response response = _blockBlobClient.Download( range: range, - conditions: conditions, + conditions: conditions.ToBlobRequestConditions(), rangeGetContentHash: rangeGetContentHash, cancellationToken: cancellationToken); @@ -1066,7 +1132,7 @@ public virtual async Task> ReadAsync( { Response response = await _blockBlobClient.DownloadAsync( range: range, - conditions: conditions, + conditions: conditions.ToBlobRequestConditions(), rangeGetContentHash: rangeGetContentHash, cancellationToken: cancellationToken) .ConfigureAwait(false); diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/FileSystemClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs similarity index 87% rename from sdk/storage/Azure.Storage.Files.DataLake/src/FileSystemClient.cs rename to sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs index 94298b5aa6f4..e4795f02e2b2 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/FileSystemClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs @@ -17,10 +17,10 @@ namespace Azure.Storage.Files.DataLake { /// - /// The allows you to manipulate Azure + /// The allows you to manipulate Azure /// Data Lake file systems and their directories and files. /// - public class FileSystemClient + public class DataLakeFileSystemClient { /// /// A assoicated with the file system. @@ -112,15 +112,15 @@ public virtual string Name #region ctors /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class for mocking. /// - protected FileSystemClient() + protected DataLakeFileSystemClient() { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -132,13 +132,13 @@ protected FileSystemClient() /// policies for authentication, retries, etc., that are applied to /// every request. /// - public FileSystemClient(Uri fileSystemUri, DataLakeClientOptions options = default) + public DataLakeFileSystemClient(Uri fileSystemUri, DataLakeClientOptions options = default) : this(fileSystemUri, (HttpPipelinePolicy)null, options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -153,13 +153,13 @@ public FileSystemClient(Uri fileSystemUri, DataLakeClientOptions options = defau /// policies for authentication, retries, etc., that are applied to /// every request. /// - public FileSystemClient(Uri fileSystemUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) + public DataLakeFileSystemClient(Uri fileSystemUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) : this(fileSystemUri, credential.AsPolicy(), options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -174,13 +174,13 @@ public FileSystemClient(Uri fileSystemUri, StorageSharedKeyCredential credential /// policies for authentication, retries, etc., that are applied to /// every request. /// - public FileSystemClient(Uri fileSystemUri, TokenCredential credential, DataLakeClientOptions options = default) + public DataLakeFileSystemClient(Uri fileSystemUri, TokenCredential credential, DataLakeClientOptions options = default) : this(fileSystemUri, credential.AsPolicy(), options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -195,7 +195,7 @@ public FileSystemClient(Uri fileSystemUri, TokenCredential credential, DataLakeC /// policies for authentication, retries, etc., that are applied to /// every request. /// - internal FileSystemClient(Uri fileSystemUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) + internal DataLakeFileSystemClient(Uri fileSystemUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) { _uri = fileSystemUri; _blobUri = GetBlobUri(fileSystemUri); @@ -206,7 +206,7 @@ internal FileSystemClient(Uri fileSystemUri, HttpPipelinePolicy authentication, } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -217,7 +217,7 @@ internal FileSystemClient(Uri fileSystemUri, HttpPipelinePolicy authentication, /// The transport pipeline used to send every request. /// /// /// - internal FileSystemClient(Uri fileSystemUri, HttpPipeline pipeline, ClientDiagnostics clientDiagnostics) + internal DataLakeFileSystemClient(Uri fileSystemUri, HttpPipeline pipeline, ClientDiagnostics clientDiagnostics) { _uri = fileSystemUri; _blobUri = GetBlobUri(fileSystemUri); @@ -229,26 +229,26 @@ internal FileSystemClient(Uri fileSystemUri, HttpPipeline pipeline, ClientDiagno #endregion ctors /// - /// Create a new object by appending + /// Create a new object by appending /// to the end of . The - /// new uses the same request policy - /// pipeline as the . + /// new uses the same request policy + /// pipeline as the . /// /// The name of the directory. - /// A new instance. - public virtual DirectoryClient GetDirectoryClient(string directoryName) - => new DirectoryClient(Uri.AppendToPath(directoryName), Pipeline); + /// A new instance. + public virtual DataLakeDirectoryClient GetDirectoryClient(string directoryName) + => new DataLakeDirectoryClient(Uri.AppendToPath(directoryName), Pipeline); /// - /// Create a new object by appending + /// Create a new object by appending /// to the end of . The - /// new uses the same request policy - /// pipeline as the . + /// new uses the same request policy + /// pipeline as the . /// /// The name of the directory. - /// A new instance. - public virtual FileClient GetFileClient(string fileName) - => new FileClient(Uri.AppendToPath(fileName), Pipeline); + /// A new instance. + public virtual DataLakeFileClient GetFileClient(string fileName) + => new DataLakeFileClient(Uri.AppendToPath(fileName), Pipeline); /// /// Gets the blob Uri. @@ -446,7 +446,7 @@ public virtual Response Delete( DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) => _containerClient.Delete( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken); /// @@ -476,7 +476,7 @@ public virtual async Task DeleteAsync( DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) => await _containerClient.DeleteAsync( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken) .ConfigureAwait(false); #endregion Delete @@ -512,7 +512,7 @@ public virtual Response GetProperties( CancellationToken cancellationToken = default) { Response containerResponse = _containerClient.GetProperties( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken); return Response.FromValue( @@ -550,7 +550,7 @@ public virtual async Task> GetPropertiesAsync( CancellationToken cancellationToken = default) { Response response = await _containerClient.GetPropertiesAsync( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken) .ConfigureAwait(false); @@ -593,7 +593,7 @@ public virtual Response SetMetadata( { Response response = _containerClient.SetMetadata( metadata, - conditions, + conditions.ToBlobRequestConditions(), cancellationToken); return Response.FromValue( @@ -637,7 +637,7 @@ public virtual async Task> SetMetadataAsync( { Response response = await _containerClient.SetMetadataAsync( metadata, - conditions, + conditions.ToBlobRequestConditions(), cancellationToken) .ConfigureAwait(false); @@ -659,8 +659,19 @@ public virtual async Task> SetMetadataAsync( /// /// For more information, see . /// - /// - /// Specifies options for listing and filtering the paths. + /// + /// Filters results to paths within the specified directory. + /// + /// + /// If "true", all paths are listed; otherwise, only paths at the root of the filesystem are listed. + /// + /// + /// Optional. Valid only when Hierarchical Namespace is enabled for the account. If + /// "true", the user identity values returned in the owner and group fields of each list + /// entry will be transformed from Azure Active Directory Object IDs to User Principal + /// Names. If "false", the values will be returned as Azure Active Directory Object IDs. + /// The default value is false. Note that group and application Object IDs are not translated + /// because they do not have unique friendly names. /// /// /// Optional to propagate @@ -675,9 +686,15 @@ public virtual async Task> SetMetadataAsync( /// a failure occurs. /// public virtual Pageable ListPaths( - GetPathsOptions? options = default, + string path = default, + bool recursive = default, + bool upn = default, CancellationToken cancellationToken = default) => - new GetPathsAsyncCollection(this, options).ToSyncCollection(cancellationToken); + new GetPathsAsyncCollection( + this, + path, + recursive, + upn).ToSyncCollection(cancellationToken); /// /// The operation returns an async @@ -687,8 +704,19 @@ public virtual Pageable ListPaths( /// /// For more information, see . /// - /// - /// Specifies options for listing and filtering paths. + /// + /// Filters results to paths within the specified directory. + /// + /// + /// If "true", all paths are listed; otherwise, only paths at the root of the filesystem are listed. + /// + /// + /// Optional. Valid only when Hierarchical Namespace is enabled for the account. If + /// "true", the user identity values returned in the owner and group fields of each list + /// entry will be transformed from Azure Active Directory Object IDs to User Principal + /// Names. If "false", the values will be returned as Azure Active Directory Object IDs. + /// The default value is false. Note that group and application Object IDs are not translated + /// because they do not have unique friendly names. /// /// /// Optional to propagate @@ -703,9 +731,14 @@ public virtual Pageable ListPaths( /// a failure occurs. /// public virtual AsyncPageable ListPathsAsync( - GetPathsOptions? options = default, + string path = default, + bool recursive = default, + bool upn = default, CancellationToken cancellationToken = default) => - new GetPathsAsyncCollection(this, options).ToAsyncCollection(cancellationToken); + new GetPathsAsyncCollection(this, + path, + recursive, + upn).ToAsyncCollection(cancellationToken); /// /// The operation returns a @@ -719,8 +752,19 @@ public virtual AsyncPageable ListPathsAsync( /// /// For more information, see . /// - /// - /// Specifies options for listing and filtering paths. + /// + /// Filters results to paths within the specified directory. + /// + /// + /// If "true", all paths are listed; otherwise, only paths at the root of the filesystem are listed. + /// + /// + /// Optional. Valid only when Hierarchical Namespace is enabled for the account. If + /// "true", the user identity values returned in the owner and group fields of each list + /// entry will be transformed from Azure Active Directory Object IDs to User Principal + /// Names. If "false", the values will be returned as Azure Active Directory Object IDs. + /// The default value is false. Note that group and application Object IDs are not translated + /// because they do not have unique friendly names. /// /// /// The number of paths returned with each invocation is limited. If the number of paths @@ -748,13 +792,15 @@ public virtual AsyncPageable ListPathsAsync( /// a failure occurs. /// internal async Task> ListPathsInternal( - GetPathsOptions? options, + string path, + bool recursive, + bool upn, string continuation, int? maxResults, bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(FileSystemClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakeFileSystemClient))) { Pipeline.LogMethodEnter( nameof(BlobContainerClient), @@ -769,10 +815,10 @@ internal async Task> ListPathsInternal( pipeline: Pipeline, resourceUri: _dfsUri, continuation: continuation, - recursive: options?.Recursive ?? false, + recursive: recursive, maxResults: maxResults, - upn: options?.Upn, - path: options?.Path, + upn: upn, + path: path, async: async, cancellationToken: cancellationToken) .ConfigureAwait(false); @@ -802,7 +848,7 @@ Dictionary>> pathDictionary } finally { - Pipeline.LogMethodExit(nameof(FileSystemClient)); + Pipeline.LogMethodExit(nameof(DataLakeFileSystemClient)); } } } @@ -856,16 +902,16 @@ Dictionary>> pathDictionary /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response CreateDirectory( + public virtual Response CreateDirectory( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - DirectoryClient directoryClient = GetDirectoryClient(path); + DataLakeDirectoryClient directoryClient = GetDirectoryClient(path); Response response = directoryClient.Create( httpHeaders, @@ -927,16 +973,16 @@ public virtual Response CreateDirectory( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> CreateDirectoryAsync( + public virtual async Task> CreateDirectoryAsync( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - DirectoryClient directoryClient = GetDirectoryClient(path); + DataLakeDirectoryClient directoryClient = GetDirectoryClient(path); Response response = await GetDirectoryClient(path).CreateAsync( httpHeaders, @@ -1073,16 +1119,16 @@ await GetDirectoryClient(path).DeleteAsync( /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response CreateFile( + public virtual Response CreateFile( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - FileClient fileClient = GetFileClient(path); + DataLakeFileClient fileClient = GetFileClient(path); Response response = fileClient.Create( httpHeaders, @@ -1144,16 +1190,16 @@ public virtual Response CreateFile( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> CreateFileAsync( + public virtual async Task> CreateFileAsync( string path, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { - FileClient fileClient = GetFileClient(path); + DataLakeFileClient fileClient = GetFileClient(path); Response response = await fileClient.CreateAsync( httpHeaders, diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClient.cs index 906c22eeb32c..3429fd1bd8e7 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClient.cs @@ -59,7 +59,7 @@ protected DataLakeLeaseClient() /// An optional lease ID. If no lease ID is provided, a random lease /// ID will be created. /// - public DataLakeLeaseClient(PathClient client, string leaseId = null) + public DataLakeLeaseClient(DataLakePathClient client, string leaseId = null) { _blobLeaseClient = new Blobs.Specialized.BlobLeaseClient(client.BlobClient, leaseId); } @@ -68,14 +68,14 @@ public DataLakeLeaseClient(PathClient client, string leaseId = null) /// Initializes a new instance of the class. /// /// - /// A representing the file system + /// A representing the file system /// being leased. /// /// /// An optional lease ID. If no lease ID is provided, a random lease /// ID will be created. /// - public DataLakeLeaseClient(FileSystemClient client, string leaseId = null) + public DataLakeLeaseClient(DataLakeFileSystemClient client, string leaseId = null) { _blobLeaseClient = new Blobs.Specialized.BlobLeaseClient(client.ContainerClient, leaseId); } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClientExtensions.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClientExtensions.cs index bdd5f6e91279..d324ae472032 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClientExtensions.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeLeaseClientExtensions.cs @@ -16,14 +16,14 @@ public static partial class DataLakeLeaseClientExtensions /// Initializes a new instance of the class. /// /// - /// A representing the path being leased. + /// A representing the path being leased. /// /// /// An optional lease ID. If no lease ID is provided, a random lease /// ID will be created. /// public static DataLakeLeaseClient GetDataLakeLeaseClient( - this PathClient client, + this DataLakePathClient client, string leaseId = null) => new DataLakeLeaseClient(client, leaseId); @@ -31,14 +31,14 @@ public static DataLakeLeaseClient GetDataLakeLeaseClient( /// Initializes a new instance of the class. /// /// - /// A representing the file system being leased. + /// A representing the file system being leased. /// /// /// An optional lease ID. If no lease ID is provided, a random lease /// ID will be created. /// public static DataLakeLeaseClient GetDataLakeLeaseClient( - this FileSystemClient client, + this DataLakeFileSystemClient client, string leaseId = null) => new DataLakeLeaseClient(client, leaseId); } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/PathClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs similarity index 91% rename from sdk/storage/Azure.Storage.Files.DataLake/src/PathClient.cs rename to sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs index ed47bf171cd4..4c7e1c46a6bb 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/PathClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs @@ -17,7 +17,7 @@ namespace Azure.Storage.Files.DataLake /// /// A PathClient represents a URI to the Azure DataLake service allowing you to manipulate a file or directory. /// - public class PathClient + public class DataLakePathClient { /// /// A associated with the path; @@ -114,15 +114,29 @@ public virtual string FileSystemName #region ctors /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class for mocking. /// - protected PathClient() + protected DataLakePathClient() { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the resource that includes the + /// name of the account, the name of the file system, and the path to the + /// resource. + /// + public DataLakePathClient(Uri pathUri) + : this(pathUri, (HttpPipelinePolicy)null, null) + { + } + + /// + /// Initializes a new instance of the /// class. /// /// @@ -135,13 +149,30 @@ protected PathClient() /// pipeline policies for authentication, retries, etc., that are /// applied to every request. /// - public PathClient(Uri pathUri, DataLakeClientOptions options = default) + public DataLakePathClient(Uri pathUri, DataLakeClientOptions options) : this(pathUri, (HttpPipelinePolicy)null, options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the resource that includes the + /// name of the account, the name of the file system, and the path to the + /// resource. + /// + /// + /// The shared key credential used to sign requests. + /// + public DataLakePathClient(Uri pathUri, StorageSharedKeyCredential credential) + : this(pathUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the /// class. /// /// @@ -157,13 +188,52 @@ public PathClient(Uri pathUri, DataLakeClientOptions options = default) /// policies for authentication, retries, etc., that are applied to /// every request. /// - public PathClient(Uri pathUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) + public DataLakePathClient(Uri pathUri, StorageSharedKeyCredential credential, DataLakeClientOptions options) : this(pathUri, credential.AsPolicy(), options) { } /// - /// Initializes a new instance of the + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the resource that includes the + /// name of the account, the name of the file system, and the path to the + /// resource. + /// + /// + /// The token credential used to sign requests. + /// + public DataLakePathClient(Uri pathUri, TokenCredential credential) + : this(pathUri, credential.AsPolicy(), null) + { + } + + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the resource that includes the + /// name of the account, the name of the file system, and the path to the + /// resource. + /// + /// + /// The token credential used to sign requests. + /// + /// + /// Optional client options that define the transport pipeline + /// policies for authentication, retries, etc., that are applied to + /// every request. + /// + public DataLakePathClient(Uri pathUri, TokenCredential credential, DataLakeClientOptions options) + : this(pathUri, credential.AsPolicy(), options) + { + } + + /// + /// Initializes a new instance of the /// class. /// /// @@ -179,7 +249,7 @@ public PathClient(Uri pathUri, StorageSharedKeyCredential credential, DataLakeCl /// policies for authentication, retries, etc., that are applied to /// every request. /// - internal PathClient(Uri pathUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) + internal DataLakePathClient(Uri pathUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) { _uri = pathUri; _blobUri = GetBlobUri(pathUri); @@ -191,7 +261,7 @@ internal PathClient(Uri pathUri, HttpPipelinePolicy authentication, DataLakeClie } /// - /// Initializes a new instance of the + /// Initializes a new instance of the /// class. /// /// @@ -206,7 +276,7 @@ internal PathClient(Uri pathUri, HttpPipelinePolicy authentication, DataLakeClie /// Optional client options that define the transport pipeline /// policies for authentication, retries, etc., that are applied to /// - internal PathClient(Uri pathUri, HttpPipeline pipeline, DataLakeClientOptions options = default) + internal DataLakePathClient(Uri pathUri, HttpPipeline pipeline, DataLakeClientOptions options = default) { _uri = pathUri; _blobUri = GetBlobUri(pathUri); @@ -262,7 +332,7 @@ private static Uri GetDfsUri(Uri uri) /// /// Converts metadata in DFS metadata string /// - protected static string BuildMetadataString(Metadata metadata) + internal static string BuildMetadataString(Metadata metadata) { if (metadata == null) { @@ -284,7 +354,7 @@ protected static string BuildMetadataString(Metadata metadata) /// /// Sets the various name fields if they are currently null. /// - protected virtual void SetNameFieldsIfNull() + internal virtual void SetNameFieldsIfNull() { if (_fileSystemName == null || _accountName == null) { @@ -344,7 +414,7 @@ protected virtual void SetNameFieldsIfNull() [ForwardsClientCalls] protected virtual Response Create( PathResourceType resourceType, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -410,7 +480,7 @@ protected virtual Response Create( [ForwardsClientCalls] public virtual async Task> CreateAsync( PathResourceType resourceType, - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, Metadata metadata = default, string permissions = default, string umask = default, @@ -478,7 +548,7 @@ await CreateInternal( /// private async Task> CreateInternal( PathResourceType resourceType, - PathHttpHeaders? httpHeaders, + PathHttpHeaders httpHeaders, Metadata metadata, string permissions, string umask, @@ -486,10 +556,10 @@ private async Task> CreateInternal( bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(PathClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakePathClient))) { Pipeline.LogMethodEnter( - nameof(PathClient), + nameof(DataLakePathClient), message: $"{nameof(Uri)}: {Uri}\n" + $"{nameof(httpHeaders)}: {httpHeaders}\n" + @@ -536,7 +606,7 @@ private async Task> CreateInternal( } finally { - Pipeline.LogMethodExit(nameof(PathClient)); + Pipeline.LogMethodExit(nameof(DataLakePathClient)); } } } @@ -652,7 +722,7 @@ private async Task DeleteInternal( bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(PathClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakePathClient))) { Pipeline.LogMethodEnter( nameof(BlobBaseClient), @@ -685,7 +755,7 @@ private async Task DeleteInternal( } finally { - Pipeline.LogMethodExit(nameof(PathClient)); + Pipeline.LogMethodExit(nameof(DataLakePathClient)); } } } @@ -721,7 +791,7 @@ private async Task DeleteInternal( /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response Rename( + public virtual Response Rename( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, @@ -763,7 +833,7 @@ public virtual Response Rename( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> RenameAsync( + public virtual async Task> RenameAsync( string destinationPath, DataLakeRequestConditions sourceConditions = default, DataLakeRequestConditions destinationConditions = default, @@ -807,17 +877,17 @@ await RenameInternal( /// A will be thrown if /// a failure occurs. /// - private async Task> RenameInternal( + private async Task> RenameInternal( string destinationPath, DataLakeRequestConditions sourceConditions, DataLakeRequestConditions destinationConditions, bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(PathClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakePathClient))) { Pipeline.LogMethodEnter( - nameof(PathClient), + nameof(DataLakePathClient), message: $"{nameof(Uri)}: {Uri}\n" + $"{nameof(destinationPath)}: {destinationPath}\n" + @@ -829,7 +899,7 @@ private async Task> RenameInternal( string renameSource = "/" + uriBuilder.FileSystemName + "/" + uriBuilder.DirectoryOrFilePath; uriBuilder.DirectoryOrFilePath = destinationPath; - PathClient destPathClient = new PathClient(uriBuilder.ToUri(), Pipeline); + DataLakePathClient destPathClient = new DataLakePathClient(uriBuilder.ToUri(), Pipeline); Response response = await DataLakeRestClient.Path.CreateAsync( clientDiagnostics: _clientDiagnostics, @@ -862,7 +932,7 @@ private async Task> RenameInternal( } finally { - Pipeline.LogMethodExit(nameof(PathClient)); + Pipeline.LogMethodExit(nameof(DataLakePathClient)); } } } @@ -992,10 +1062,10 @@ private async Task> GetAccessControlInternal( bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(PathClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakePathClient))) { Pipeline.LogMethodEnter( - nameof(PathClient), + nameof(DataLakePathClient), message: $"{nameof(Uri)}: {Uri}\n"); try @@ -1032,7 +1102,7 @@ private async Task> GetAccessControlInternal( } finally { - Pipeline.LogMethodExit(nameof(PathClient)); + Pipeline.LogMethodExit(nameof(DataLakePathClient)); } } } @@ -1147,10 +1217,10 @@ private async Task> SetAccessControlInternal( bool async, CancellationToken cancellationToken) { - using (Pipeline.BeginLoggingScope(nameof(PathClient))) + using (Pipeline.BeginLoggingScope(nameof(DataLakePathClient))) { Pipeline.LogMethodEnter( - nameof(PathClient), + nameof(DataLakePathClient), message: $"{nameof(Uri)}: {Uri}\n" + $"{nameof(accessControl)}: {accessControl}\n" + @@ -1190,7 +1260,7 @@ await DataLakeRestClient.Path.SetAccessControlAsync( } finally { - Pipeline.LogMethodExit(nameof(PathClient)); + Pipeline.LogMethodExit(nameof(DataLakePathClient)); } } } @@ -1227,7 +1297,7 @@ public virtual Response GetProperties( CancellationToken cancellationToken = default) { Response response = _blockBlobClient.GetProperties( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken); return Response.FromValue( @@ -1265,7 +1335,7 @@ public virtual async Task> GetPropertiesAsync( CancellationToken cancellationToken = default) { Response response = await _blockBlobClient.GetPropertiesAsync( - conditions, + conditions.ToBlobRequestConditions(), cancellationToken) .ConfigureAwait(false); @@ -1303,13 +1373,13 @@ public virtual async Task> GetPropertiesAsync( /// [ForwardsClientCalls] public virtual Response SetHttpHeaders( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { Response response = _blockBlobClient.SetHttpHeaders( - httpHeaders?.ToBlobHttpHeaders(), - conditions, + httpHeaders.ToBlobHttpHeaders(), + conditions.ToBlobRequestConditions(), cancellationToken); return Response.FromValue( @@ -1348,13 +1418,13 @@ public virtual Response SetHttpHeaders( /// [ForwardsClientCalls] public virtual async Task> SetHttpHeadersAsync( - PathHttpHeaders? httpHeaders = default, + PathHttpHeaders httpHeaders = default, DataLakeRequestConditions conditions = default, CancellationToken cancellationToken = default) { Response response = await _blockBlobClient.SetHttpHeadersAsync( - httpHeaders?.ToBlobHttpHeaders(), - conditions, + httpHeaders.ToBlobHttpHeaders(), + conditions.ToBlobRequestConditions(), cancellationToken) .ConfigureAwait(false); @@ -1402,7 +1472,7 @@ public virtual Response SetMetadata( { Response response = _blockBlobClient.SetMetadata( metadata, - conditions); + conditions.ToBlobRequestConditions()); return Response.FromValue( new PathInfo() @@ -1446,7 +1516,7 @@ public virtual async Task> SetMetadataAsync( { Response response = await _blockBlobClient.SetMetadataAsync( metadata, - conditions) + conditions.ToBlobRequestConditions()) .ConfigureAwait(false); return Response.FromValue( diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeServiceClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeServiceClient.cs index 80a043919fbf..055030ccb0ee 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeServiceClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeServiceClient.cs @@ -94,6 +94,18 @@ protected DataLakeServiceClient() { } + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the Data Lake service. + /// + public DataLakeServiceClient(Uri serviceUri) + : this(serviceUri, (HttpPipelinePolicy)null, null) + { + } + /// /// Initializes a new instance of the /// class. @@ -106,11 +118,26 @@ protected DataLakeServiceClient() /// policies for authentication, retries, etc., that are applied to /// every request. /// - public DataLakeServiceClient(Uri serviceUri, DataLakeClientOptions options = default) + public DataLakeServiceClient(Uri serviceUri, DataLakeClientOptions options) : this(serviceUri, (HttpPipelinePolicy)null, options) { } + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the Data Lake service. + /// + /// + /// The shared key credential used to sign requests. + /// + public DataLakeServiceClient(Uri serviceUri, StorageSharedKeyCredential credential) + : this(serviceUri, credential.AsPolicy(), null) + { + } + /// /// Initializes a new instance of the /// class. @@ -126,11 +153,26 @@ public DataLakeServiceClient(Uri serviceUri, DataLakeClientOptions options = def /// policies for authentication, retries, etc., that are applied to /// every request. /// - public DataLakeServiceClient(Uri serviceUri, StorageSharedKeyCredential credential, DataLakeClientOptions options = default) + public DataLakeServiceClient(Uri serviceUri, StorageSharedKeyCredential credential, DataLakeClientOptions options) : this(serviceUri, credential.AsPolicy(), options) { } + /// + /// Initializes a new instance of the + /// class. + /// + /// + /// A referencing the Data Lake service. + /// + /// + /// The token credential used to sign requests. + /// + public DataLakeServiceClient(Uri serviceUri, TokenCredential credential) + : this(serviceUri, credential.AsPolicy(), null) + { + } + /// /// Initializes a new instance of the /// class. @@ -146,8 +188,8 @@ public DataLakeServiceClient(Uri serviceUri, StorageSharedKeyCredential credenti /// policies for authentication, retries, etc., that are applied to /// every request. /// - public DataLakeServiceClient(Uri serviceUri, TokenCredential credential, DataLakeClientOptions options = default) - : this(serviceUri, credential.AsPolicy(), options ?? new DataLakeClientOptions()) + public DataLakeServiceClient(Uri serviceUri, TokenCredential credential, DataLakeClientOptions options) + : this(serviceUri, credential.AsPolicy(), options) { } @@ -167,7 +209,7 @@ public DataLakeServiceClient(Uri serviceUri, TokenCredential credential, DataLak /// every request. /// internal DataLakeServiceClient(Uri serviceUri, HttpPipelinePolicy authentication, DataLakeClientOptions options) - : this(serviceUri, authentication, options, new ClientDiagnostics(options)) + : this(serviceUri, authentication, options, null) { } @@ -188,14 +230,18 @@ internal DataLakeServiceClient(Uri serviceUri, HttpPipelinePolicy authentication /// every request. /// /// - internal DataLakeServiceClient(Uri serviceUri, HttpPipelinePolicy authentication, DataLakeClientOptions options, ClientDiagnostics clientDiagnostics) + internal DataLakeServiceClient( + Uri serviceUri, + HttpPipelinePolicy authentication, + DataLakeClientOptions options, + ClientDiagnostics clientDiagnostics) { - - _pipeline = (options ?? new DataLakeClientOptions()).Build(authentication); + options ??= new DataLakeClientOptions(); + _pipeline = options.Build(authentication); _uri = serviceUri; _blobUri = GetBlobUri(serviceUri); _blobServiceClient = new BlobServiceClient(_blobUri, authentication, options); - _clientDiagnostics = clientDiagnostics; + _clientDiagnostics = clientDiagnostics ?? new ClientDiagnostics(options); } #endregion ctors @@ -221,19 +267,19 @@ private static Uri GetBlobUri(Uri uri) } /// - /// Create a new object by appending + /// Create a new object by appending /// to the end of . - /// The new uses the same request - /// policy pipeline as the . + /// The new uses the same request + /// policy pipeline as the . /// /// /// The name of the share to reference. /// /// - /// A for the desired share. + /// A for the desired share. /// - public virtual FileSystemClient GetFileSystemClient(string fileSystemName) - => new FileSystemClient(Uri.AppendToPath(fileSystemName), Pipeline, ClientDiagnostics); + public virtual DataLakeFileSystemClient GetFileSystemClient(string fileSystemName) + => new DataLakeFileSystemClient(Uri.AppendToPath(fileSystemName), Pipeline, ClientDiagnostics); #region Get User Delegation Key /// @@ -429,13 +475,13 @@ public virtual AsyncPageable GetFileSystemsAsync( /// a failure occurs. /// [ForwardsClientCalls] - public virtual Response CreateFileSystem( + public virtual Response CreateFileSystem( string fileSystemName, PublicAccessType publicAccessType = PublicAccessType.None, Metadata metadata = default, CancellationToken cancellationToken = default) { - FileSystemClient fileSystem = GetFileSystemClient(fileSystemName); + DataLakeFileSystemClient fileSystem = GetFileSystemClient(fileSystemName); Response response = fileSystem.Create(publicAccessType, metadata, cancellationToken); return Response.FromValue(fileSystem, response.GetRawResponse()); } @@ -479,13 +525,13 @@ public virtual Response CreateFileSystem( /// a failure occurs. /// [ForwardsClientCalls] - public virtual async Task> CreateFileSystemAsync( + public virtual async Task> CreateFileSystemAsync( string fileSystemName, PublicAccessType publicAccessType = PublicAccessType.None, Metadata metadata = default, CancellationToken cancellationToken = default) { - FileSystemClient fileSystem = GetFileSystemClient(fileSystemName); + DataLakeFileSystemClient fileSystem = GetFileSystemClient(fileSystemName); Response response = await fileSystem.CreateAsync(publicAccessType, metadata, cancellationToken).ConfigureAwait(false); return Response.FromValue(fileSystem, response.GetRawResponse()); } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/CustomerProvidedKey.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/CustomerProvidedKey.cs deleted file mode 100644 index 109139409d88..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/CustomerProvidedKey.cs +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Security.Cryptography; - -namespace Azure.Storage.Files.DataLake.Models -{ - /// - /// Wrapper for an encryption key to be used with client provided key server-side encryption. - /// - public readonly struct CustomerProvidedKey : IEquatable - { - /// - /// Base64 encoded string of the AES256 encryption key. - /// - public readonly string EncryptionKey { get; } - - /// - /// Base64 encoded string of the AES256 encryption key's SHA256 hash. - /// - public readonly string EncryptionKeyHash { get; } - - /// - /// The algorithm for Azure Blob Storage to encrypt with. - /// Azure Blob Storage only offers AES256 encryption. - /// - public readonly EncryptionAlgorithmType EncryptionAlgorithm { get; } - - /// - /// Creates a new CustomerProvidedKey for use in server-side encryption. - /// - /// The encryption key encoded as a base64 string. - public CustomerProvidedKey(string key) - { - EncryptionKey = key; - EncryptionAlgorithm = EncryptionAlgorithmType.AES256; - using var sha256 = SHA256.Create(); - var encodedHash = sha256.ComputeHash(Convert.FromBase64String(key)); - EncryptionKeyHash = Convert.ToBase64String(encodedHash); - } - - /// - /// Creates a new CustomerProvidedKey for use in server-side encryption. - /// - /// The encryption key bytes. - public CustomerProvidedKey(byte[] key) : this(Convert.ToBase64String(key)) { } - - /// - /// Checks if two CustomerProvidedKeyInfo are equal to each other. - /// - /// The other instance to compare to. - public override bool Equals(object obj) - => obj is CustomerProvidedKey other && Equals(other); - - /// - /// Get a hash code for the CustomerProvidedKeyInfo. - /// - /// Hash code for the CustomerProvidedKeyInfo. - public override int GetHashCode() - => EncryptionKey.GetHashCode() - ^ EncryptionKeyHash.GetHashCode() - ^ EncryptionAlgorithm.GetHashCode() - ; - - /// - /// Check if two CustomerProvidedKeyInfo instances are equal. - /// - /// The first instance to compare. - /// The second instance to compare. - /// True if they're equal, false otherwise. - public static bool operator ==(CustomerProvidedKey left, CustomerProvidedKey right) => left.Equals(right); - - /// - /// Check if two CustomerProvidedKeyInfo instances are not equal. - /// - /// The first instance to compare. - /// The second instance to compare. - /// True if they're not equal, false otherwise. - public static bool operator !=(CustomerProvidedKey left, CustomerProvidedKey right) => !(left == right); - - /// - /// Checks if two CustomerProvidedKeyInfo are equal to each other. - /// - /// The other instance to compare to. - /// - public bool Equals(CustomerProvidedKey other) - => EncryptionKey == other.EncryptionKey - && EncryptionKeyHash == other.EncryptionKeyHash - && EncryptionAlgorithm == other.EncryptionAlgorithm - ; - - /// - /// ToString - /// - /// string - public override string ToString() - => $"[{nameof(CustomerProvidedKey)}:{nameof(EncryptionKey)}={EncryptionKey};{nameof(EncryptionKeyHash)}={EncryptionKeyHash};{nameof(EncryptionAlgorithm)}={EncryptionAlgorithm}]"; - - internal Blobs.Models.CustomerProvidedKey ToBlobCustomerProvidedKey() => - new Blobs.Models.CustomerProvidedKey(EncryptionKey); - } -} diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeModelFactory.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeModelFactory.cs index cfb62d9c8768..c6adc450f5cf 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeModelFactory.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeModelFactory.cs @@ -326,20 +326,6 @@ public static PathProperties PathProperties( }; #endregion PathProperties - #region PathSegment - /// - /// Creates a new PathSegment instance for mocking. - /// - public static PathSegment PathSegment( - string continuation, - IEnumerable paths) - => new PathSegment() - { - Continuation = continuation, - Paths = paths - }; - #endregion PathSegment - #region UserDelegationKey /// /// Creates a new UserDelegationKey instance for mocking. diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeRequestConditions.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeRequestConditions.cs index 88a0fa8cd5e8..4eac1c5a1638 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeRequestConditions.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/DataLakeRequestConditions.cs @@ -1,12 +1,75 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Azure.Storage.Blobs.Models; +using System.Text; namespace Azure.Storage.Files.DataLake.Models { /// /// Specifies file system specific access conditions. /// - public class DataLakeRequestConditions : BlobRequestConditions { } + public class DataLakeRequestConditions : RequestConditions + { + /// + /// Optionally limit requests to resources with an active lease + /// matching this Id. + /// + public string LeaseId { get; set; } + + /// + /// Converts the value of the current RequestConditions object to + /// its equivalent string representation. + /// + /// + /// A string representation of the RequestConditions. + /// + public override string ToString() + { + StringBuilder conditions = new StringBuilder(); + conditions.Append('[').Append(GetType().Name); + AddConditions(conditions); + if (conditions[conditions.Length - 1] == ';') + { + conditions[conditions.Length - 1] = ']'; + } + else + { + conditions.Append(']'); + } + return conditions.ToString(); + } + + /// + /// Collect any request conditions. Conditions should be separated by + /// a semicolon. + /// + /// The collected conditions. + internal virtual void AddConditions(StringBuilder conditions) + { + if (IfMatch != null) + { + conditions.Append(nameof(IfMatch)).Append('=').Append(IfMatch).Append(';'); + } + + if (IfNoneMatch != null) + { + conditions.Append(nameof(IfNoneMatch)).Append('=').Append(IfNoneMatch).Append(';'); + } + + if (IfModifiedSince != null) + { + conditions.Append(nameof(IfModifiedSince)).Append('=').Append(IfModifiedSince).Append(';'); + } + + if (IfUnmodifiedSince != null) + { + conditions.Append(nameof(IfUnmodifiedSince)).Append('=').Append(IfUnmodifiedSince).Append(';'); + } + + if (LeaseId != null) + { + conditions.Append(nameof(LeaseId)).Append('=').Append(LeaseId).Append(';'); + } + } + } } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/EncryptionAlgorithmType.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/EncryptionAlgorithmType.cs deleted file mode 100644 index 2ba446b6b0a4..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/EncryptionAlgorithmType.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -namespace Azure.Storage.Files.DataLake.Models -{ - /// - /// The algorithm used to produce the encryption key hash. Currently, the only accepted value is "AES256". - /// Must be provided if the x-ms-encryption-key header is provided. - /// - public enum EncryptionAlgorithmType - { - /// - /// AES256 - /// - AES256 - } -} diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/FileSystemInfo.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/FileSystemInfo.cs index 6054bf4c364e..4a8545098b8a 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/FileSystemInfo.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/FileSystemInfo.cs @@ -1,15 +1,25 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Azure.Storage.Blobs.Models; +using System; namespace Azure.Storage.Files.DataLake.Models { /// /// FileSystemInfo /// - public class FileSystemInfo : BlobContainerInfo + public class FileSystemInfo { + /// + /// The ETag contains a value that you can use to perform operations conditionally. If the request version is 2011-08-18 or newer, the ETag value will be in quotes. + /// + public ETag ETag { get; internal set; } + + /// + /// Returns the date and time the container was last modified. Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob. + /// + public DateTimeOffset LastModified { get; internal set; } + /// /// Prevent direct instantiation of FileSystemInfo instances. /// You can use DataLakeModelFactory.FileSystemInfo instead. diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsAsyncCollection.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsAsyncCollection.cs index 390dff2cc4c6..197213863e26 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsAsyncCollection.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsAsyncCollection.cs @@ -9,15 +9,21 @@ namespace Azure.Storage.Files.DataLake.Models { internal class GetPathsAsyncCollection : StorageCollectionEnumerator { - private readonly FileSystemClient _client; - private readonly GetPathsOptions? _options; + private readonly DataLakeFileSystemClient _client; + private readonly string _path; + private readonly bool _recursive; + private readonly bool _upn; public GetPathsAsyncCollection( - FileSystemClient client, - GetPathsOptions? options) + DataLakeFileSystemClient client, + string path, + bool recursive, + bool upn) { _client = client; - _options = options; + _path = path; + _recursive = recursive; + _upn = upn; } public override async ValueTask> GetNextPageAsync( @@ -27,7 +33,9 @@ public override async ValueTask> GetNextPageAsync( CancellationToken cancellationToken) { Task> task = _client.ListPathsInternal( - _options, + _path, + _recursive, + _upn, continuationToken, pageSizeHint, isAsync, diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsOptions.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsOptions.cs deleted file mode 100644 index 3cc1a12f8dda..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/GetPathsOptions.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Text; - -namespace Azure.Storage.Files.DataLake.Models -{ - /// - /// Specifies options for paths blobs - /// - public struct GetPathsOptions : IEquatable - { - /// - /// Filters results to paths within the specified directory. - /// - public string Path { get; set; } - - /// - /// Optional. Valid only when Hierarchical Namespace is enabled for the account. If - /// "true", the user identity values returned in the owner and group fields of each list - /// entry will be transformed from Azure Active Directory Object IDs to User Principal - /// Names. If "false", the values will be returned as Azure Active Directory Object IDs. - /// The default value is false. Note that group and application Object IDs are not translated - /// because they do not have unique friendly names. - /// - public bool Upn { get; set; } - - /// - /// If "true", all paths are listed; otherwise, only paths at the root of the filesystem are listed. - /// If "directory" is specified, the list will only include paths that share the same root. - /// - public bool Recursive { get; set; } - - /// - /// Check if two GetBlobsOptions instances are equal. - /// - /// The instance to compare to. - /// True if they're equal, false otherwise. - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => - obj is GetPathsOptions other && Equals(other); - - /// - /// Get a hash code for the GetBlobsOptions. - /// - /// Hash code for the GetBlobsOptions. - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => - ((Upn ? 0b00001 : 0) ^ - (Path?.GetHashCode() ?? 0)); - - /// - /// Check if two GetBlobsOptions instances are equal. - /// - /// The first instance to compare. - /// The second instance to compare. - /// True if they're equal, false otherwise. - public static bool operator ==(GetPathsOptions left, GetPathsOptions right) => - left.Equals(right); - - /// - /// Check if two GetBlobsOptions instances are not equal. - /// - /// The first instance to compare. - /// The second instance to compare. - /// True if they're not equal, false otherwise. - public static bool operator !=(GetPathsOptions left, GetPathsOptions right) => - !(left == right); - - /// - /// Check if two GetBlobsOptions instances are equal. - /// - /// The instance to compare to. - /// True if they're equal, false otherwise. - public bool Equals(GetPathsOptions other) => - Path == other.Path && - Upn == other.Upn; - } -} diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathHttpHeaders.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathHttpHeaders.cs index de60dd1f9750..8dcd665f8823 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathHttpHeaders.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathHttpHeaders.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Text; +using System.ComponentModel; namespace Azure.Storage.Files.DataLake.Models { @@ -15,7 +13,7 @@ namespace Azure.Storage.Files.DataLake.Models /// /// For more information, see . /// - public struct PathHttpHeaders : IEquatable + public class PathHttpHeaders { /// /// The MIME content type of the path. @@ -61,53 +59,25 @@ public struct PathHttpHeaders : IEquatable public string CacheControl { get; set; } /// - /// Check if two PathHttpHeaders instances are equal. + /// Creates a string representation of a + /// . /// - /// The instance to compare to. - /// True if they're equal, false otherwise. - public override bool Equals(object obj) - => obj is PathHttpHeaders other && Equals(other); - - /// - /// Get a hash code for the PathHttpHeaders. - /// - /// Hash code for the PathHttpHeaders. - public override int GetHashCode() - => CacheControl.GetHashCode() - ^ ContentDisposition.GetHashCode() - ^ ContentEncoding.GetHashCode() - ^ ContentLanguage.GetHashCode() - ^ ContentHash.GetHashCode() - ^ ContentType.GetHashCode() - ; + [EditorBrowsable(EditorBrowsableState.Never)] + public override string ToString() => base.ToString(); /// - /// Check if two PathHttpHeaders instances are equal. + /// Check if two instances are equal. /// - /// The first instance to compare. - /// The second instance to compare. + /// The instance to compare to. /// True if they're equal, false otherwise. - public static bool operator ==(PathHttpHeaders left, PathHttpHeaders right) => left.Equals(right); - - /// - /// Check if two PathHttpHeaders instances are not equal. - /// - /// The first instance to compare. - /// The second instance to compare. - /// True if they're not equal, false otherwise. - public static bool operator !=(PathHttpHeaders left, PathHttpHeaders right) => !(left == right); + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => base.Equals(obj); /// - /// Check if two PathHttpHeaders instances are equal. + /// Get a hash code for the . /// - /// The instance to compare to. - public bool Equals(PathHttpHeaders other) - => CacheControl == other.CacheControl - && ContentDisposition == other.ContentDisposition - && ContentEncoding == other.ContentEncoding - && ContentLanguage == other.ContentLanguage - && ContentHash == other.ContentHash - && ContentType == other.ContentType - ; + /// Hash code for the . + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => base.GetHashCode(); } } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathSegment.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathSegment.cs index 347ead7f622a..9afcbeea5f9f 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathSegment.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Models/PathSegment.cs @@ -8,7 +8,7 @@ namespace Azure.Storage.Files.DataLake.Models /// /// An enumeration of paths. /// - public class PathSegment + internal class PathSegment { /// /// If the number of paths to be listed exceeds the maxResults limit, a continuation token is returned. diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs index ad40c773bab0..4edd98ce1d04 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs @@ -85,7 +85,7 @@ public DataLakeServiceClient GetServiceClient_OAuth() public IDisposable GetNewFileSystem( - out FileSystemClient fileSystem, + out DataLakeFileSystemClient fileSystem, DataLakeServiceClient service = default, string fileSystemName = default, IDictionary metadata = default, @@ -107,18 +107,18 @@ public IDisposable GetNewFileSystem( publicAccessType); } - public IDisposable GetNewDirectory(out DirectoryClient directory, DataLakeServiceClient service = default, string fileSystemName = default, string directoryName = default) + public IDisposable GetNewDirectory(out DataLakeDirectoryClient directory, DataLakeServiceClient service = default, string fileSystemName = default, string directoryName = default) { - IDisposable disposingFileSystem = GetNewFileSystem(out FileSystemClient fileSystem, service, fileSystemName); + IDisposable disposingFileSystem = GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service, fileSystemName); directory = InstrumentClient(fileSystem.GetDirectoryClient(directoryName ?? GetNewDirectoryName())); _ = directory.CreateAsync().Result; return disposingFileSystem; } - public IDisposable GetNewFile(out FileClient file, DataLakeServiceClient service = default, string fileSystemName = default, string directoryName = default, string fileName = default) + public IDisposable GetNewFile(out DataLakeFileClient file, DataLakeServiceClient service = default, string fileSystemName = default, string directoryName = default, string fileName = default) { - IDisposable disposingFileSystem = GetNewFileSystem(out FileSystemClient fileSystem, service, fileSystemName); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(directoryName ?? GetNewDirectoryName())); + IDisposable disposingFileSystem = GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service, fileSystemName); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(directoryName ?? GetNewDirectoryName())); _ = directory.CreateAsync().Result; file = InstrumentClient(directory.GetFileClient(fileName ?? GetNewFileName())); @@ -303,7 +303,7 @@ public DataLakeSasQueryParameters GetNewDataLakeServiceIdentitySasCredentialsPat } //TODO consider removing this. - public async Task SetupPathMatchCondition(PathClient path, string match) + public async Task SetupPathMatchCondition(DataLakePathClient path, string match) { if (match == ReceivedETag) { @@ -317,7 +317,7 @@ public async Task SetupPathMatchCondition(PathClient path, string match) } //TODO consider removing this. - public async Task SetupPathLeaseCondition(PathClient path, string leaseId, string garbageLeaseId) + public async Task SetupPathLeaseCondition(DataLakePathClient path, string leaseId, string garbageLeaseId) { Models.DataLakeLease lease = null; if (leaseId == ReceivedLeaseId || leaseId == garbageLeaseId) @@ -328,7 +328,7 @@ public async Task SetupPathLeaseCondition(PathClient path, string leaseI } //TODO consider removing this. - public async Task SetupFileSystemLeaseCondition(FileSystemClient fileSystem, string leaseId, string garbageLeaseId) + public async Task SetupFileSystemLeaseCondition(DataLakeFileSystemClient fileSystem, string leaseId, string garbageLeaseId) { Models.DataLakeLease lease = null; if (leaseId == ReceivedLeaseId || leaseId == garbageLeaseId) @@ -340,9 +340,9 @@ public async Task SetupFileSystemLeaseCondition(FileSystemClient fileSys private class DisposingFileSystem : IDisposable { - public FileSystemClient FileSystemClient { get; } + public DataLakeFileSystemClient FileSystemClient { get; } - public DisposingFileSystem(FileSystemClient fileSystem, IDictionary metadata, Models.PublicAccessType publicAccessType = default) + public DisposingFileSystem(DataLakeFileSystemClient fileSystem, IDictionary metadata, Models.PublicAccessType publicAccessType = default) { fileSystem.CreateAsync(metadata: metadata, publicAccessType: publicAccessType).Wait(); diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs index 75d4e80b989c..a6e33879861b 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs @@ -25,11 +25,11 @@ public DirectoryClientTests(bool async) [Test] public async Task CreateAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var name = GetNewDirectoryName(); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(name)); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(name)); // Act Response response = await directory.CreateAsync(); @@ -49,8 +49,8 @@ public async Task CreateAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -61,10 +61,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateAsync_HttpHeaders() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); PathHttpHeaders headers = new PathHttpHeaders { ContentType = ContentType, @@ -92,11 +92,11 @@ public async Task CreateAsync_HttpHeaders() [Test] public async Task CreateAsync_Metadata() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange IDictionary metadata = BuildMetadata(); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await directory.CreateAsync(metadata: metadata); @@ -110,10 +110,10 @@ public async Task CreateAsync_Metadata() [Test] public async Task CreateAsync_PermissionAndUmask() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); string permissions = "0777"; string umask = "0057"; @@ -134,11 +134,11 @@ public async Task CreateAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange // This directory is intentionally created twice - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(directory, parameters.LeaseId, garbageLeaseId); @@ -163,11 +163,11 @@ public async Task CreateAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange // This directory is intentionally created twice - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( parameters: parameters, @@ -184,11 +184,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task DeleteAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var name = GetNewDirectoryName(); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(name)); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(name)); await directory.CreateAsync(); // Act @@ -202,10 +202,10 @@ public async Task DeleteAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(directory, parameters.LeaseId, garbageLeaseId); @@ -225,10 +225,10 @@ public async Task DeleteAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -246,14 +246,14 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenameAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); string destDirectoryName = GetNewDirectoryName(); // Act - DirectoryClient destDirectory = await sourceDirectory.RenameAsync(destinationPath: destDirectoryName); + DataLakeDirectoryClient destDirectory = await sourceDirectory.RenameAsync(destinationPath: destDirectoryName); // Assert Response response = await destDirectory.GetPropertiesAsync(); @@ -263,11 +263,11 @@ public async Task RenameAsync() [Test] public async Task RenameAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var sourceDirectoryName = GetNewDirectoryName(); - DirectoryClient sourceDirectory = InstrumentClient(fileSystem.GetDirectoryClient(sourceDirectoryName)); + DataLakeDirectoryClient sourceDirectory = InstrumentClient(fileSystem.GetDirectoryClient(sourceDirectoryName)); string destPath = GetNewDirectoryName(); // Act @@ -283,11 +283,11 @@ public async Task RenameAsync_DestinationConditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); - DirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(destDirectory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(destDirectory, parameters.LeaseId, garbageLeaseId); @@ -313,11 +313,11 @@ public async Task RenameAsync_DestinationConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); - DirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(destDirectory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -340,11 +340,11 @@ public async Task RenameAsync_SourceConditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); - DirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(sourceDirectory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(sourceDirectory, parameters.LeaseId, garbageLeaseId); @@ -370,11 +370,11 @@ public async Task RenameAsync_SourceConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); - DirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient sourceDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient destDirectory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(sourceDirectory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -394,7 +394,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetAccessControlAsync() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Act PathAccessControl accessControl = await directoryClient.GetAccessControlAsync(); @@ -413,11 +413,11 @@ public async Task GetAccessControlAsync_Oauth() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient oauthDirectory = oauthService + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient oauthDirectory = oauthService .GetFileSystemClient(fileSystemName) .GetDirectoryClient(directoryName); @@ -438,12 +438,12 @@ public async Task GetAccessControlAsync_FileSystemSAS() { string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient sasDirectory = InstrumentClient( + DataLakeDirectoryClient sasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceSas_FileSystem( fileSystemName: fileSystemName) .GetFileSystemClient(fileSystemName) @@ -466,16 +466,16 @@ public async Task GetAccessControlAsync_FileSystemIdentitySAS() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - DirectoryClient identitySasDirectory = InstrumentClient( + DataLakeDirectoryClient identitySasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_FileSystem( fileSystemName: fileSystemName, userDelegationKey: userDelegationKey) @@ -498,12 +498,12 @@ public async Task GetAccessControlAsync_PathSAS() { var fileSystemName = GetNewFileSystemName(); var directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient sasDirectory = InstrumentClient( + DataLakeDirectoryClient sasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceSas_Path( fileSystemName: fileSystemName, path: directoryName) @@ -527,16 +527,16 @@ public async Task GetAccessControlAsync_PathIdentitySAS() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - DirectoryClient identitySasDirectory = InstrumentClient( + DataLakeDirectoryClient identitySasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_Path( fileSystemName: fileSystemName, path: directoryName, @@ -558,10 +558,10 @@ public async Task GetAccessControlAsync_PathIdentitySAS() [Test] public async Task GetAccessControlAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystemClient)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystemClient)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystemClient.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystemClient.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -576,10 +576,10 @@ public async Task GetAccessControlAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(directory, parameters.LeaseId, garbageLeaseId); @@ -600,10 +600,10 @@ public async Task GetAccessControlAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -619,7 +619,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task SetAccessControlAsync() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange PathAccessControl accessControl = new PathAccessControl() @@ -638,7 +638,7 @@ public async Task SetAccessControlAsync() [Test] public async Task SetAccessControlAsync_Error() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange PathAccessControl accessControl = new PathAccessControl() @@ -663,10 +663,10 @@ public async Task SetAccessControlAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(directory, parameters.LeaseId, garbageLeaseId); @@ -694,10 +694,10 @@ public async Task SetAccessControlAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -718,7 +718,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetPropertiesAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Act Response response = await directory.GetPropertiesAsync(); @@ -734,11 +734,11 @@ public async Task GetPropertiesAsync_Oauth() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient oauthDirectory = oauthService + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient oauthDirectory = oauthService .GetFileSystemClient(fileSystemName) .GetDirectoryClient(directoryName); @@ -755,12 +755,12 @@ public async Task GetPropertiesAsync_FileSystemSAS() { string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient sasDirectory = InstrumentClient( + DataLakeDirectoryClient sasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceSas_FileSystem( fileSystemName: fileSystemName) .GetFileSystemClient(fileSystemName) @@ -784,16 +784,16 @@ public async Task GetPropertiesAsync_FileSystemIdentitySAS() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - DirectoryClient identitySasDirectory = InstrumentClient( + DataLakeDirectoryClient identitySasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_FileSystem( fileSystemName: fileSystemName, userDelegationKey: userDelegationKey) @@ -813,12 +813,12 @@ public async Task GetPropertiesAsync_PathSAS() { var fileSystemName = GetNewFileSystemName(); var directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); - DirectoryClient sasDirectory = InstrumentClient( + DataLakeDirectoryClient sasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceSas_Path( fileSystemName: fileSystemName, path: directoryName) @@ -839,16 +839,16 @@ public async Task GetPropertiesAsync_PathIdentitySAS() DataLakeServiceClient oauthService = GetServiceClient_OAuth(); string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); - using (GetNewFileSystem(out FileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, fileSystemName: fileSystemName, service: oauthService)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(directoryName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - DirectoryClient identitySasDirectory = InstrumentClient( + DataLakeDirectoryClient identitySasDirectory = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_Path( fileSystemName: fileSystemName, path: directoryName, @@ -870,7 +870,7 @@ public async Task GetPropertiesAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); @@ -894,7 +894,7 @@ public async Task GetPropertiesAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); @@ -914,10 +914,10 @@ public async Task GetPropertiesAsync_ConditionsFail() [Test] public async Task GetPropertiesAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -930,7 +930,7 @@ await TestHelper.AssertExpectedExceptionAsync( public async Task SetHttpHeadersAsync() { var constants = new TestConstants(this); - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Act await directory.SetHttpHeadersAsync(new PathHttpHeaders @@ -960,10 +960,10 @@ await directory.SetHttpHeadersAsync(new PathHttpHeaders public async Task SetHttpHeadersAsync_Error() { var constants = new TestConstants(this); - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -987,10 +987,10 @@ public async Task SetHttpHeadersAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(directory, parameters.LeaseId, garbageLeaseId); @@ -1024,10 +1024,10 @@ public async Task SetHttpHeadersAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -1053,7 +1053,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task SetMetadataAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange IDictionary metadata = BuildMetadata(); @@ -1070,10 +1070,10 @@ public async Task SetMetadataAsync() [Test] public async Task SetMetadataAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); IDictionary metadata = BuildMetadata(); // Act @@ -1089,10 +1089,10 @@ public async Task SetMetadataAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); IDictionary metadata = BuildMetadata(); parameters.Match = await SetupPathMatchCondition(directory, parameters.Match); @@ -1118,10 +1118,10 @@ public async Task SetMetadataAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); IDictionary metadata = BuildMetadata(); parameters.NoneMatch = await SetupPathMatchCondition(directory, parameters.NoneMatch); @@ -1140,13 +1140,13 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateFileAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string fileName = GetNewFileName(); // Act - Response response = await directory.CreateFileAsync(fileName); + Response response = await directory.CreateFileAsync(fileName); // Assert Assert.AreEqual(fileName, response.Value.Name); @@ -1156,7 +1156,7 @@ public async Task CreateFileAsync() [Test] public async Task CreateFileAsync_HttpHeaders() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange PathHttpHeaders headers = new PathHttpHeaders @@ -1169,7 +1169,7 @@ public async Task CreateFileAsync_HttpHeaders() }; // Act - FileClient file = await directory.CreateFileAsync(GetNewFileName(), httpHeaders: headers); + DataLakeFileClient file = await directory.CreateFileAsync(GetNewFileName(), httpHeaders: headers); // Assert Response response = await file.GetPropertiesAsync(); @@ -1186,13 +1186,13 @@ public async Task CreateFileAsync_HttpHeaders() [Test] public async Task CreateFileAsync_Metadata() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange IDictionary metadata = BuildMetadata(); // Act - FileClient file = await directory.CreateFileAsync(GetNewFileName(), metadata: metadata); + DataLakeFileClient file = await directory.CreateFileAsync(GetNewFileName(), metadata: metadata); // Assert Response getPropertiesResponse = await file.GetPropertiesAsync(); @@ -1203,14 +1203,14 @@ public async Task CreateFileAsync_Metadata() [Test] public async Task CreateFileAsync_PermissionAndUmask() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string permissions = "0777"; string umask = "0057"; // Act - FileClient file = await directory.CreateFileAsync( + DataLakeFileClient file = await directory.CreateFileAsync( GetNewFileName(), permissions: permissions, umask: umask); @@ -1226,8 +1226,8 @@ public async Task CreateFileAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1238,11 +1238,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task DeleteFileAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string fileName = GetNewFileName(); - FileClient fileClient = directory.GetFileClient(fileName); + DataLakeFileClient fileClient = directory.GetFileClient(fileName); await fileClient.CreateAsync(); // Assert @@ -1255,8 +1255,8 @@ public async Task DeleteFileAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1267,13 +1267,13 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateSubDirectoryAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string directoryName = GetNewDirectoryName(); // Act - Response response = await directory.CreateSubDirectoryAsync(directoryName); + Response response = await directory.CreateSubDirectoryAsync(directoryName); // Assert Assert.AreEqual(directoryName, response.Value.Name); @@ -1285,8 +1285,8 @@ public async Task CreateSubDirectoryAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1297,7 +1297,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateSubDirectoryAsync_HttpHeaders() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange PathHttpHeaders headers = new PathHttpHeaders @@ -1310,7 +1310,7 @@ public async Task CreateSubDirectoryAsync_HttpHeaders() }; // Act - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( GetNewDirectoryName(), httpHeaders: headers); @@ -1329,13 +1329,13 @@ public async Task CreateSubDirectoryAsync_HttpHeaders() [Test] public async Task CreateSubDirectoryAsync_Metadata() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange IDictionary metadata = BuildMetadata(); // Act - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( GetNewDirectoryName(), metadata: metadata); @@ -1348,14 +1348,14 @@ public async Task CreateSubDirectoryAsync_Metadata() [Test] public async Task CreateSubDirectoryAsync_PermissionAndUmask() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string permissions = "0777"; string umask = "0057"; // Act - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync( GetNewDirectoryName(), permissions: permissions, umask: umask); @@ -1372,11 +1372,11 @@ public async Task CreateSubDirectoryAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange // This directory is intentionally created twice - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(subDirectory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(subDirectory, parameters.LeaseId, garbageLeaseId); @@ -1401,11 +1401,11 @@ public async Task CreateSubDirectoryAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange // This directory is intentionally created twice - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(subDirectory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( parameters: parameters, @@ -1422,11 +1422,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task DeleteSubDirectoryAsync() { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange string directoryName = GetNewDirectoryName(); - DirectoryClient directoryClient = directory.GetSubDirectoryClient(directoryName); + DataLakeDirectoryClient directoryClient = directory.GetSubDirectoryClient(directoryName); await directoryClient.CreateAsync(); // Assert @@ -1440,10 +1440,10 @@ public async Task DeleteSubDirectoryAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); parameters.Match = await SetupPathMatchCondition(subDirectory, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(subDirectory, parameters.LeaseId, garbageLeaseId); @@ -1463,10 +1463,10 @@ public async Task DeleteSubDirectoryAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewDirectory(out DirectoryClient directory)) + using (GetNewDirectory(out DataLakeDirectoryClient directory)) { // Arrange - DirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient subDirectory = await directory.CreateSubDirectoryAsync(GetNewDirectoryName()); parameters.NoneMatch = await SetupPathMatchCondition(subDirectory, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -1484,10 +1484,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AcquireLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1505,10 +1505,10 @@ public async Task AcquireLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1533,10 +1533,10 @@ public async Task AcquireLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1557,10 +1557,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AcquireLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1574,10 +1574,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenewLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1598,10 +1598,10 @@ public async Task RenewLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1627,10 +1627,10 @@ public async Task RenewLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1652,10 +1652,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenewLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); var leaseId = Recording.Random.NewGuid().ToString(); // Act @@ -1668,10 +1668,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReleaseLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1692,10 +1692,10 @@ public async Task ReleaseLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1721,10 +1721,10 @@ public async Task ReleaseLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1746,10 +1746,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReleaseLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); var leaseId = Recording.Random.NewGuid().ToString(); // Act @@ -1762,10 +1762,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ChangeLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -1787,10 +1787,10 @@ public async Task ChangeLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -1819,10 +1819,10 @@ public async Task ChangeLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -1847,10 +1847,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ChangeLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -1864,10 +1864,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task BreakLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1888,10 +1888,10 @@ public async Task BreakLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1917,10 +1917,10 @@ public async Task BreakLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1942,10 +1942,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task BreakLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(GetNewDirectoryName())); // Act await TestHelper.AssertExpectedExceptionAsync( diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs index 585d18ea5215..2244210bbd78 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs @@ -27,10 +27,10 @@ public FileClientTests(bool async) [Test] public async Task CreateAsync() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange - FileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); // Act Response response = await file.CreateAsync(); @@ -45,8 +45,8 @@ public async Task CreateAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -57,10 +57,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateAsync_HttpHeaders() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange - FileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); PathHttpHeaders headers = new PathHttpHeaders { ContentType = ContentType, @@ -88,11 +88,11 @@ public async Task CreateAsync_HttpHeaders() [Test] public async Task CreateAsync_Metadata() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange IDictionary metadata = BuildMetadata(); - FileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); // Act await file.CreateAsync(metadata: metadata); @@ -106,10 +106,10 @@ public async Task CreateAsync_Metadata() [Test] public async Task CreateAsync_PermissionAndUmask() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange - FileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(directoryClient.GetFileClient(GetNewFileName())); string permissions = "0777"; string umask = "0057"; @@ -130,11 +130,11 @@ public async Task CreateAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange // This directory is intentionally created twice - FileClient file = await directoryClient.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await directoryClient.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(file, parameters.LeaseId, garbageLeaseId); @@ -159,11 +159,11 @@ public async Task CreateAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange // This directory is intentionally created twice - FileClient file = await directoryClient.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await directoryClient.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( parameters: parameters, @@ -180,10 +180,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task DeleteAsync() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange - FileClient fileClient = await directoryClient.CreateFileAsync(GetNewFileName()); + DataLakeFileClient fileClient = await directoryClient.CreateFileAsync(GetNewFileName()); // Act await fileClient.DeleteAsync(); @@ -193,10 +193,10 @@ public async Task DeleteAsync() [Test] public async Task DeleteFileAsync_Error() { - using (GetNewDirectory(out DirectoryClient directoryClient)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient)) { // Arrange - FileClient fileClient = directoryClient.GetFileClient(GetNewFileName()); + DataLakeFileClient fileClient = directoryClient.GetFileClient(GetNewFileName()); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -211,10 +211,10 @@ public async Task DeleteAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(file, parameters.LeaseId, garbageLeaseId); @@ -234,10 +234,10 @@ public async Task DeleteAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -255,14 +255,14 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenameAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); string destFileName = GetNewDirectoryName(); // Act - FileClient destFile = await sourceFile.RenameAsync(destinationPath: destFileName); + DataLakeFileClient destFile = await sourceFile.RenameAsync(destinationPath: destFileName); // Assert Response response = await destFile.GetPropertiesAsync(); @@ -272,10 +272,10 @@ public async Task RenameAsync() [Test] public async Task RenameAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient sourceFile = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); string destPath = GetNewFileName(); // Act @@ -291,11 +291,11 @@ public async Task RenameAsync_DestinationConditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); - FileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(destFile, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(destFile, parameters.LeaseId, garbageLeaseId); @@ -321,11 +321,11 @@ public async Task RenameAsync_DestinationConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); - FileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(destFile, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -348,11 +348,11 @@ public async Task RenameAsync_SourceConditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); - FileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(sourceFile, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(sourceFile, parameters.LeaseId, garbageLeaseId); @@ -378,11 +378,11 @@ public async Task RenameAsync_SourceConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); - FileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient sourceFile = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient destFile = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(sourceFile, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions( @@ -402,7 +402,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetAccessControlAsync() { - using (GetNewFile(out FileClient fileClient)) + using (GetNewFile(out DataLakeFileClient fileClient)) { // Act PathAccessControl accessControl = await fileClient.GetAccessControlAsync(); @@ -422,11 +422,11 @@ public async Task GetAccessControlAsync_Oauth() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient oauthFile = oauthService + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient oauthFile = oauthService .GetFileSystemClient(fileSystemName) .GetDirectoryClient(directoryName) .GetFileClient(fileName); @@ -448,12 +448,12 @@ public async Task GetAccessControlAsync_FileSystemSAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient sasFile = InstrumentClient( + DataLakeFileClient sasFile = InstrumentClient( GetServiceClient_DataLakeServiceSas_FileSystem( fileSystemName: fileSystemName) .GetFileSystemClient(fileSystemName) @@ -478,16 +478,16 @@ public async Task GetAccessControlAsync_FileSystemIdentitySAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - FileClient identitySasFile = InstrumentClient( + DataLakeFileClient identitySasFile = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_FileSystem( fileSystemName: fileSystemName, userDelegationKey: userDelegationKey) @@ -512,12 +512,12 @@ public async Task GetAccessControlAsync_PathSAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient sasFile = InstrumentClient( + DataLakeFileClient sasFile = InstrumentClient( GetServiceClient_DataLakeServiceSas_Path( fileSystemName: fileSystemName, path: directoryName + "/" + fileName) @@ -543,16 +543,16 @@ public async Task GetAccessControlAsync_PathIdentitySAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - FileClient identitySasFile = InstrumentClient( + DataLakeFileClient identitySasFile = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_Path( fileSystemName: fileSystemName, path: directoryName + "/" + fileName, @@ -575,10 +575,10 @@ public async Task GetAccessControlAsync_PathIdentitySAS() [Test] public async Task GetAccessControlAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystemClient)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystemClient)) { // Arrange - FileClient file = InstrumentClient(fileSystemClient.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystemClient.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -593,10 +593,10 @@ public async Task GetAccessControlAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(file, parameters.LeaseId, garbageLeaseId); @@ -617,10 +617,10 @@ public async Task GetAccessControlAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -637,10 +637,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetAccessControlAsync_InvalidLease() { - using (GetNewFileSystem(out FileSystemClient fileSystemClient)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystemClient)) { // Arrange - FileClient file = await fileSystemClient.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystemClient.CreateFileAsync(GetNewFileName()); DataLakeRequestConditions conditions = new DataLakeRequestConditions() { LeaseId = GetGarbageLeaseId() @@ -656,7 +656,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task SetAccessControlAsync() { - using (GetNewFile(out FileClient fileClient)) + using (GetNewFile(out DataLakeFileClient fileClient)) { // Arrange PathAccessControl accessControl = new PathAccessControl() @@ -675,7 +675,7 @@ public async Task SetAccessControlAsync() [Test] public async Task SetAccessControlAsync_Error() { - using (GetNewFile(out FileClient fileClient)) + using (GetNewFile(out DataLakeFileClient fileClient)) { // Arrange PathAccessControl accessControl = new PathAccessControl() @@ -700,10 +700,10 @@ public async Task SetAccessControlAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(file, parameters.LeaseId, garbageLeaseId); @@ -731,10 +731,10 @@ public async Task SetAccessControlAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -755,7 +755,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetPropertiesAsync() { - using (GetNewFile(out FileClient file)) + using (GetNewFile(out DataLakeFileClient file)) { // Act Response response = await file.GetPropertiesAsync(); @@ -772,11 +772,11 @@ public async Task GetPropertiesAsync_Oauth() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient oauthFile = oauthService + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient oauthFile = oauthService .GetFileSystemClient(fileSystemName) .GetDirectoryClient(directoryName) .GetFileClient(fileName); @@ -795,12 +795,12 @@ public async Task GetPropertiesAsync_FileSystemSAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient sasFile = InstrumentClient( + DataLakeFileClient sasFile = InstrumentClient( GetServiceClient_DataLakeServiceSas_FileSystem( fileSystemName: fileSystemName) .GetFileSystemClient(fileSystemName) @@ -822,16 +822,16 @@ public async Task GetPropertiesAsync_FileSystemIdentitySAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - FileClient identitySasFile = InstrumentClient( + DataLakeFileClient identitySasFile = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_FileSystem( fileSystemName: fileSystemName, userDelegationKey: userDelegationKey) @@ -853,12 +853,12 @@ public async Task GetPropertiesAsync_PathSAS() var fileSystemName = GetNewFileSystemName(); var directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); - FileClient sasFile = InstrumentClient( + DataLakeFileClient sasFile = InstrumentClient( GetServiceClient_DataLakeServiceSas_Path( fileSystemName: fileSystemName, path: directoryName + "/" + fileName) @@ -881,16 +881,16 @@ public async Task GetPropertiesAsync_PathIdentitySAS() string fileSystemName = GetNewFileSystemName(); string directoryName = GetNewDirectoryName(); string fileName = GetNewFileName(); - using (GetNewDirectory(out DirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) + using (GetNewDirectory(out DataLakeDirectoryClient directoryClient, fileSystemName: fileSystemName, directoryName: directoryName)) { // Arrange - FileClient file = await directoryClient.CreateFileAsync(fileName); + DataLakeFileClient file = await directoryClient.CreateFileAsync(fileName); Response userDelegationKey = await oauthService.GetUserDelegationKeyAsync( start: null, expiry: Recording.UtcNow.AddHours(1)); - FileClient identitySasFile = InstrumentClient( + DataLakeFileClient identitySasFile = InstrumentClient( GetServiceClient_DataLakeServiceIdentitySas_Path( fileSystemName: fileSystemName, path: directoryName + "/" + fileName, @@ -913,7 +913,7 @@ public async Task GetPropertiesAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFile(out FileClient file)) + using (GetNewFile(out DataLakeFileClient file)) { // Arrange parameters.Match = await SetupPathMatchCondition(file, parameters.Match); @@ -937,7 +937,7 @@ public async Task GetPropertiesAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFile(out FileClient file)) + using (GetNewFile(out DataLakeFileClient file)) { // Arrange parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); @@ -957,10 +957,10 @@ public async Task GetPropertiesAsync_ConditionsFail() [Test] public async Task GetPropertiesAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -973,7 +973,7 @@ await TestHelper.AssertExpectedExceptionAsync( public async Task SetHttpHeadersAsync() { var constants = new TestConstants(this); - using (GetNewFile(out FileClient file)) + using (GetNewFile(out DataLakeFileClient file)) { // Act await file.SetHttpHeadersAsync(new PathHttpHeaders @@ -1003,10 +1003,10 @@ await file.SetHttpHeadersAsync(new PathHttpHeaders public async Task SetHttpHeadersAsync_Error() { var constants = new TestConstants(this); - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1030,10 +1030,10 @@ public async Task SetHttpHeadersAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); parameters.LeaseId = await SetupPathLeaseCondition(file, parameters.LeaseId, garbageLeaseId); @@ -1067,10 +1067,10 @@ public async Task SetHttpHeadersAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); DataLakeRequestConditions conditions = BuildDataLakeRequestConditions(parameters); @@ -1096,7 +1096,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task SetMetadataAsync() { - using (GetNewFile(out FileClient file)) + using (GetNewFile(out DataLakeFileClient file)) { // Arrange IDictionary metadata = BuildMetadata(); @@ -1113,10 +1113,10 @@ public async Task SetMetadataAsync() [Test] public async Task SetMetadataAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); IDictionary metadata = BuildMetadata(); // Act @@ -1132,10 +1132,10 @@ public async Task SetMetadataAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); IDictionary metadata = BuildMetadata(); parameters.Match = await SetupPathMatchCondition(file, parameters.Match); @@ -1161,10 +1161,10 @@ public async Task SetMetadataAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); IDictionary metadata = BuildMetadata(); parameters.NoneMatch = await SetupPathMatchCondition(file, parameters.NoneMatch); @@ -1183,10 +1183,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AppendDataAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Size); @@ -1201,10 +1201,10 @@ public async Task AppendDataAsync() [Test] public async Task AppendDataAsync_ContentHash() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Size); byte[] contentHash = MD5.Create().ComputeHash(data); @@ -1220,10 +1220,10 @@ public async Task AppendDataAsync_ContentHash() [Test] public async Task AppendDataAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); var data = GetRandomBuffer(Size); // Act @@ -1239,10 +1239,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AppendDataAsync_Position() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data0 = GetRandomBuffer(Constants.KB); var data1 = GetRandomBuffer(Constants.KB); @@ -1270,10 +1270,10 @@ public async Task AppendDataAsync_Position() [Test] public async Task AppendDataAsync_Lease() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Size); var leaseId = Recording.Random.NewGuid().ToString(); @@ -1291,10 +1291,10 @@ public async Task AppendDataAsync_Lease() [Test] public async Task AppendDataAsync_InvalidLease() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Size); @@ -1311,10 +1311,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task FlushDataAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Constants.KB); @@ -1334,10 +1334,10 @@ public async Task FlushDataAsync() [Test] public async Task FlushDataAsync_HttpHeaders() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); byte[] data = GetRandomBuffer(Constants.KB); byte[] contentHash = MD5.Create().ComputeHash(data); @@ -1375,10 +1375,10 @@ public async Task FlushDataAsync_HttpHeaders() [Test] public async Task FlushDataAsync_Position() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Constants.KB); @@ -1398,10 +1398,10 @@ public async Task FlushDataAsync_Position() [Test] public async Task FlushDataAsync_RetainUncommittedData() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Constants.KB); @@ -1421,10 +1421,10 @@ public async Task FlushDataAsync_RetainUncommittedData() [Test] public async Task FlushDataAsync_Close() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Constants.KB); @@ -1447,10 +1447,10 @@ public async Task FlushDataAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Constants.KB); @@ -1477,10 +1477,10 @@ public async Task FlushDataAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); await file.CreateAsync(); var data = GetRandomBuffer(Size); @@ -1503,10 +1503,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task FlushDataAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1518,11 +1518,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReadAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var data = GetRandomBuffer(Constants.KB); - FileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); using (var stream = new MemoryStream(data)) { await fileClient.AppendAsync(stream, 0); @@ -1552,11 +1552,11 @@ public async Task ReadAsync() [Test] public async Task ReadAsync_Range() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var data = GetRandomBuffer(Constants.KB); - FileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); using (var stream = new MemoryStream(data)) { await fileClient.AppendAsync(stream, 0); @@ -1580,11 +1580,11 @@ public async Task ReadAsync_Range() [Test] public async Task ReadAsync_RangeGetContentHash() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var data = GetRandomBuffer(Constants.KB); - FileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient fileClient = await fileSystem.CreateFileAsync(GetNewFileName()); using (var stream = new MemoryStream(data)) { await fileClient.AppendAsync(stream, 0); @@ -1609,11 +1609,11 @@ public async Task ReadAsync_Conditions() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var data = GetRandomBuffer(Constants.KB); - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); using (var stream = new MemoryStream(data)) { await file.AppendAsync(stream, 0); @@ -1643,11 +1643,11 @@ public async Task ReadAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in GetConditionsFail_Data(garbageLeaseId)) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var data = GetRandomBuffer(Constants.KB); - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); using (var stream = new MemoryStream(data)) { await file.AppendAsync(stream, 0); @@ -1672,10 +1672,10 @@ public async Task ReadAsync_ConditionsFail() [Test] public async Task ReadAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -1687,10 +1687,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AcquireLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1708,10 +1708,10 @@ public async Task AcquireLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1736,10 +1736,10 @@ public async Task AcquireLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1760,10 +1760,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task AcquireLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1777,10 +1777,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenewLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1801,10 +1801,10 @@ public async Task RenewLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1830,10 +1830,10 @@ public async Task RenewLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1855,10 +1855,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task RenewLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); var leaseId = Recording.Random.NewGuid().ToString(); // Act @@ -1871,10 +1871,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReleaseLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1895,10 +1895,10 @@ public async Task ReleaseLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1924,10 +1924,10 @@ public async Task ReleaseLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -1949,10 +1949,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReleaseLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); var leaseId = Recording.Random.NewGuid().ToString(); // Act @@ -1965,10 +1965,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ChangeLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -1990,10 +1990,10 @@ public async Task ChangeLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -2022,10 +2022,10 @@ public async Task ChangeLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -2050,10 +2050,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ChangeLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); var leaseId = Recording.Random.NewGuid().ToString(); var newLeaseId = Recording.Random.NewGuid().ToString(); @@ -2067,10 +2067,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task BreakLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -2091,10 +2091,10 @@ public async Task BreakLeaseAsync_Conditions() { foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -2120,10 +2120,10 @@ public async Task BreakLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName()); var leaseId = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -2145,10 +2145,10 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task BreakLeaseAsync_Error() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange - FileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); + DataLakeFileClient file = InstrumentClient(fileSystem.GetFileClient(GetNewFileName())); // Act await TestHelper.AssertExpectedExceptionAsync( diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs index 41a26c990d29..8766581c0810 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs @@ -25,7 +25,7 @@ public async Task CreateAsync() // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); var fileSystemName = GetNewFileSystemName(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); try { @@ -51,7 +51,7 @@ public async Task CreateAsync_WithAccountSas() // Arrange var fileSystemName = GetNewFileSystemName(); DataLakeServiceClient service = GetServiceClient_AccountSas(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); try { @@ -73,7 +73,7 @@ public async Task CreateAsync_WithDataLakeServiceSas() // Arrange var fileSystemName = GetNewFileSystemName(); DataLakeServiceClient service = GetServiceClient_DataLakeServiceSas_FileSystem(fileSystemName); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); var pass = false; try @@ -102,7 +102,7 @@ public async Task CreateAsync_Oauth() // Arrange DataLakeServiceClient service = GetServiceClient_OAuth(); var fileSystemName = GetNewFileSystemName(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(fileSystemName)); try { @@ -127,7 +127,7 @@ public async Task CreateAsync_Metadata() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); IDictionary metadata = BuildMetadata(); // Act @@ -146,7 +146,7 @@ public async Task CreateAsync_PublicAccess() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // Act await fileSystem.CreateAsync(publicAccessType: Models.PublicAccessType.Blob); @@ -164,7 +164,7 @@ public async Task CreateAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystemClient = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystemClient = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // ContainerUri is intentually created twice await fileSystemClient.CreateAsync(); @@ -182,7 +182,7 @@ public async Task DeleteAsync() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); // Act @@ -197,7 +197,7 @@ public async Task DeleteAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -213,7 +213,7 @@ public async Task DeleteAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); parameters.LeaseId = await SetupFileSystemLeaseCondition(fileSystem, parameters.LeaseId, garbageLeaseId); DataLakeRequestConditions conditions = BuildFileSystemConditions( @@ -235,7 +235,7 @@ public async Task DeleteAsync_ConditionsFail() var garbageLeaseId = GetGarbageLeaseId(); foreach (AccessConditionParameters parameters in ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange parameters.LeaseId = await SetupFileSystemLeaseCondition(fileSystem, parameters.LeaseId, garbageLeaseId); @@ -255,7 +255,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ListPathsAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange await SetUpFileSystemForListing(fileSystem); @@ -272,17 +272,13 @@ public async Task ListPathsAsync() [Test] public async Task ListPathsAsync_Recursive() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange await SetUpFileSystemForListing(fileSystem); - GetPathsOptions options = new GetPathsOptions() - { - Recursive = true - }; // Act - AsyncPageable response = fileSystem.ListPathsAsync(options: options); + AsyncPageable response = fileSystem.ListPathsAsync(recursive: true); IList paths = await response.ToListAsync(); // Assert @@ -293,17 +289,13 @@ public async Task ListPathsAsync_Recursive() [Test] public async Task ListPathsAsync_Upn() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange await SetUpFileSystemForListing(fileSystem); - GetPathsOptions options = new GetPathsOptions() - { - Upn = true - }; // Act - AsyncPageable response = fileSystem.ListPathsAsync(options: options); + AsyncPageable response = fileSystem.ListPathsAsync(upn: true); IList paths = await response.ToListAsync(); // Assert @@ -314,17 +306,13 @@ public async Task ListPathsAsync_Upn() [Test] public async Task ListPathsAsync_Path() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange await SetUpFileSystemForListing(fileSystem); - GetPathsOptions options = new GetPathsOptions() - { - Path = "foo" - }; // Act - AsyncPageable response = fileSystem.ListPathsAsync(options: options); + AsyncPageable response = fileSystem.ListPathsAsync(path: "foo"); IList paths = await response.ToListAsync(); // Assert @@ -336,7 +324,7 @@ public async Task ListPathsAsync_Path() [AsyncOnly] public async Task ListPathsAsync_MaxResults() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange await SetUpFileSystemForListing(fileSystem); @@ -354,7 +342,7 @@ public async Task ListPathsAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); + DataLakeFileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -365,7 +353,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task GetPropertiesAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem, publicAccessType: Models.PublicAccessType.Container)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, publicAccessType: Models.PublicAccessType.Container)) { // Act Response response = await fileSystem.GetPropertiesAsync(); @@ -380,7 +368,7 @@ public async Task GetPropertiesAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileService = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileService = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -391,7 +379,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task SetMetadataAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange IDictionary metadata = BuildMetadata(); @@ -410,7 +398,7 @@ public async Task SetMetadataAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient container = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient container = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); IDictionary metadata = BuildMetadata(); // Act @@ -427,7 +415,7 @@ public async Task SetMetadataAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); parameters.LeaseId = await SetupFileSystemLeaseCondition(fileSystem, parameters.LeaseId, garbageLeaseId); IDictionary metadata = BuildMetadata(); @@ -463,7 +451,7 @@ public async Task SetMetadataAsync_ConditionsFail() }; foreach (AccessConditionParameters parameters in data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange IDictionary metadata = BuildMetadata(); @@ -485,11 +473,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateFileAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Act string fileName = GetNewFileName(); - Response response = await fileSystem.CreateFileAsync(fileName); + Response response = await fileSystem.CreateFileAsync(fileName); // Assert Assert.AreEqual(fileName, response.Value.Name); @@ -499,7 +487,7 @@ public async Task CreateFileAsync() [Test] public async Task CreateFileAsync_HttpHeaders() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange PathHttpHeaders headers = new PathHttpHeaders @@ -512,7 +500,7 @@ public async Task CreateFileAsync_HttpHeaders() }; // Act - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName(), httpHeaders: headers); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName(), httpHeaders: headers); // Assert Response response = await file.GetPropertiesAsync(); @@ -529,13 +517,13 @@ public async Task CreateFileAsync_HttpHeaders() [Test] public async Task CreateFileAsync_Metadata() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange IDictionary metadata = BuildMetadata(); // Act - FileClient file = await fileSystem.CreateFileAsync(GetNewFileName(), metadata: metadata); + DataLakeFileClient file = await fileSystem.CreateFileAsync(GetNewFileName(), metadata: metadata); // Assert Response getPropertiesResponse = await file.GetPropertiesAsync(); @@ -546,14 +534,14 @@ public async Task CreateFileAsync_Metadata() [Test] public async Task CreateFileAsync_PermissionAndUmask() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange string permissions = "0777"; string umask = "0057"; // Act - FileClient file = await fileSystem.CreateFileAsync( + DataLakeFileClient file = await fileSystem.CreateFileAsync( GetNewFileName(), permissions: permissions, umask: umask); @@ -569,7 +557,7 @@ public async Task CreateFileAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -580,7 +568,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task DeleteFileAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange string fileName = GetNewFileName(); @@ -596,7 +584,7 @@ public async Task DeleteFileAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -607,11 +595,11 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateDirectoryAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Act string directoryName = GetNewDirectoryName(); - Response response = await fileSystem.CreateDirectoryAsync(directoryName); + Response response = await fileSystem.CreateDirectoryAsync(directoryName); // Assert Assert.AreEqual(directoryName, response.Value.Name); @@ -623,7 +611,7 @@ public async Task CreateDirectoryAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); + DataLakeFileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -634,7 +622,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task CreateDirectoryAsync_HttpHeaders() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange PathHttpHeaders headers = new PathHttpHeaders @@ -647,7 +635,7 @@ public async Task CreateDirectoryAsync_HttpHeaders() }; // Act - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName(), httpHeaders: headers); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName(), httpHeaders: headers); // Assert Response response = await directory.GetPropertiesAsync(); @@ -664,13 +652,13 @@ public async Task CreateDirectoryAsync_HttpHeaders() [Test] public async Task CreateDirectoryAsync_Metadata() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange IDictionary metadata = BuildMetadata(); // Act - DirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName(), metadata: metadata); + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync(GetNewDirectoryName(), metadata: metadata); // Assert Response getPropertiesResponse = await directory.GetPropertiesAsync(); @@ -681,14 +669,14 @@ public async Task CreateDirectoryAsync_Metadata() [Test] public async Task CreateDirectoryAsync_PermissionAndUmask() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange string permissions = "0777"; string umask = "0057"; // Act - DirectoryClient directory = await fileSystem.CreateDirectoryAsync( + DataLakeDirectoryClient directory = await fileSystem.CreateDirectoryAsync( GetNewDirectoryName(), permissions: permissions, umask: umask); @@ -702,7 +690,7 @@ public async Task CreateDirectoryAsync_PermissionAndUmask() [Test] public async Task DeleteDirectoryAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange string directoryName = GetNewDirectoryName(); @@ -718,7 +706,7 @@ public async Task DeleteDirectoryAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); + DataLakeFileSystemClient fileSystem = service.GetFileSystemClient(GetNewFileSystemName()); // Act await TestHelper.AssertExpectedExceptionAsync( @@ -731,7 +719,7 @@ public async Task AquireLeaseAsync() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); var id = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -754,7 +742,7 @@ public async Task AcquireLeaseAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); var id = Recording.Random.NewGuid().ToString(); var duration = TimeSpan.FromSeconds(15); @@ -771,7 +759,7 @@ public async Task AcquireLeaseAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -802,7 +790,7 @@ public async Task AcquireLeaseAsync_ConditionsFail() { foreach (AccessConditionParameters parameters in NoLease_ConditionsFail_Data) { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange DataLakeRequestConditions conditions = BuildFileSystemConditions( @@ -828,7 +816,7 @@ public async Task RenewLeaseAsync() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); var id = Recording.Random.NewGuid().ToString(); @@ -855,7 +843,7 @@ public async Task RenewLeaseAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); var id = Recording.Random.NewGuid().ToString(); // Act @@ -871,7 +859,7 @@ public async Task RenewLeaseAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -904,7 +892,7 @@ public async Task RenewLeaseAsync_ConditionsFail() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -933,7 +921,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ReleaseLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var id = Recording.Random.NewGuid().ToString(); @@ -956,7 +944,7 @@ public async Task ReleaseLeaseAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); var id = Recording.Random.NewGuid().ToString(); // Act @@ -971,7 +959,7 @@ public async Task ReleaseLeaseAsync_Conditions() foreach (AccessConditionParameters parameters in NoLease_Conditions_Data) { // Arrange - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -1000,7 +988,7 @@ public async Task ReleaseLeaseAsync_ConditionsFail() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -1029,7 +1017,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task ChangeLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var id = Recording.Random.NewGuid().ToString(); @@ -1053,7 +1041,7 @@ public async Task ChangeLeaseAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); var id = Recording.Random.NewGuid().ToString(); // Act @@ -1069,7 +1057,7 @@ public async Task ChangeLeaseAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( @@ -1106,7 +1094,7 @@ public async Task ChangeLeaseAsync_ConditionsFail() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -1137,7 +1125,7 @@ await TestHelper.AssertExpectedExceptionAsync( [Test] public async Task BreakLeaseAsync() { - using (GetNewFileSystem(out FileSystemClient fileSystem)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem)) { // Arrange var id = Recording.Random.NewGuid().ToString(); @@ -1160,7 +1148,7 @@ public async Task BreakLeaseAsync_Error() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); var id = Recording.Random.NewGuid().ToString(); // Act @@ -1176,7 +1164,7 @@ public async Task BreakLeaseAsync_Conditions() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( @@ -1211,7 +1199,7 @@ public async Task BreakLeaseAsync_ConditionsFail() { // Arrange DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); + DataLakeFileSystemClient fileSystem = InstrumentClient(service.GetFileSystemClient(GetNewFileSystemName())); await fileSystem.CreateAsync(); DataLakeRequestConditions conditions = BuildFileSystemConditions( parameters: parameters, @@ -1300,15 +1288,15 @@ private class AccessConditionParameters public string LeaseId { get; set; } } - private async Task SetUpFileSystemForListing(FileSystemClient fileSystem) + private async Task SetUpFileSystemForListing(DataLakeFileSystemClient fileSystem) { var pathNames = PathNames; - var directories = new DirectoryClient[pathNames.Length]; + var directories = new DataLakeDirectoryClient[pathNames.Length]; // Upload Blobs for (var i = 0; i < pathNames.Length; i++) { - DirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(pathNames[i])); + DataLakeDirectoryClient directory = InstrumentClient(fileSystem.GetDirectoryClient(pathNames[i])); directories[i] = directory; await directory.CreateAsync(); } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs index bbf011e4ea61..bd049976c439 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs @@ -68,7 +68,7 @@ public async Task GetFileSystemsAsync_Marker() { DataLakeServiceClient service = GetServiceClient_SharedKey(); // Ensure at least one container - using (GetNewFileSystem(out FileSystemClient fileSystem, service: service)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service: service)) { var marker = default(string); var fileSystems = new List(); @@ -91,7 +91,7 @@ public async Task GetFileSystemsAsync_MaxResults() DataLakeServiceClient service = GetServiceClient_SharedKey(); // Ensure at least one container using (GetNewFileSystem(out _, service: service)) - using (GetNewFileSystem(out FileSystemClient fileSystem, service: service)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service: service)) { // Act Page page = await @@ -111,7 +111,7 @@ public async Task GetFileSystemsAsync_Prefix() var prefix = "aaa"; var fileSystemName = prefix + GetNewFileSystemName(); // Ensure at least one container - using (GetNewFileSystem(out FileSystemClient fileSystem, service: service, fileSystemName: fileSystemName)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service: service, fileSystemName: fileSystemName)) { // Act AsyncPageable fileSystems = service.GetFileSystemsAsync(prefix: prefix); @@ -128,7 +128,7 @@ public async Task GetFileSystemsAsync_Metadata() { DataLakeServiceClient service = GetServiceClient_SharedKey(); // Ensure at least one container - using (GetNewFileSystem(out FileSystemClient fileSystem, service: service)) + using (GetNewFileSystem(out DataLakeFileSystemClient fileSystem, service: service)) { // Arrange IDictionary metadata = BuildMetadata(); @@ -166,7 +166,7 @@ public async Task CreateFileSystemAsync() DataLakeServiceClient service = GetServiceClient_SharedKey(); try { - FileSystemClient fileSystem = InstrumentClient((await service.CreateFileSystemAsync(name)).Value); + DataLakeFileSystemClient fileSystem = InstrumentClient((await service.CreateFileSystemAsync(name)).Value); Response properties = await fileSystem.GetPropertiesAsync(); Assert.IsNotNull(properties.Value); } @@ -181,7 +181,7 @@ public async Task DeleteFileSystemAsync() { var name = GetNewFileSystemName(); DataLakeServiceClient service = GetServiceClient_SharedKey(); - FileSystemClient fileSystem = InstrumentClient((await service.CreateFileSystemAsync(name)).Value); + DataLakeFileSystemClient fileSystem = InstrumentClient((await service.CreateFileSystemAsync(name)).Value); await service.DeleteFileSystemAsync(name); Assert.ThrowsAsync( diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync.json index 69e28b10ebd0..c45716b0dbb3 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync.json @@ -5,14 +5,14 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-847b2a30ceadb7409b9bd5e8b0140f4b-b62e0ec20bba2c43-00", + "traceparent": "00-d01ce3615217b44a9992c1d34802a6e4-9d5ba4ba3e39ca41-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-blob-public-access": "container", "x-ms-client-request-id": "69570aed-153a-8673-ffee-c854183c2616", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:57 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -20,15 +20,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D754124775E22A\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6EAAD491\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:57 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "69570aed-153a-8673-ffee-c854183c2616", - "x-ms-request-id": "9923ab9b-401e-0046-59fb-854bd8000000", + "x-ms-request-id": "c739e71f-b01e-0052-7cb6-8d03b7000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -38,13 +38,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-61ccecf2b0649043b5a7352510f2cd2d-2ebf8677250c7646-00", + "traceparent": "00-e860ec91ee34904e965989fc363aafae-f67e4a228f70df47-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "5f12a2df-64e9-428b-1cae-149c84eea736", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -52,15 +52,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D75412477DDC5B\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F08175E\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "5f12a2df-64e9-428b-1cae-149c84eea736", - "x-ms-request-id": "d7aec735-901f-0045-2ffb-85aabc000000", + "x-ms-request-id": "460a05cb-b01f-0089-6ab6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -70,13 +70,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-2df153e59e14d848b6878df0da933a0f-5e0adccf3ed4e543-00", + "traceparent": "00-d6d7c460a9547c469bf2599e4a276fa9-022d0c973ec2884a-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "7574b2b0-c729-bc2c-6106-e23e356ec384", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -84,15 +84,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D75412478062FA\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F0B4766\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "7574b2b0-c729-bc2c-6106-e23e356ec384", - "x-ms-request-id": "d7aec737-901f-0045-31fb-85aabc000000", + "x-ms-request-id": "460a05cc-b01f-0089-6bb6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -102,13 +102,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-b1ec6c28efd4f74b993f9fe1b85b11f0-9221ae3933b30a4b-00", + "traceparent": "00-956b8b6454c75943a1de0dce7d116690-7c073967328cc44a-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "d2ec3b0b-3279-ce0c-cde1-63f6d08c6d90", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -116,15 +116,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D754124782C41D\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F0D86E3\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "d2ec3b0b-3279-ce0c-cde1-63f6d08c6d90", - "x-ms-request-id": "d7aec738-901f-0045-32fb-85aabc000000", + "x-ms-request-id": "460a05cd-b01f-0089-6cb6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -134,13 +134,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-b7a7ec6f01732648a016efafdc8dd8d4-eec89ce1e468ae42-00", + "traceparent": "00-945250ef3ad7e44f94375408e52763e1-4dd836a0cc3f8943-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "fa3281ee-f181-df0a-a853-1aa716225c4b", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -148,15 +148,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D7541247854284\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F0FB4FE\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "fa3281ee-f181-df0a-a853-1aa716225c4b", - "x-ms-request-id": "d7aec739-901f-0045-33fb-85aabc000000", + "x-ms-request-id": "460a05ce-b01f-0089-6db6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -166,13 +166,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-f8db54eeb1372b48b33e21f117730663-2ae24093f714b947-00", + "traceparent": "00-d6960534a2d9bc42b81435cff9092979-089817382cfd5f4d-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "4e070c92-725a-5b0f-6790-cd469fa92076", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -180,15 +180,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D754124787C3F2\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F11F06D\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "4e070c92-725a-5b0f-6790-cd469fa92076", - "x-ms-request-id": "d7aec73b-901f-0045-35fb-85aabc000000", + "x-ms-request-id": "460a05cf-b01f-0089-6eb6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -198,13 +198,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-2fde2f39443720439e7614c892eec117-c02622ff1318b443-00", + "traceparent": "00-eda7977474d9f24aa30bdb92695a56dd-26f8c0789d2c0d42-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "09149feb-0d1b-8ff1-c032-940ad480b140", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -212,15 +212,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D75412478A3F8B\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F141C31\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "09149feb-0d1b-8ff1-c032-940ad480b140", - "x-ms-request-id": "d7aec73c-901f-0045-36fb-85aabc000000", + "x-ms-request-id": "460a05d0-b01f-0089-6fb6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -230,13 +230,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-410c3acd4caaba42b5000f64798e6711-4d152ff21be97e4d-00", + "traceparent": "00-9e27f02c3a90044aa6d77bec72a52d59-db16c79dedf67847-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "005a7745-1695-de5b-6027-d691beb1783a", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -244,15 +244,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D75412478CFE4F\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F166871\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "005a7745-1695-de5b-6027-d691beb1783a", - "x-ms-request-id": "d7aec73e-901f-0045-38fb-85aabc000000", + "x-ms-request-id": "460a05d1-b01f-0089-70b6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -262,13 +262,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-548e305936de2941b50e9623bae1ab26-b936784b48d6284b-00", + "traceparent": "00-1c54d8e56e171f46af4f77adb43d410a-bf1382d94451e14a-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "5cc40490-b126-7fab-6667-e173f925829f", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -276,15 +276,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D75412478FF808\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F18A4FA\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "5cc40490-b126-7fab-6667-e173f925829f", - "x-ms-request-id": "d7aec73f-901f-0045-39fb-85aabc000000", + "x-ms-request-id": "460a05d2-b01f-0089-71b6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -294,13 +294,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-905a1682704e914890a4d42e5d31d158-994a1e8a5675c241-00", + "traceparent": "00-7967872d5a0aab4bb01a3e3518f2465b-46eff3c255d5544c-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "b90159fa-1bed-7e14-24b5-8f2b274721c2", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -308,30 +308,30 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", - "ETag": "\u00220x8D754124792A4E0\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", + "ETag": "\u00220x8D75BCD6F1B0AFA\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "b90159fa-1bed-7e14-24b5-8f2b274721c2", - "x-ms-request-id": "d7aec741-901f-0045-3bfb-85aabc000000", + "x-ms-request-id": "460a05d3-b01f-0089-72b6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] }, { - "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-5d78b594-f475-efe3-5c90-5a006941cdc6?resource=filesystem\u0026recursive=false", + "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-5d78b594-f475-efe3-5c90-5a006941cdc6?resource=filesystem\u0026recursive=false\u0026upn=false", "RequestMethod": "GET", "RequestHeaders": { "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "a079f902-c923-25b1-45ca-6e581cd11676", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -339,44 +339,44 @@ "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:57 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", "x-ms-client-request-id": "a079f902-c923-25b1-45ca-6e581cd11676", - "x-ms-request-id": "d7aec742-901f-0045-3cfb-85aabc000000", + "x-ms-request-id": "460a05d4-b01f-0089-73b6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": { "paths": [ { "contentLength": "0", - "etag": "0x8D75412478062FA", + "etag": "0x8D75BCD6F0B4766", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:38 GMT", + "lastModified": "Mon, 28 Oct 2019 17:36:58 GMT", "name": "bar", "owner": "$superuser", "permissions": "rwxr-x---" }, { "contentLength": "0", - "etag": "0x8D754124782C41D", + "etag": "0x8D75BCD6F0D86E3", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:38 GMT", + "lastModified": "Mon, 28 Oct 2019 17:36:58 GMT", "name": "baz", "owner": "$superuser", "permissions": "rwxr-x---" }, { "contentLength": "0", - "etag": "0x8D75412477DDC5B", + "etag": "0x8D75BCD6F08175E", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:38 GMT", + "lastModified": "Mon, 28 Oct 2019 17:36:58 GMT", "name": "foo", "owner": "$superuser", "permissions": "rwxr-x---" @@ -389,13 +389,13 @@ "RequestMethod": "DELETE", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-2b4e96529be1d5489a952560fb2aaab0-1b7033d05bbc3f49-00", + "traceparent": "00-5a8767cf7addb145b4fc9b818278c670-de5c650f6308db4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "2e282294-81cd-879e-67f9-d9652b15c736", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -403,13 +403,13 @@ "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "2e282294-81cd-879e-67f9-d9652b15c736", - "x-ms-request-id": "9923acb7-401e-0046-62fb-854bd8000000", + "x-ms-request-id": "c739e8b4-b01e-0052-69b6-8d03b7000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsyncAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsyncAsync.json index 916c66c99961..0719b33743ea 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsyncAsync.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsyncAsync.json @@ -5,14 +5,14 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-e4da5bb1dd8e6e41b6687f16e66c31aa-da1fa02541ad6f46-00", + "traceparent": "00-677967812e8d7745aa82b578d359bb76-c09cbc6ea5552342-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-blob-public-access": "container", "x-ms-client-request-id": "dd1019f5-e397-06a7-7054-803850c803fe", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:04 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -20,15 +20,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:43 GMT", - "ETag": "\u00220x8D754124AFA2FD0\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:04 GMT", + "ETag": "\u00220x8D75BCD72EBDC0A\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "dd1019f5-e397-06a7-7054-803850c803fe", - "x-ms-request-id": "9923c3f4-401e-0046-23fb-854bd8000000", + "x-ms-request-id": "707b04b1-301e-002e-30b6-8d2d48000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -38,13 +38,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-48a4e75ced649b44b283d229520afe8c-4fffb4247a1ad24c-00", + "traceparent": "00-eed1064b3d341d45888c7eeb4cbb4cc0-5e65b38cbd596547-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "d00492a4-addb-c1ab-32a9-4fd46ed0f698", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -52,15 +52,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:43 GMT", - "ETag": "\u00220x8D754124AFE7CFA\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7310A67B\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "d00492a4-addb-c1ab-32a9-4fd46ed0f698", - "x-ms-request-id": "d7aec7cf-901f-0045-48fb-85aabc000000", + "x-ms-request-id": "f8a5a75b-701f-0086-1ab6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -70,13 +70,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-675895b25c8d68428f8d1d32de2922c1-c5a35c5028f8f947-00", + "traceparent": "00-b341cff2cea86342b025140ca5443cf9-6a62973ba8e68048-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "bd94652c-32c4-4b23-6f6d-35758cc9f8bd", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -84,15 +84,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B0104DE\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7316E5F7\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "bd94652c-32c4-4b23-6f6d-35758cc9f8bd", - "x-ms-request-id": "d7aec7d0-901f-0045-49fb-85aabc000000", + "x-ms-request-id": "f8a5a75c-701f-0086-1bb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -102,13 +102,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-2bcd6e998b677b42b56c61b002fc393c-bac5c4e492a82b42-00", + "traceparent": "00-f3fea0911cfbb043a3c7a525c890f2fe-a18c2829e068f24e-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "09a7bae8-383c-8cd3-5a25-b94b597b8db3", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -116,15 +116,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B038145\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD73190509\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "09a7bae8-383c-8cd3-5a25-b94b597b8db3", - "x-ms-request-id": "d7aec7d1-901f-0045-4afb-85aabc000000", + "x-ms-request-id": "f8a5a75d-701f-0086-1cb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -134,13 +134,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-e18b3c1a3e19094aa207bcc2b0785d47-d6be7dcdebf42f44-00", + "traceparent": "00-bb62e0d667d2e342b251f09805c2e041-e36b2c7cb2c72944-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "d18d3426-ef22-2381-fd2a-6d444417bb26", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -148,15 +148,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B067E80\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD731B33B8\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "d18d3426-ef22-2381-fd2a-6d444417bb26", - "x-ms-request-id": "d7aec7d2-901f-0045-4bfb-85aabc000000", + "x-ms-request-id": "f8a5a75f-701f-0086-1eb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -166,13 +166,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-c635910d00bbc842862e5883e76caea5-2af2c79b65060d4e-00", + "traceparent": "00-499987fe485c3f4d98cee177a276a76f-9dec4ee91af6f749-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "2424b037-bced-c291-10c5-ac4f8ae7eaea", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -180,15 +180,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B097BB5\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD731D85B4\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "2424b037-bced-c291-10c5-ac4f8ae7eaea", - "x-ms-request-id": "d7aec7d4-901f-0045-4dfb-85aabc000000", + "x-ms-request-id": "f8a5a760-701f-0086-1fb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -198,13 +198,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-91ddb813520b0d499cd482fe993834d3-d7a05aff13a0b748-00", + "traceparent": "00-2433bea7244deb4aa45fca1d6b01c05d-d303cd4dd10c2e4a-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "930c057c-97f2-a038-0fbd-bab8f13765a7", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -212,15 +212,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B0BF663\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD731FDB08\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "930c057c-97f2-a038-0fbd-bab8f13765a7", - "x-ms-request-id": "d7aec7d5-901f-0045-4efb-85aabc000000", + "x-ms-request-id": "f8a5a761-701f-0086-20b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -230,13 +230,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-3ee57579354a6748bbfadddc7ee4a8d7-dc39948d084b5842-00", + "traceparent": "00-606c4d537793524787fa08f0269d63bb-66dd5ed33869204a-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "85d3a8be-56da-2cf8-bddd-2eb367d39776", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -244,15 +244,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B0E5552\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD73222046\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "85d3a8be-56da-2cf8-bddd-2eb367d39776", - "x-ms-request-id": "d7aec7d6-901f-0045-4ffb-85aabc000000", + "x-ms-request-id": "f8a5a762-701f-0086-21b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -262,13 +262,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-755bf0b42d062f4aa2751218ab9dfe8d-85fad288c3f57549-00", + "traceparent": "00-973172f7a7223e4d84a29b4ddee9d5f3-8ccf909042a24741-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "48fa6fe4-e064-36cc-23cb-6a9d4343ae51", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -276,15 +276,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B10C222\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD73248383\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "48fa6fe4-e064-36cc-23cb-6a9d4343ae51", - "x-ms-request-id": "d7aec7d7-901f-0045-50fb-85aabc000000", + "x-ms-request-id": "f8a5a763-701f-0086-22b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -294,13 +294,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-645c1a620bcb0f4d86a6f6f355e50d92-5d48531f1e458048-00", + "traceparent": "00-de7663a5f8e2d349a539d742ea0c2b5e-8179cf2542ec614b-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "f7cf06b6-4ed8-5611-cee5-a90074eac8ca", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -308,30 +308,30 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B1312C4\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD73269E78\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "f7cf06b6-4ed8-5611-cee5-a90074eac8ca", - "x-ms-request-id": "d7aec7d8-901f-0045-51fb-85aabc000000", + "x-ms-request-id": "f8a5a764-701f-0086-23b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] }, { - "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-ca989755-c238-6c43-029b-a2faeaeb8b42?resource=filesystem\u0026recursive=false", + "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-ca989755-c238-6c43-029b-a2faeaeb8b42?resource=filesystem\u0026recursive=false\u0026upn=false", "RequestMethod": "GET", "RequestHeaders": { "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "3ce795c0-b674-b678-efc2-0ee6647e6a35", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -339,44 +339,44 @@ "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", "x-ms-client-request-id": "3ce795c0-b674-b678-efc2-0ee6647e6a35", - "x-ms-request-id": "d7aec7d9-901f-0045-52fb-85aabc000000", + "x-ms-request-id": "f8a5a765-701f-0086-24b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": { "paths": [ { "contentLength": "0", - "etag": "0x8D754124B0104DE", + "etag": "0x8D75BCD7316E5F7", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:44 GMT", + "lastModified": "Mon, 28 Oct 2019 17:37:05 GMT", "name": "bar", "owner": "$superuser", "permissions": "rwxr-x---" }, { "contentLength": "0", - "etag": "0x8D754124B038145", + "etag": "0x8D75BCD73190509", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:44 GMT", + "lastModified": "Mon, 28 Oct 2019 17:37:05 GMT", "name": "baz", "owner": "$superuser", "permissions": "rwxr-x---" }, { "contentLength": "0", - "etag": "0x8D754124AFE7CFA", + "etag": "0x8D75BCD7310A67B", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:44 GMT", + "lastModified": "Mon, 28 Oct 2019 17:37:05 GMT", "name": "foo", "owner": "$superuser", "permissions": "rwxr-x---" @@ -389,13 +389,13 @@ "RequestMethod": "DELETE", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-ef0fc86b5bf92643bf1677f8c5b33cfe-08d2ff23ef802245-00", + "traceparent": "00-9ca035991a846644bd85591eca4ed638-cce792b33bf2a743-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "df402796-8b03-9255-a699-310b3c767272", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -403,13 +403,13 @@ "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:04 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "df402796-8b03-9255-a699-310b3c767272", - "x-ms-request-id": "9923c4e2-401e-0046-79fb-854bd8000000", + "x-ms-request-id": "707b051f-301e-002e-0cb6-8d2d48000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_Error.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_Error.json index b5bba5fb0577..8543f4ced25e 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_Error.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_Error.json @@ -1,16 +1,16 @@ { "Entries": [ { - "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-dc8cf04f-7da3-86fe-5f8d-cff0e25d1e2d?resource=filesystem\u0026recursive=false", + "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-dc8cf04f-7da3-86fe-5f8d-cff0e25d1e2d?resource=filesystem\u0026recursive=false\u0026upn=false", "RequestMethod": "GET", "RequestHeaders": { "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "31def804-9350-6096-446d-5283cbd9c733", - "x-ms-date": "Fri, 18 Oct 2019 21:29:38 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:36:58 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -19,20 +19,20 @@ "ResponseHeaders": { "Content-Length": "175", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 18 Oct 2019 21:29:38 GMT", + "Date": "Mon, 28 Oct 2019 17:36:58 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "31def804-9350-6096-446d-5283cbd9c733", "x-ms-error-code": "FilesystemNotFound", - "x-ms-request-id": "d7aec744-901f-0045-3efb-85aabc000000", + "x-ms-request-id": "460a05d5-b01f-0089-74b6-8dc58a000000", "x-ms-version": "2019-02-02" }, "ResponseBody": { "error": { "code": "FilesystemNotFound", - "message": "The specified filesystem does not exist.\nRequestId:d7aec744-901f-0045-3efb-85aabc000000\nTime:2019-10-18T21:29:38.3925492Z" + "message": "The specified filesystem does not exist.\nRequestId:460a05d5-b01f-0089-74b6-8dc58a000000\nTime:2019-10-28T17:36:58.8704057Z" } } } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_ErrorAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_ErrorAsync.json index b1fbc4630c1d..16619dbf2d87 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_ErrorAsync.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_ErrorAsync.json @@ -1,16 +1,16 @@ { "Entries": [ { - "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-ac440693-cf41-60ee-f96e-03022f714f1b?resource=filesystem\u0026recursive=false", + "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-ac440693-cf41-60ee-f96e-03022f714f1b?resource=filesystem\u0026recursive=false\u0026upn=false", "RequestMethod": "GET", "RequestHeaders": { "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "f7f81720-eb75-1d88-a785-00e4c7165764", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -19,20 +19,20 @@ "ResponseHeaders": { "Content-Length": "175", "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "f7f81720-eb75-1d88-a785-00e4c7165764", "x-ms-error-code": "FilesystemNotFound", - "x-ms-request-id": "d7aec7db-901f-0045-54fb-85aabc000000", + "x-ms-request-id": "f8a5a767-701f-0086-25b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": { "error": { "code": "FilesystemNotFound", - "message": "The specified filesystem does not exist.\nRequestId:d7aec7db-901f-0045-54fb-85aabc000000\nTime:2019-10-18T21:29:44.2447503Z" + "message": "The specified filesystem does not exist.\nRequestId:f8a5a767-701f-0086-25b6-8db3e6000000\nTime:2019-10-28T17:37:05.6611523Z" } } } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_MaxResultsAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_MaxResultsAsync.json index b8a6df041ef5..38a290a44215 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_MaxResultsAsync.json +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/ListPathsAsync_MaxResultsAsync.json @@ -5,14 +5,14 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-3a65f986c2bf9f4b95c9a7444a98d113-4415345c4a30e84a-00", + "traceparent": "00-0e1e6c06383f7740a37625d6e20d7892-f24d2a46f3d87140-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-blob-public-access": "container", "x-ms-client-request-id": "da067682-e686-1ba8-4119-d17a5069e07b", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -20,15 +20,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B1D9CC4\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7348B2C1\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "da067682-e686-1ba8-4119-d17a5069e07b", - "x-ms-request-id": "9923c526-401e-0046-3cfb-854bd8000000", + "x-ms-request-id": "707b052e-301e-002e-19b6-8d2d48000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -38,13 +38,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-a59c41d0a58dcc498eb7d6894b107fdf-2f157bf617f88b42-00", + "traceparent": "00-c81afc6f3d012b40bd50868ac86972a5-94d9c929ac1a364f-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "8a506dba-9261-1bfd-f004-40775a97bf54", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -52,15 +52,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B2210AD\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7358FE9D\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "8a506dba-9261-1bfd-f004-40775a97bf54", - "x-ms-request-id": "d7aec7dc-901f-0045-55fb-85aabc000000", + "x-ms-request-id": "f8a5a768-701f-0086-26b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -70,13 +70,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-ef214ababc253240a439a826765dd873-86389a4c7cbc9b48-00", + "traceparent": "00-e81f27950990e2429708bdccadd893df-dd66c7cd25ca8b49-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "e2bf27ab-5519-4f1a-06e6-fd336ae341c2", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -84,15 +84,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B24B271\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD735B2174\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "e2bf27ab-5519-4f1a-06e6-fd336ae341c2", - "x-ms-request-id": "d7aec7de-901f-0045-57fb-85aabc000000", + "x-ms-request-id": "f8a5a769-701f-0086-27b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -102,13 +102,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-2b8ac0ed346ad341be219f22ce06ae5d-80718f2e30651749-00", + "traceparent": "00-0c1a04b7a3670f4d8c6fb3b642c05310-329eeb692a9af54c-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "33cc3940-dcd8-dc3b-664d-96f79dac6c37", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -116,15 +116,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B271B59\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD735D3026\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "33cc3940-dcd8-dc3b-664d-96f79dac6c37", - "x-ms-request-id": "d7aec7df-901f-0045-58fb-85aabc000000", + "x-ms-request-id": "f8a5a76a-701f-0086-28b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -134,13 +134,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-ee73962ace8e5c42b992223e7159f48b-d9e5560248a7d044-00", + "traceparent": "00-ac6b4e3e046b384cb7ed2bb15c7b292a-9fb0920f25d37943-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "31f2b93b-0e17-27ea-e6ec-6f503cd483e0", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -148,15 +148,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B29A2F4\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD735F856D\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "31f2b93b-0e17-27ea-e6ec-6f503cd483e0", - "x-ms-request-id": "d7aec7e1-901f-0045-5afb-85aabc000000", + "x-ms-request-id": "f8a5a76b-701f-0086-29b6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -166,13 +166,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-99792002e846d44cbd7d35a47f2827ec-550dfe5815e91344-00", + "traceparent": "00-a97b5fe60a896949b2f0ce9d667e1702-ab3a0f28b3854549-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "e4bbc90f-3bb9-1a20-d497-69f57d199c87", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -180,15 +180,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B2C1D10\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD73618DCB\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "e4bbc90f-3bb9-1a20-d497-69f57d199c87", - "x-ms-request-id": "d7aec7e2-901f-0045-5bfb-85aabc000000", + "x-ms-request-id": "f8a5a76c-701f-0086-2ab6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -198,13 +198,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-663b98eb0051a4409e30589f7f2a02f2-5d0e8677d070654e-00", + "traceparent": "00-30f32ff68eea164b9b94137d578264b9-8285da69681fdb42-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "73412cf6-9f18-d126-18b3-7fe2f26cd5b6", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -212,15 +212,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B2ECA6D\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7363A1EF\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "73412cf6-9f18-d126-18b3-7fe2f26cd5b6", - "x-ms-request-id": "d7aec7e3-901f-0045-5cfb-85aabc000000", + "x-ms-request-id": "f8a5a76d-701f-0086-2bb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -230,13 +230,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-a53675976e090c459aac2208e14440db-531fbdd03d6db349-00", + "traceparent": "00-0373570979089b4987b4d25d3eaf8e7a-b861a220963d3f47-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "51ff1ef8-29d7-7c6e-4dc3-95a16b6feeeb", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -244,15 +244,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B312767\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7365B173\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "51ff1ef8-29d7-7c6e-4dc3-95a16b6feeeb", - "x-ms-request-id": "d7aec7e4-901f-0045-5dfb-85aabc000000", + "x-ms-request-id": "f8a5a76e-701f-0086-2cb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -262,13 +262,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-5e4455e7b396f3488449d715b6892304-bea1525a09c6b94f-00", + "traceparent": "00-557d448cde78d741a7c7d90a5314aef5-825b3cf4a6634a4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "d3ea5bd0-846d-2ede-e0a1-c543b34cb907", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -276,15 +276,15 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B33792C\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7367CDA5\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "d3ea5bd0-846d-2ede-e0a1-c543b34cb907", - "x-ms-request-id": "d7aec7e7-901f-0045-60fb-85aabc000000", + "x-ms-request-id": "f8a5a76f-701f-0086-2db6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] @@ -294,13 +294,13 @@ "RequestMethod": "PUT", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-6e1248a7dd5897429978509d2c24ba93-f39f8e878e33784c-00", + "traceparent": "00-78b107524a82f74fae9d2dac4b04570f-1a0a58bd81fb1d4f-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "0fd079cb-1a85-467d-cc9c-07f1c601f9f2", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -308,30 +308,30 @@ "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", - "ETag": "\u00220x8D754124B35E7E8\u0022", - "Last-Modified": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", + "ETag": "\u00220x8D75BCD7369DC8F\u0022", + "Last-Modified": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "0fd079cb-1a85-467d-cc9c-07f1c601f9f2", - "x-ms-request-id": "d7aec7e8-901f-0045-61fb-85aabc000000", + "x-ms-request-id": "f8a5a770-701f-0086-2eb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": [] }, { - "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-34d26bc8-550f-0eb8-8a42-85d300676d84?resource=filesystem\u0026recursive=false\u0026maxResults=2", + "RequestUri": "http://seannse.dfs.core.windows.net/test-filesystem-34d26bc8-550f-0eb8-8a42-85d300676d84?resource=filesystem\u0026recursive=false\u0026maxResults=2\u0026upn=false", "RequestMethod": "GET", "RequestHeaders": { "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "3a778537-aa7b-d381-2309-6295f39fa5d7", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -339,35 +339,35 @@ "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/json; charset=utf-8", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-HDFS/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", "x-ms-client-request-id": "3a778537-aa7b-d381-2309-6295f39fa5d7", - "x-ms-continuation": "MTE1OTM0OTgxOTQ2MDU5Mjc3NSAxMzIxNTkwNzc4NDQzMzUzNzEgZm9v", - "x-ms-request-id": "d7aec7e9-901f-0045-62fb-85aabc000000", + "x-ms-continuation": "MjQ4ODY3MTA0NTg0MDg5NjM4MSAxMzIxNjc1NzgyNTkxMDExODUgZm9v", + "x-ms-request-id": "f8a5a771-701f-0086-2fb6-8db3e6000000", "x-ms-version": "2019-02-02" }, "ResponseBody": { "paths": [ { "contentLength": "0", - "etag": "0x8D754124B24B271", + "etag": "0x8D75BCD735B2174", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:44 GMT", + "lastModified": "Mon, 28 Oct 2019 17:37:05 GMT", "name": "bar", "owner": "$superuser", "permissions": "rwxr-x---" }, { "contentLength": "0", - "etag": "0x8D754124B271B59", + "etag": "0x8D75BCD735D3026", "group": "$superuser", "isDirectory": "true", - "lastModified": "Fri, 18 Oct 2019 21:29:44 GMT", + "lastModified": "Mon, 28 Oct 2019 17:37:05 GMT", "name": "baz", "owner": "$superuser", "permissions": "rwxr-x---" @@ -380,13 +380,13 @@ "RequestMethod": "DELETE", "RequestHeaders": { "Authorization": "Sanitized", - "traceparent": "00-ade9d91c0e9e084383e6be6db6d8ea25-dd4bf2ea1f1ae04a-00", + "traceparent": "00-b12d26d3129a164b9b8468e2ffef43d3-8144c6dc6d9f1247-00", "User-Agent": [ - "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191018.1\u002B208b3446540844b7c7a794de85040d2515e86e1a", + "azsdk-net-Storage.Files.DataLake/12.0.0-dev.20191028.1\u002B3315469c1a6e531f682dcd19260a0305ceb2133d", "(.NET Core 4.6.28008.01; Microsoft Windows 10.0.18363 )" ], "x-ms-client-request-id": "41ba589b-bf89-b777-737d-4cb46654e12b", - "x-ms-date": "Fri, 18 Oct 2019 21:29:44 GMT", + "x-ms-date": "Mon, 28 Oct 2019 17:37:05 GMT", "x-ms-return-client-request-id": "true", "x-ms-version": "2019-02-02" }, @@ -394,13 +394,13 @@ "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Fri, 18 Oct 2019 21:29:44 GMT", + "Date": "Mon, 28 Oct 2019 17:37:05 GMT", "Server": [ "Windows-Azure-Blob/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "41ba589b-bf89-b777-737d-4cb46654e12b", - "x-ms-request-id": "9923c5ed-401e-0046-6bfb-854bd8000000", + "x-ms-request-id": "707b0565-301e-002e-48b6-8d2d48000000", "x-ms-version": "2019-02-02" }, "ResponseBody": []