diff --git a/sdk/storage/Azure.Storage.Blobs.Batch/src/BlobBatchClient.cs b/sdk/storage/Azure.Storage.Blobs.Batch/src/BlobBatchClient.cs index aa5be8d49220c..757776f7d3b64 100644 --- a/sdk/storage/Azure.Storage.Blobs.Batch/src/BlobBatchClient.cs +++ b/sdk/storage/Azure.Storage.Blobs.Batch/src/BlobBatchClient.cs @@ -150,7 +150,7 @@ public BlobBatchClient(BlobServiceClient client) BlobServiceClientInternals.GetAuthenticationPolicy(client), _version); - (ServiceRestClient serviceRestClient, ContainerRestClient containerRestClient) = BuildRestClients(); + (ServiceRestClient serviceRestClient, ContainerRestClient containerRestClient) = BuildRestClients(_uri); _serviceRestClient = serviceRestClient; _containerRestClient = containerRestClient; @@ -180,7 +180,7 @@ public BlobBatchClient(BlobContainerClient client) BlobServiceClientInternals.GetAuthenticationPolicy(blobServiceClient), _version); - (ServiceRestClient serviceRestClient, ContainerRestClient containerRestClient) = BuildRestClients(); + (ServiceRestClient serviceRestClient, ContainerRestClient containerRestClient) = BuildRestClients(blobServiceClient.Uri); _serviceRestClient = serviceRestClient; _containerRestClient = containerRestClient; _containerName = client.Name; @@ -224,22 +224,18 @@ private static HttpPipeline CreateBatchPipeline( authenticationPolicy); } - private (ServiceRestClient ServiceClient, ContainerRestClient ContainerClient) BuildRestClients() + private (ServiceRestClient ServiceClient, ContainerRestClient ContainerClient) BuildRestClients(Uri serviceUri) { - BlobUriBuilder uriBuilder = new BlobUriBuilder(_uri); - uriBuilder.BlobContainerName = null; - uriBuilder.BlobName = null; - ServiceRestClient serviceRestClient = new ServiceRestClient( clientDiagnostics: _clientDiagnostics, pipeline: _pipeline, - url: uriBuilder.ToUri().ToString(), + url: serviceUri.AbsoluteUri, version: _version.ToVersionString()); ContainerRestClient containerRestClient = new ContainerRestClient( clientDiagnostics: _clientDiagnostics, pipeline: _pipeline, - url: uriBuilder.ToUri().ToString(), + url: serviceUri.AbsoluteUri, version: _version.ToVersionString()); return (serviceRestClient, containerRestClient); diff --git a/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs b/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs index 20b445b00ffc5..abeeb4a18fe02 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs @@ -84,10 +84,7 @@ protected AppendBlobClient() public AppendBlobClient(string connectionString, string blobContainerName, string blobName) : base(connectionString, blobContainerName, blobName) { - _appendBlobRestClient = BuildAppendBlobRestClient( - connectionString, - blobContainerName, - blobName); + _appendBlobRestClient = BuildAppendBlobRestClient(_uri); } /// @@ -115,10 +112,7 @@ public AppendBlobClient(string connectionString, string blobContainerName, strin public AppendBlobClient(string connectionString, string blobContainerName, string blobName, BlobClientOptions options) : base(connectionString, blobContainerName, blobName, options) { - _appendBlobRestClient = BuildAppendBlobRestClient( - connectionString, - blobContainerName, - blobName); + _appendBlobRestClient = BuildAppendBlobRestClient(_uri); AssertNoClientSideEncryption(options); } @@ -255,35 +249,12 @@ private static void AssertNoClientSideEncryption(BlobClientOptions options) } } - private AppendBlobRestClient BuildAppendBlobRestClient(Uri uri) - => BuildAppendBlobRestClient(new BlobUriBuilder(uri)); - - private AppendBlobRestClient BuildAppendBlobRestClient( - string connectionString, - string blobContainerName, - string blobName) - { - StorageConnectionString conn = StorageConnectionString.Parse(connectionString); - BlobUriBuilder uriBuilder = new BlobUriBuilder(conn.BlobEndpoint) - { - BlobContainerName = blobContainerName, - BlobName = blobName - }; - return BuildAppendBlobRestClient(uriBuilder); - } - - private AppendBlobRestClient BuildAppendBlobRestClient(BlobUriBuilder uriBuilder) + private AppendBlobRestClient BuildAppendBlobRestClient(Uri blobUri) { - string containerName = uriBuilder.BlobContainerName; - string blobName = uriBuilder.BlobName; - uriBuilder.BlobContainerName = null; - uriBuilder.BlobName = null; return new AppendBlobRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToUri().ToString(), - containerName: containerName, - blob: blobName.EscapePath(), + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs index 0eefde3e6a1f9..49e8664ed5c3e 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs @@ -29,7 +29,7 @@ public class BlobBaseClient /// /// The blob's primary endpoint. /// - private readonly Uri _uri; + private protected readonly Uri _uri; /// /// Gets the blob's primary endpoint. @@ -166,10 +166,6 @@ protected BlobBaseClient() public BlobBaseClient(string connectionString, string blobContainerName, string blobName) : this(connectionString, blobContainerName, blobName, null) { - _blobRestClient = BuildBlobRestClient( - connectionString, - blobContainerName, - blobName); } /// @@ -217,10 +213,7 @@ public BlobBaseClient(string connectionString, string blobContainerName, string encryptionScope: options.EncryptionScope); _clientSideEncryption = options._clientSideEncryptionOptions?.Clone(); - _blobRestClient = BuildBlobRestClient( - connectionString, - blobContainerName, - blobName); + _blobRestClient = BuildBlobRestClient(_uri); BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _clientConfiguration.CustomerProvidedKey); BlobErrors.VerifyCpkAndEncryptionScopeNotBothSet(_clientConfiguration.CustomerProvidedKey, _clientConfiguration.EncryptionScope); @@ -425,35 +418,12 @@ internal BlobBaseClient( BlobErrors.VerifyCpkAndEncryptionScopeNotBothSet(_clientConfiguration.CustomerProvidedKey, _clientConfiguration.EncryptionScope); } - private BlobRestClient BuildBlobRestClient(Uri uri) - => BuildBlobRestClient(new BlobUriBuilder(uri)); - - private BlobRestClient BuildBlobRestClient( - string connectionString, - string blobContainerName, - string blobName) - { - StorageConnectionString conn = StorageConnectionString.Parse(connectionString); - BlobUriBuilder uriBuilder = new BlobUriBuilder(conn.BlobEndpoint) - { - BlobContainerName = blobContainerName, - BlobName = blobName, - }; - return BuildBlobRestClient(uriBuilder); - } - - private BlobRestClient BuildBlobRestClient(BlobUriBuilder uriBuilder) + private BlobRestClient BuildBlobRestClient(Uri blobUri) { - string containerName = uriBuilder.BlobContainerName; - string blobName = uriBuilder.BlobName; - uriBuilder.BlobContainerName = null; - uriBuilder.BlobName = null; return new BlobRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToUri().ToString(), - containerName: containerName, - blob: blobName.EscapePath(), + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs index ccfd1c0ab132e..ee4da4cc8fc60 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs @@ -416,17 +416,12 @@ protected static BlobContainerClient CreateClient(Uri containerUri, BlobClientOp clientSideEncryption: null); } - private ContainerRestClient BuildContainerRestClient(Uri uri) + private ContainerRestClient BuildContainerRestClient(Uri containerUri) { - BlobUriBuilder uriBuilder = new BlobUriBuilder(uri); - string containerName = uriBuilder.BlobContainerName; - uriBuilder.BlobContainerName = null; - return new ContainerRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToString(), - containerName: containerName, + url: containerUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); } #endregion ctor diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobUriBuilder.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobUriBuilder.cs index c1cca821e001e..c37de1deeab35 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobUriBuilder.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobUriBuilder.cs @@ -306,7 +306,7 @@ private RequestUriBuilder BuildUri() path.Append('/').Append(BlobContainerName); if (BlobName != null && BlobName.Length > 0) { - path.Append('/').Append(Uri.EscapeDataString(BlobName)); + path.Append('/').Append(BlobName.EscapePath()); } } diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs index 02442e59e833a..ebccbaa72ab07 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs @@ -171,10 +171,7 @@ protected BlockBlobClient() public BlockBlobClient(string connectionString, string containerName, string blobName) : base(connectionString, containerName, blobName) { - _blockBlobRestClient = BuildBlockBlobRestClient( - connectionString, - containerName, - blobName); + _blockBlobRestClient = BuildBlockBlobRestClient(_uri); } /// @@ -204,10 +201,7 @@ public BlockBlobClient(string connectionString, string containerName, string blo public BlockBlobClient(string connectionString, string blobContainerName, string blobName, BlobClientOptions options) : base(connectionString, blobContainerName, blobName, options) { - _blockBlobRestClient = BuildBlockBlobRestClient( - connectionString, - blobContainerName, - blobName); + _blockBlobRestClient = BuildBlockBlobRestClient(_uri); AssertNoClientSideEncryption(options); } @@ -372,35 +366,12 @@ private static void AssertNoClientSideEncryption(BlobClientOptions options) } } - private BlockBlobRestClient BuildBlockBlobRestClient( - string connectionString, - string blobContainerName, - string blobName) - { - StorageConnectionString conn = StorageConnectionString.Parse(connectionString); - BlobUriBuilder uriBuilder = new BlobUriBuilder(conn.BlobEndpoint) - { - BlobContainerName = blobContainerName, - BlobName = blobName - }; - return BuildBlockBlobRestClient(uriBuilder); - } - - private BlockBlobRestClient BuildBlockBlobRestClient(Uri uri) - => BuildBlockBlobRestClient(new BlobUriBuilder(uri)); - - private BlockBlobRestClient BuildBlockBlobRestClient(BlobUriBuilder uriBuilder) + private BlockBlobRestClient BuildBlockBlobRestClient(Uri blobUri) { - string containerName = uriBuilder.BlobContainerName; - string blobName = uriBuilder.BlobName; - uriBuilder.BlobContainerName = null; - uriBuilder.BlobName = null; return new BlockBlobRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToUri().ToString(), - containerName: containerName, - blob: blobName.EscapePath(), + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs index 5bd0c7ad90511..9b91712bb9579 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs @@ -19,8 +19,6 @@ namespace Azure.Storage.Blobs internal partial class AppendBlobRestClient { private string url; - private string containerName; - private string blob; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -29,32 +27,20 @@ internal partial class AppendBlobRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The container name. - /// The blob name. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public AppendBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string containerName, string blob, string version = "2020-08-04") + /// or is null. + public AppendBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-08-04") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (containerName == null) - { - throw new ArgumentNullException(nameof(containerName)); - } - if (blob == null) - { - throw new ArgumentNullException(nameof(blob)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.containerName = containerName; - this.blob = blob; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -67,10 +53,6 @@ internal HttpMessage CreateCreateRequest(long contentLength, int? timeout, strin request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -251,10 +233,6 @@ internal HttpMessage CreateAppendBlockRequest(long contentLength, Stream body, i request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "appendblock", true); if (timeout != null) { @@ -410,10 +388,6 @@ internal HttpMessage CreateAppendBlockFromUrlRequest(string sourceUrl, long cont request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "appendblock", true); if (timeout != null) { @@ -599,10 +573,6 @@ internal HttpMessage CreateSealRequest(int? timeout, string leaseId, DateTimeOff request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "seal", true); if (timeout != null) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobGetAccountInfoHeaders.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobGetAccountInfoHeaders.cs deleted file mode 100644 index 7878cfb215128..0000000000000 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobGetAccountInfoHeaders.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using Azure; -using Azure.Core; -using Azure.Storage.Blobs.Models; - -namespace Azure.Storage.Blobs -{ - internal partial class BlobGetAccountInfoHeaders - { - private readonly Response _response; - public BlobGetAccountInfoHeaders(Response response) - { - _response = response; - } - /// Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above. - public string Version => _response.Headers.TryGetValue("x-ms-version", out string value) ? value : null; - /// Identifies the sku name of the account. - public SkuName? SkuName => _response.Headers.TryGetValue("x-ms-sku-name", out string value) ? value.ToSkuName() : null; - /// Identifies the account kind. - public AccountKind? AccountKind => _response.Headers.TryGetValue("x-ms-account-kind", out string value) ? value.ToAccountKind() : null; - } -} diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs index 5ed1dbb413a8c..3d812125b2dfa 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs @@ -20,8 +20,6 @@ namespace Azure.Storage.Blobs internal partial class BlobRestClient { private string url; - private string containerName; - private string blob; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -30,32 +28,20 @@ internal partial class BlobRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The container name. - /// The blob name. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public BlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string containerName, string blob, string version = "2020-08-04") + /// or is null. + public BlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-08-04") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (containerName == null) - { - throw new ArgumentNullException(nameof(containerName)); - } - if (blob == null) - { - throw new ArgumentNullException(nameof(blob)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.containerName = containerName; - this.blob = blob; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -69,10 +55,6 @@ internal HttpMessage CreateDownloadRequest(string snapshot, string versionId, in request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (snapshot != null) { uri.AppendQuery("snapshot", snapshot, true); @@ -220,10 +202,6 @@ internal HttpMessage CreateGetPropertiesRequest(string snapshot, string versionI request.Method = RequestMethod.Head; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (snapshot != null) { uri.AppendQuery("snapshot", snapshot, true); @@ -341,10 +319,6 @@ internal HttpMessage CreateDeleteRequest(string snapshot, string versionId, int? request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (snapshot != null) { uri.AppendQuery("snapshot", snapshot, true); @@ -456,10 +430,6 @@ internal HttpMessage CreateUndeleteRequest(int? timeout) request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "undelete", true); if (timeout != null) { @@ -512,10 +482,6 @@ internal HttpMessage CreateSetExpiryRequest(BlobExpiryOptions expiryOptions, int request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "expiry", true); if (timeout != null) { @@ -577,10 +543,6 @@ internal HttpMessage CreateSetHttpHeadersRequest(int? timeout, string blobCacheC request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "properties", true); if (timeout != null) { @@ -705,10 +667,6 @@ internal HttpMessage CreateSetImmutabilityPolicyRequest(int? timeout, DateTimeOf request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "immutabilityPolicies", true); if (timeout != null) { @@ -779,10 +737,6 @@ internal HttpMessage CreateDeleteImmutabilityPolicyRequest(int? timeout) request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "immutabilityPolicies", true); if (timeout != null) { @@ -835,10 +789,6 @@ internal HttpMessage CreateSetLegalHoldRequest(bool legalHold, int? timeout) request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "legalhold", true); if (timeout != null) { @@ -894,10 +844,6 @@ internal HttpMessage CreateSetMetadataRequest(int? timeout, IDictionary SetTier(AccessTier tier, string s } } - internal HttpMessage CreateGetAccountInfoRequest() - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Get; - var uri = new RawRequestUriBuilder(); - uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); - uri.AppendQuery("restype", "account", true); - uri.AppendQuery("comp", "properties", true); - request.Uri = uri; - request.Headers.Add("x-ms-version", version); - request.Headers.Add("Accept", "application/xml"); - return message; - } - - /// Returns the sku name and account kind. - /// The cancellation token to use. - public async Task> GetAccountInfoAsync(CancellationToken cancellationToken = default) - { - using var message = CreateGetAccountInfoRequest(); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - var headers = new BlobGetAccountInfoHeaders(message.Response); - switch (message.Response.Status) - { - case 200: - return ResponseWithHeaders.FromValue(headers, message.Response); - default: - throw await _clientDiagnostics.CreateRequestFailedExceptionAsync(message.Response).ConfigureAwait(false); - } - } - - /// Returns the sku name and account kind. - /// The cancellation token to use. - public ResponseWithHeaders GetAccountInfo(CancellationToken cancellationToken = default) - { - using var message = CreateGetAccountInfoRequest(); - _pipeline.Send(message, cancellationToken); - var headers = new BlobGetAccountInfoHeaders(message.Response); - switch (message.Response.Status) - { - case 200: - return ResponseWithHeaders.FromValue(headers, message.Response); - default: - throw _clientDiagnostics.CreateRequestFailedException(message.Response); - } - } - internal HttpMessage CreateQueryRequest(string snapshot, int? timeout, string leaseId, string encryptionKey, string encryptionKeySha256, EncryptionAlgorithmTypeInternal? encryptionAlgorithm, DateTimeOffset? ifModifiedSince, DateTimeOffset? ifUnmodifiedSince, string ifMatch, string ifNoneMatch, string ifTags, QueryRequest queryRequest) { var message = _pipeline.CreateMessage(); @@ -2225,10 +2080,6 @@ internal HttpMessage CreateQueryRequest(string snapshot, int? timeout, string le request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "query", true); if (snapshot != null) { @@ -2358,10 +2209,6 @@ internal HttpMessage CreateGetTagsRequest(int? timeout, string snapshot, string request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "tags", true); if (timeout != null) { @@ -2454,10 +2301,6 @@ internal HttpMessage CreateSetTagsRequest(int? timeout, string versionId, byte[] request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "tags", true); if (timeout != null) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs index 352d2add300bd..b31753f471789 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs @@ -20,8 +20,6 @@ namespace Azure.Storage.Blobs internal partial class BlockBlobRestClient { private string url; - private string containerName; - private string blob; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -30,32 +28,20 @@ internal partial class BlockBlobRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The container name. - /// The blob name. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public BlockBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string containerName, string blob, string version = "2020-08-04") + /// or is null. + public BlockBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-08-04") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (containerName == null) - { - throw new ArgumentNullException(nameof(containerName)); - } - if (blob == null) - { - throw new ArgumentNullException(nameof(blob)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.containerName = containerName; - this.blob = blob; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -68,10 +54,6 @@ internal HttpMessage CreateUploadRequest(long contentLength, Stream body, int? t request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -281,10 +263,6 @@ internal HttpMessage CreatePutBlobFromUrlRequest(long contentLength, string copy request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -512,10 +490,6 @@ internal HttpMessage CreateStageBlockRequest(string blockId, long contentLength, request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "block", true); uri.AppendQuery("blockid", blockId, true); if (timeout != null) @@ -640,10 +614,6 @@ internal HttpMessage CreateStageBlockFromURLRequest(string blockId, long content request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "block", true); uri.AppendQuery("blockid", blockId, true); if (timeout != null) @@ -796,10 +766,6 @@ internal HttpMessage CreateCommitBlockListRequest(BlockLookupList blocks, int? t request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "blocklist", true); if (timeout != null) { @@ -1014,10 +980,6 @@ internal HttpMessage CreateGetBlockListRequest(BlockListType listType, string sn request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "blocklist", true); if (snapshot != null) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerGetAccountInfoHeaders.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerGetAccountInfoHeaders.cs deleted file mode 100644 index 0466402689cf9..0000000000000 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerGetAccountInfoHeaders.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using Azure; -using Azure.Core; -using Azure.Storage.Blobs.Models; - -namespace Azure.Storage.Blobs -{ - internal partial class ContainerGetAccountInfoHeaders - { - private readonly Response _response; - public ContainerGetAccountInfoHeaders(Response response) - { - _response = response; - } - /// Indicates the version of the Blob service used to execute the request. This header is returned for requests made against version 2009-09-19 and above. - public string Version => _response.Headers.TryGetValue("x-ms-version", out string value) ? value : null; - /// Identifies the sku name of the account. - public SkuName? SkuName => _response.Headers.TryGetValue("x-ms-sku-name", out string value) ? value.ToSkuName() : null; - /// Identifies the account kind. - public AccountKind? AccountKind => _response.Headers.TryGetValue("x-ms-account-kind", out string value) ? value.ToAccountKind() : null; - } -} diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs index b55953a766ff2..4221298f55770 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs @@ -20,7 +20,6 @@ namespace Azure.Storage.Blobs internal partial class ContainerRestClient { private string url; - private string containerName; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -29,26 +28,20 @@ internal partial class ContainerRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The container name. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public ContainerRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string containerName, string version = "2020-08-04") + /// or is null. + public ContainerRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-08-04") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (containerName == null) - { - throw new ArgumentNullException(nameof(containerName)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.containerName = containerName; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -61,8 +54,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, IDictionary Returns the sku name and account kind. - /// The cancellation token to use. - public async Task> GetAccountInfoAsync(CancellationToken cancellationToken = default) - { - using var message = CreateGetAccountInfoRequest(); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - var headers = new ContainerGetAccountInfoHeaders(message.Response); - switch (message.Response.Status) - { - case 200: - return ResponseWithHeaders.FromValue(headers, message.Response); - default: - throw await _clientDiagnostics.CreateRequestFailedExceptionAsync(message.Response).ConfigureAwait(false); - } - } - - /// Returns the sku name and account kind. - /// The cancellation token to use. - public ResponseWithHeaders GetAccountInfo(CancellationToken cancellationToken = default) - { - using var message = CreateGetAccountInfoRequest(); - _pipeline.Send(message, cancellationToken); - var headers = new ContainerGetAccountInfoHeaders(message.Response); - switch (message.Response.Status) - { - case 200: - return ResponseWithHeaders.FromValue(headers, message.Response); - default: - throw _clientDiagnostics.CreateRequestFailedException(message.Response); - } - } - internal HttpMessage CreateListBlobFlatSegmentNextPageRequest(string nextLink, string prefix, string marker, int? maxresults, IEnumerable include, int? timeout) { var message = _pipeline.CreateMessage(); diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs index 6dcd3ae72af33..a4cc70537fb6c 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs @@ -20,8 +20,6 @@ namespace Azure.Storage.Blobs internal partial class PageBlobRestClient { private string url; - private string containerName; - private string blob; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -30,32 +28,20 @@ internal partial class PageBlobRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The container name. - /// The blob name. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public PageBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string containerName, string blob, string version = "2020-08-04") + /// or is null. + public PageBlobRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-08-04") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (containerName == null) - { - throw new ArgumentNullException(nameof(containerName)); - } - if (blob == null) - { - throw new ArgumentNullException(nameof(blob)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.containerName = containerName; - this.blob = blob; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -68,10 +54,6 @@ internal HttpMessage CreateCreateRequest(long contentLength, long blobContentLen request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -267,10 +249,6 @@ internal HttpMessage CreateUploadPagesRequest(long contentLength, Stream body, b request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "page", true); if (timeout != null) { @@ -439,10 +417,6 @@ internal HttpMessage CreateClearPagesRequest(long contentLength, int? timeout, s request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "page", true); if (timeout != null) { @@ -582,10 +556,6 @@ internal HttpMessage CreateUploadPagesFromURLRequest(string sourceUrl, string so request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "page", true); if (timeout != null) { @@ -792,10 +762,6 @@ internal HttpMessage CreateGetPageRangesRequest(string snapshot, int? timeout, s request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "pagelist", true); if (snapshot != null) { @@ -912,10 +878,6 @@ internal HttpMessage CreateGetPageRangesDiffRequest(string snapshot, int? timeou request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "pagelist", true); if (snapshot != null) { @@ -1044,10 +1006,6 @@ internal HttpMessage CreateResizeRequest(long blobContentLength, int? timeout, s request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "properties", true); if (timeout != null) { @@ -1163,10 +1121,6 @@ internal HttpMessage CreateUpdateSequenceNumberRequest(SequenceNumberAction sequ request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "properties", true); if (timeout != null) { @@ -1264,10 +1218,6 @@ internal HttpMessage CreateCopyIncrementalRequest(string copySource, int? timeou request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(containerName, false); - uri.AppendPath("/", false); - uri.AppendPath(blob, false); uri.AppendQuery("comp", "incrementalcopy", true); if (timeout != null) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/PageBlobClient.cs b/sdk/storage/Azure.Storage.Blobs/src/PageBlobClient.cs index 102d646d795df..032b71ffc7172 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/PageBlobClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/PageBlobClient.cs @@ -86,10 +86,7 @@ protected PageBlobClient() public PageBlobClient(string connectionString, string blobContainerName, string blobName) : base(connectionString, blobContainerName, blobName) { - _pageBlobRestClient = BuildPageBlobRestClient( - connectionString, - blobContainerName, - blobName); + _pageBlobRestClient = BuildPageBlobRestClient(_uri); } /// @@ -119,6 +116,7 @@ public PageBlobClient(string connectionString, string blobContainerName, string public PageBlobClient(string connectionString, string blobContainerName, string blobName, BlobClientOptions options) : base(connectionString, blobContainerName, blobName, options) { + _pageBlobRestClient = BuildPageBlobRestClient(_uri); AssertNoClientSideEncryption(options); } @@ -250,35 +248,12 @@ private static void AssertNoClientSideEncryption(BlobClientOptions options) } } - private PageBlobRestClient BuildPageBlobRestClient( - string connectionString, - string blobContainerName, - string blobName) - { - StorageConnectionString conn = StorageConnectionString.Parse(connectionString); - BlobUriBuilder uriBuilder = new BlobUriBuilder(conn.BlobEndpoint) - { - BlobContainerName = blobContainerName, - BlobName = blobName - }; - return BuildPageBlobRestClient(uriBuilder); - } - - private PageBlobRestClient BuildPageBlobRestClient(Uri uri) - => BuildPageBlobRestClient(new BlobUriBuilder(uri)); - - private PageBlobRestClient BuildPageBlobRestClient(BlobUriBuilder uriBuilder) + private PageBlobRestClient BuildPageBlobRestClient(Uri blobUri) { - string containerName = uriBuilder.BlobContainerName; - string blobName = uriBuilder.BlobName; - uriBuilder.BlobContainerName = null; - uriBuilder.BlobName = null; return new PageBlobRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToUri().ToString(), - containerName: containerName, - blob: blobName.EscapePath(), + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Blobs/src/autorest.md b/sdk/storage/Azure.Storage.Blobs/src/autorest.md index fdcd9c11be7b0..2ada715a27f87 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/autorest.md +++ b/sdk/storage/Azure.Storage.Blobs/src/autorest.md @@ -98,7 +98,7 @@ directive: delete $.EncryptionScope["x-ms-parameter-grouping"]; ``` -### Add containerName and blob as a parameter +### Remove Container_GetAccountInfo and Blob_GetAccountInfo. Unused and clashes with Service_GetAccountInfo after removal of path params. ``` yaml directive: - from: swagger-document @@ -106,26 +106,63 @@ directive: transform: > for (const property in $) { - if (property.includes('{containerName}')) + if (property.includes('/{containerName}?restype=account&comp=properties')) { - if (!$[property].parameters) - { - $[property].parameters = []; - } - $[property].parameters.push({ - "$ref": "#/parameters/ContainerName" - }); - }; - if (property.includes('{blob}')) + delete $[property]; + } + if (property.includes('/{containerName}/{blob}?restype=account&comp=properties')) { - if (!$[property].parameters) - { - $[property].parameters = []; - } - $[property].parameters.push({ - "$ref": "#/parameters/Blob" - }); - }; + delete $[property]; + } + } +``` + +### Fix 304s +``` yaml +directive: +- from: swagger-document + where: $["x-ms-paths"]["/{containerName}/{blob}"] + transform: > + $.get.responses["304"] = { + "description": "The condition specified using HTTP conditional header(s) is not met.", + "x-az-response-name": "ConditionNotMetError", + "headers": { "x-ms-error-code": { "x-ms-client-name": "ErrorCode", "type": "string" } } + }; +``` + +### Don't include container or blob in path - we have direct URIs. +``` yaml +directive: +- from: swagger-document + where: $["x-ms-paths"] + transform: > + for (const property in $) + { + if (property.includes('/{containerName}/{blob}')) + { + var oldName = property; + var newName = property.replace('/{containerName}/{blob}', ''); + $[newName] = $[oldName]; + delete $[oldName]; + } + else if (property.includes('/{containerName}')) + { + var oldName = property; + var newName = property.replace('/{containerName}', ''); + $[newName] = $[oldName]; + delete $[oldName]; + } + } +``` + +### Remove DataLake stuff. +``` yaml +directive: +- from: swagger-document + where: $["x-ms-paths"] + transform: > + for (const property in $) + { if (property.includes('filesystem')) { delete $[property]; @@ -267,19 +304,6 @@ directive: ]; ``` -### Fix 304s -``` yaml -directive: -- from: swagger-document - where: $["x-ms-paths"]["/{containerName}/{blob}"] - transform: > - $.get.responses["304"] = { - "description": "The condition specified using HTTP conditional header(s) is not met.", - "x-az-response-name": "ConditionNotMetError", - "headers": { "x-ms-error-code": { "x-ms-client-name": "ErrorCode", "type": "string" } } - }; -``` - ### Don't buffer downloads and query ``` yaml diff --git a/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs index e9f42f160d943..3d90882e61632 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs @@ -13,6 +13,7 @@ using Azure.Storage.Blobs.Models; using Azure.Storage.Blobs.Specialized; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Moq; @@ -159,8 +160,8 @@ public void WithSnapshot() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string snapshot = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?snapshot={snapshot}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?snapshot={snapshot}"); // Act AppendBlobClient appendBlobClient = new AppendBlobClient(uri); @@ -188,8 +189,8 @@ public void WithVersion() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string versionId = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?versionid={versionId}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?versionid={versionId}"); // Act AppendBlobClient appendBlobClient = new AppendBlobClient(uri); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs index d3fe9ec816308..6ec48b2de3f84 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs @@ -16,6 +16,7 @@ using Azure.Storage.Blobs.Specialized; using Azure.Storage.Blobs.Tests; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Moq; @@ -7197,8 +7198,8 @@ public void WithSnapshot() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string snapshot = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?snapshot={snapshot}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?snapshot={snapshot}"); // Act BlobBaseClient blobBaseClient = new BlobBaseClient(uri); @@ -7226,8 +7227,8 @@ public void WithVersion() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string versionId = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?versionid={versionId}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?versionid={versionId}"); // Act BlobBaseClient blobBaseClient = new BlobBaseClient(uri); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs index 8649ed1919444..25d7f77819170 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs @@ -11,6 +11,7 @@ using Azure.Identity; using Azure.Storage.Blobs.Models; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Azure.Storage.Tests; @@ -1286,8 +1287,8 @@ public void WithSnapshot() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string snapshot = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?snapshot={snapshot}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?snapshot={snapshot}"); // Act BlobClient blobClient = new BlobClient(uri); @@ -1315,8 +1316,8 @@ public void WithVersion() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string versionId = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?versionid={versionId}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?versionid={versionId}"); // Act BlobClient blobClient = new BlobClient(uri); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs index 5e4147eb89a1e..32c6b5df46e52 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs @@ -12,6 +12,7 @@ using Azure.Storage.Blobs.Models; using Azure.Storage.Blobs.Specialized; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Moq; @@ -167,8 +168,8 @@ public void WithSnapshot() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string snapshot = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?snapshot={snapshot}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?snapshot={snapshot}"); // Act BlockBlobClient blockBlobClient = new BlockBlobClient(uri); @@ -196,8 +197,8 @@ public void WithVersion() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string versionId = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?versionid={versionId}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?versionid={versionId}"); // Act BlockBlobClient blockBlobClient = new BlockBlobClient(uri); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs index ff9969194dc35..05e69907d0a76 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs @@ -14,6 +14,7 @@ using Azure.Storage.Blobs.Models; using Azure.Storage.Blobs.Specialized; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Moq; @@ -2537,7 +2538,7 @@ public async Task GetBlobClient_SpecialCharacters(string blobName) // Arrange await using DisposingContainer test = await GetTestContainerAsync(); - Uri expectedUri = new Uri($"{TestConfigDefault.BlobServiceEndpoint}/{test.Container.Name}/{Uri.EscapeDataString(blobName)}"); + Uri expectedUri = new Uri($"{TestConfigDefault.BlobServiceEndpoint}/{test.Container.Name}/{blobName.EscapePath()}"); BlobClient initalBlob = new BlobClient( TestConfigDefault.ConnectionString, @@ -2586,7 +2587,7 @@ public async Task GetBlobClients_SpecialCharacters(string blobName) { // Arrange await using DisposingContainer test = await GetTestContainerAsync(); - Uri expectedUri = new Uri($"{TestConfigDefault.BlobServiceEndpoint}/{test.Container.Name}/{Uri.EscapeDataString(blobName)}"); + Uri expectedUri = new Uri($"{TestConfigDefault.BlobServiceEndpoint}/{test.Container.Name}/{blobName.EscapePath()}"); BlobClient blobClientFromContainer = InstrumentClient(test.Container.GetBlobClient(blobName)); BlobClient blobClientFromConnectionString = new BlobClient( diff --git a/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs index 9fb2f7a0c5a5a..99402c30517d7 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs @@ -15,6 +15,7 @@ using Azure.Storage.Blobs.Specialized; using Azure.Storage.Blobs.Tests; using Azure.Storage.Sas; +using Azure.Storage.Shared; using Azure.Storage.Test; using Azure.Storage.Test.Shared; using Azure.Storage.Tests; @@ -2887,8 +2888,8 @@ public void WithSnapshot() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string snapshot = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?snapshot={snapshot}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri snapshotUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?snapshot={snapshot}"); // Act PageBlobClient pageBlobClient = new PageBlobClient(uri); @@ -2916,8 +2917,8 @@ public void WithVersion() string containerName = GetNewContainerName(); string blobName = "my/blob/name"; string versionId = "2020-07-03T12:45:46.1234567Z"; - Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}"); - Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{Uri.EscapeDataString(blobName)}?versionid={versionId}"); + Uri uri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}"); + Uri versionUri = new Uri($"https://{accountName}.blob.core.windows.net/{containerName}/{blobName.EscapePath()}?versionid={versionId}"); // Act PageBlobClient pageBlobClient = new PageBlobClient(uri); diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs index 7a9312c262e0c..dfafe5e3d8b7b 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs @@ -231,7 +231,7 @@ public DataLakeFileSystemClient(string connectionString, string fileSystemName, _blobUri, _clientConfiguration); - (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(_uri); + (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(_dfsUri, _blobUri); _fileSystemRestClient = dfsFileSystemRestClient; _blobFileSystemRestClient = blobFileSystemRestClient; } @@ -399,7 +399,7 @@ internal DataLakeFileSystemClient( _blobUri, _clientConfiguration); - (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(fileSystemUri); + (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(_dfsUri, _blobUri); _fileSystemRestClient = dfsFileSystemRestClient; _blobFileSystemRestClient = blobFileSystemRestClient; } @@ -430,29 +430,23 @@ internal DataLakeFileSystemClient( _blobUri, _clientConfiguration); - (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(fileSystemUri); + (FileSystemRestClient dfsFileSystemRestClient, FileSystemRestClient blobFileSystemRestClient) = BuildFileSystemRestClients(_dfsUri, _blobUri); _fileSystemRestClient = dfsFileSystemRestClient; _blobFileSystemRestClient = blobFileSystemRestClient; } - private (FileSystemRestClient DfsFileSystemRestClient, FileSystemRestClient BlobFileSystemRestClient) BuildFileSystemRestClients(Uri uri) + private (FileSystemRestClient DfsFileSystemRestClient, FileSystemRestClient BlobFileSystemRestClient) BuildFileSystemRestClients(Uri dfsUri, Uri blobUri) { - DataLakeUriBuilder uriBuilder = new DataLakeUriBuilder(uri); - string fileSystemName = uriBuilder.FileSystemName; - uriBuilder.FileSystemName = null; - FileSystemRestClient dfsFileSystemRestClient = new FileSystemRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToDfsUri().ToString(), - fileSystem: fileSystemName, + url: dfsUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); FileSystemRestClient blobFileSystemRestClient = new FileSystemRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToBlobUri().ToString(), - fileSystem: fileSystemName, + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); return (dfsFileSystemRestClient, blobFileSystemRestClient); diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs index 938a5b33f1069..d6cca8a0d8da9 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs @@ -295,7 +295,7 @@ public DataLakePathClient( _blobUri, _clientConfiguration); - (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_uri); + (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_dfsUri, _blobUri); _pathRestClient = dfsPathRestClient; _blobPathRestClient = blobPathRestClient; } @@ -486,7 +486,7 @@ internal DataLakePathClient( uriBuilder.ToDfsUri(), _clientConfiguration); - (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_uri); + (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_dfsUri, _blobUri); _pathRestClient = dfsPathRestClient; _blobPathRestClient = blobPathRestClient; } @@ -537,7 +537,7 @@ internal DataLakePathClient( uriBuilder.ToDfsUri(), _clientConfiguration); - (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_uri); + (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_dfsUri, _blobUri); _pathRestClient = dfsPathRestClient; _blobPathRestClient = blobPathRestClient; } @@ -575,7 +575,7 @@ internal DataLakePathClient( uriBuilder.ToDfsUri(), _clientConfiguration); - (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_uri); + (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_dfsUri, _blobUri); _pathRestClient = dfsPathRestClient; _blobPathRestClient = blobPathRestClient; } @@ -604,33 +604,23 @@ internal DataLakePathClient( uriBuilder.ToDfsUri(), clientConfiguration); - (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_uri); + (PathRestClient dfsPathRestClient, PathRestClient blobPathRestClient) = BuildPathRestClients(_dfsUri, _blobUri); _pathRestClient = dfsPathRestClient; _blobPathRestClient = blobPathRestClient; } - private (PathRestClient DfsPathClient, PathRestClient BlobPathClient) BuildPathRestClients(Uri uri) + private (PathRestClient DfsPathClient, PathRestClient BlobPathClient) BuildPathRestClients(Uri dfsUri, Uri blobUri) { - DataLakeUriBuilder uriBuilder = new DataLakeUriBuilder(uri); - string fileSystmeName = uriBuilder.FileSystemName; - string path = uriBuilder.DirectoryOrFilePath; - uriBuilder.FileSystemName = null; - uriBuilder.DirectoryOrFilePath = null; - PathRestClient dfsPathRestClient = new PathRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToDfsUri().ToString(), - fileSystem: fileSystmeName, - path: path.EscapePath(), + url: dfsUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); PathRestClient blobPathRestClient = new PathRestClient( clientDiagnostics: _clientConfiguration.ClientDiagnostics, pipeline: _clientConfiguration.Pipeline, - url: uriBuilder.ToBlobUri().ToString(), - fileSystem: fileSystmeName, - path: path.EscapePath(), + url: blobUri.AbsoluteUri, version: _clientConfiguration.Version.ToVersionString()); return (dfsPathRestClient, blobPathRestClient); diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/FileSystemRestClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/FileSystemRestClient.cs index 4111d9c9faa58..fa8513094cbb1 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/FileSystemRestClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/FileSystemRestClient.cs @@ -20,7 +20,6 @@ namespace Azure.Storage.Files.DataLake internal partial class FileSystemRestClient { private string url; - private string fileSystem; private string resource; private string version; private ClientDiagnostics _clientDiagnostics; @@ -30,20 +29,15 @@ internal partial class FileSystemRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The filesystem identifier. /// The value must be "filesystem" for all filesystem operations. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public FileSystemRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string fileSystem, string resource = "filesystem", string version = "2020-06-12") + /// , , or is null. + public FileSystemRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string resource = "filesystem", string version = "2020-06-12") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (fileSystem == null) - { - throw new ArgumentNullException(nameof(fileSystem)); - } if (resource == null) { throw new ArgumentNullException(nameof(resource)); @@ -54,7 +48,6 @@ public FileSystemRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi } this.url = url; - this.fileSystem = fileSystem; this.resource = resource; this.version = version; _clientDiagnostics = clientDiagnostics; @@ -68,8 +61,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, string properties) request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("resource", resource, true); if (timeout != null) { @@ -128,8 +119,6 @@ internal HttpMessage CreateSetPropertiesRequest(int? timeout, string properties, request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("resource", resource, true); if (timeout != null) { @@ -200,8 +189,6 @@ internal HttpMessage CreateGetPropertiesRequest(int? timeout) request.Method = RequestMethod.Head; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("resource", resource, true); if (timeout != null) { @@ -254,8 +241,6 @@ internal HttpMessage CreateDeleteRequest(int? timeout, DateTimeOffset? ifModifie request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("resource", resource, true); if (timeout != null) { @@ -320,8 +305,6 @@ internal HttpMessage CreateListPathsRequest(bool recursive, int? timeout, string request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("resource", resource, true); if (timeout != null) { @@ -411,8 +394,6 @@ internal HttpMessage CreateListBlobHierarchySegmentRequest(string prefix, string request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); uri.AppendQuery("restype", "container", true); uri.AppendQuery("comp", "list", true); if (prefix != null) diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/PathRestClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/PathRestClient.cs index a047da4fe8dc8..a803144eaf761 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/PathRestClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/Generated/PathRestClient.cs @@ -19,8 +19,6 @@ namespace Azure.Storage.Files.DataLake internal partial class PathRestClient { private string url; - private string fileSystem; - private string path; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -29,32 +27,20 @@ internal partial class PathRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, container, or blob that is the targe of the desired operation. - /// The filesystem identifier. - /// The file or directory path. /// Specifies the version of the operation to use for this request. - /// , , , or is null. - public PathRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string fileSystem, string path, string version = "2020-06-12") + /// or is null. + public PathRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-06-12") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (fileSystem == null) - { - throw new ArgumentNullException(nameof(fileSystem)); - } - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.fileSystem = fileSystem; - this.path = path; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -67,10 +53,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, PathResourceType? resourc request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -254,10 +236,6 @@ internal HttpMessage CreateUpdateRequest(PathUpdateAction action, PathSetAccessC request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -483,10 +461,6 @@ internal HttpMessage CreateLeaseRequest(PathLeaseAction xMsLeaseAction, int? tim request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -594,10 +568,6 @@ internal HttpMessage CreateReadRequest(int? timeout, string range, string leaseI request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -699,10 +669,6 @@ internal HttpMessage CreateGetPropertiesRequest(int? timeout, PathGetPropertiesA request.Method = RequestMethod.Head; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -796,10 +762,6 @@ internal HttpMessage CreateDeleteRequest(int? timeout, bool? recursive, string c request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -893,10 +855,6 @@ internal HttpMessage CreateSetAccessControlRequest(int? timeout, string leaseId, request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("action", "setAccessControl", true); if (timeout != null) { @@ -1003,10 +961,6 @@ internal HttpMessage CreateSetAccessControlRecursiveRequest(PathSetAccessControl request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("action", "setAccessControlRecursive", true); if (timeout != null) { @@ -1096,10 +1050,6 @@ internal HttpMessage CreateFlushDataRequest(int? timeout, long? position, bool? request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("action", "flush", true); if (timeout != null) { @@ -1238,10 +1188,6 @@ internal HttpMessage CreateAppendDataRequest(Stream body, long? position, int? t request.Method = RequestMethod.Patch; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("action", "append", true); if (position != null) { @@ -1340,10 +1286,6 @@ internal HttpMessage CreateSetExpiryRequest(PathExpiryOptions expiryOptions, int request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("comp", "expiry", true); if (timeout != null) { @@ -1405,10 +1347,6 @@ internal HttpMessage CreateUndeleteRequest(int? timeout, string undeleteSource) request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(fileSystem, true); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("comp", "undelete", true); if (timeout != null) { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/autorest.md b/sdk/storage/Azure.Storage.Files.DataLake/src/autorest.md index 6765a0c95fa63..cbb175ba4878a 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/autorest.md +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/autorest.md @@ -7,29 +7,6 @@ input-file: - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/e3850d6aa56eecad65262d0fc7815be0773bfb85/specification/storage/data-plane/Microsoft.StorageDataLake/stable/2020-06-12/DataLakeStorage.json ``` -### Added FileSystem and Path as parameters -``` yaml -directive: -- from: swagger-document - where: $["x-ms-paths"] - transform: > - for (const property in $) - { - if (property.includes('{filesystem}')) - { - $[property].parameters.push({ - "$ref": "#/parameters/FileSystem" - }); - }; - if (property.includes('{path}')) - { - $[property].parameters.push({ - "$ref": "#/parameters/Path" - }); - }; - } -``` - ### Make sure Path is not encoded ``` yaml directive: @@ -99,4 +76,37 @@ directive: - from: swagger-document where: $..[?(@.operationId=='Path_Read')] transform: $["x-csharp-buffer-response"] = false; -``` \ No newline at end of file +``` + +### Don't include FileSystem and Path in path - we have direct URIs. +``` yaml +directive: +- from: swagger-document + where: $["x-ms-paths"] + transform: > + for (const property in $) + { + if (property.includes('/{filesystem}/{path}')) + { + var oldName = property; + var newName = property.replace('/{filesystem}/{path}', ''); + if (!newName.includes('?')) + { + newName = newName + '?' + 'filesystem_path' + } + $[newName] = $[oldName]; + delete $[oldName]; + } + else if (property.includes('/{filesystem}')) + { + var oldName = property; + var newName = property.replace('/{filesystem}', ''); + if (!newName.includes('?')) + { + newName = newName + '?' + 'filesystem' + } + $[newName] = $[oldName]; + delete $[oldName]; + } + } +``` diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/DirectoryRestClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/DirectoryRestClient.cs index e9e6dba8b56d6..f102ea1127e34 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/DirectoryRestClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/DirectoryRestClient.cs @@ -19,7 +19,6 @@ namespace Azure.Storage.Files.Shares internal partial class DirectoryRestClient { private string url; - private string path; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -28,26 +27,20 @@ internal partial class DirectoryRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, share, directory or file that is the target of the desired operation. - /// path. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public DirectoryRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string path, string version = "2020-04-08") + /// or is null. + public DirectoryRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-04-08") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.path = path; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -60,8 +53,6 @@ internal HttpMessage CreateCreateRequest(string fileAttributes, string fileCreat request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("restype", "directory", true); if (timeout != null) { @@ -169,8 +160,6 @@ internal HttpMessage CreateGetPropertiesRequest(string sharesnapshot, int? timeo request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("restype", "directory", true); if (sharesnapshot != null) { @@ -229,8 +218,6 @@ internal HttpMessage CreateDeleteRequest(int? timeout) request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("restype", "directory", true); if (timeout != null) { @@ -283,8 +270,6 @@ internal HttpMessage CreateSetPropertiesRequest(string fileAttributes, string fi request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("restype", "directory", true); uri.AppendQuery("comp", "properties", true); if (timeout != null) @@ -387,8 +372,6 @@ internal HttpMessage CreateSetMetadataRequest(int? timeout, IDictionary The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, share, directory or file that is the target of the desired operation. - /// path. /// Specifies the version of the operation to use for this request. /// Only update is supported: - Update: Writes the bytes downloaded from the source url into the specified range. - /// , , , or is null. - public FileRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string path, string version = "2020-04-08", string fileRangeWriteFromUrl = "update") + /// , , or is null. + public FileRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-04-08", string fileRangeWriteFromUrl = "update") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); @@ -54,7 +48,6 @@ public FileRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline } this.url = url; - this.path = path; this.version = version; this.fileRangeWriteFromUrl = fileRangeWriteFromUrl; _clientDiagnostics = clientDiagnostics; @@ -68,8 +61,6 @@ internal HttpMessage CreateCreateRequest(long fileContentLength, string fileAttr request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -213,8 +204,6 @@ internal HttpMessage CreateDownloadRequest(int? timeout, string range, bool? ran request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -292,8 +281,6 @@ internal HttpMessage CreateGetPropertiesRequest(string sharesnapshot, int? timeo request.Method = RequestMethod.Head; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (sharesnapshot != null) { uri.AppendQuery("sharesnapshot", sharesnapshot, true); @@ -357,8 +344,6 @@ internal HttpMessage CreateDeleteRequest(int? timeout, ShareFileRequestCondition request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); if (timeout != null) { uri.AppendQuery("timeout", timeout.Value, true); @@ -416,8 +401,6 @@ internal HttpMessage CreateSetHttpHeadersRequest(string fileAttributes, string f request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(path, false); uri.AppendQuery("comp", "properties", true); if (timeout != null) { @@ -557,8 +540,6 @@ internal HttpMessage CreateSetMetadataRequest(int? timeout, IDictionary The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, share, directory or file that is the target of the desired operation. - /// path. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public ShareRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string path, string version = "2020-04-08") + /// or is null. + public ShareRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2020-04-08") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.path = path; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -61,8 +54,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, IDictionary - $.Path = { - "name": "path", - "in": "path", - "required": true, - "type": "string", - "description": "path.", - "x-ms-skip-url-encoding": true - }; -- from: swagger-document - where: $["x-ms-paths"] - transform: > - for (const property in $) - { - if (property.includes('{shareName}')) - { - $[property].parameters.push({ - "$ref": "#/parameters/Path" - }); - }; - } - from: swagger-document where: $["x-ms-paths"] transform: > Object.keys($).map(id => { - if (id.includes('{shareName}/{directory}/{fileName}')) + if (id.includes('/{shareName}/{directory}/{fileName}')) { - $[id.replace('{shareName}/{directory}/{fileName}', '{path}?restype=file')] = $[id]; + $[id.replace('/{shareName}/{directory}/{fileName}', '?shareName_dir_file')] = $[id]; delete $[id]; } - if (id.includes('{shareName}/{directory}')) + else if (id.includes('/{shareName}/{directory}')) { - $[id.replace('{shareName}/{directory}', '{path}?restype=directory')] = $[id]; + $[id.replace('/{shareName}/{directory}', '?shareName_dir')] = $[id]; delete $[id]; } - if (id.includes('{shareName}')) + else if (id.includes('/{shareName}')) { - $[id.replace('{shareName}', '{path}')] = $[id]; + $[id.replace('/{shareName}', '?shareName')] = $[id]; delete $[id]; } }); diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiName.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiName.json index 23b9143aa40e6..a4308c2865b6f 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiName.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiName.json @@ -1,151 +1,150 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-82ffd24453e5a448902fc86a60061f3a-c01e9778277da84c-00", + "traceparent": "00-66468c10bc22cc49925f37b98bee1333-c0e5617bc51e9c4a-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "6bc9eaac-4553-2d2a-521e-33b0050386c0", - "x-ms-date": "Tue, 26 Jan 2021 19:47:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:43 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:49 GMT", - "ETag": "\u00220x8D8C233433E076F\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", + "ETag": "\u00220x8D926D71F64E6FF\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "6bc9eaac-4553-2d2a-521e-33b0050386c0", - "x-ms-request-id": "1ceb8089-d01a-0055-3c1c-f4ca49000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be61fe-e01a-0023-67bf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33/test-directory-c4c09be4-dada-3013-48c8-8b5bfad58ed8?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33/test-directory-c4c09be4-dada-3013-48c8-8b5bfad58ed8?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-f7911421fc890443b4ced44aeb36505b-2fbb7c7cc476fc43-00", + "traceparent": "00-695f9c0d8b016642ac3fc1ac5224d8d6-0dead7b858c05648-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "6089927d-e386-d171-d798-228bb9ce337d", - "x-ms-date": "Tue, 26 Jan 2021 19:47:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:43 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:49 GMT", - "ETag": "\u00220x8D8C23343493BDF\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", + "ETag": "\u00220x8D926D71F7503B4\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "6089927d-e386-d171-d798-228bb9ce337d", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:47:50.0918751Z", - "x-ms-file-creation-time": "2021-01-26T19:47:50.0918751Z", + "x-ms-file-change-time": "2021-06-03T21:32:43.7222324Z", + "x-ms-file-creation-time": "2021-06-03T21:32:43.7222324Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:47:50.0918751Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:43.7222324Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "1ceb808c-d01a-0055-3d1c-f4ca49000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6201-e01a-0023-68bf-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-a9df13451cf43943b25343ae177afb3b-9d8cb8f5f079c84f-00", + "traceparent": "00-5e99f9f4559d634982a050f7cf0e82b8-cdcafc66c82bfd45-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "67deb35a-2e4b-1652-5af2-98f88d539870", - "x-ms-date": "Tue, 26 Jan 2021 19:47:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:43 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:47:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "67deb35a-2e4b-1652-5af2-98f88d539870", - "x-ms-request-id": "1ceb808e-d01a-0055-3e1c-f4ca49000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6203-e01a-0023-69bf-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-directory-c4c09be4-dada-3013-48c8-8b5bfad58ed8\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-directory-c4c09be4-dada-3013-48c8-8b5bfad58ed8\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-673ba618-4d5f-8a43-1fa3-19705a5a1c33?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-1b90bd503782a8468beffb253b451488-622d2f6ad0f4894b-00", + "traceparent": "00-ac7801d69fedd2469bf81341825c0958-e2b61dff0e6da346-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "0630861b-cbef-6131-089f-dd4c7d37a568", - "x-ms-date": "Tue, 26 Jan 2021 19:47:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:43 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "0630861b-cbef-6131-089f-dd4c7d37a568", - "x-ms-request-id": "1ceb808f-d01a-0055-3f1c-f4ca49000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6204-e01a-0023-6abf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "1372161637", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiNameAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiNameAsync.json index 1d09d644c45a8..d11ae74d1b9dd 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiNameAsync.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_AsciiNameAsync.json @@ -1,150 +1,149 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-5f97c63f3e4b08498f56d9a906be2581-25e62856d5ce224e-00", + "traceparent": "00-f1890a6583dbe94ebc4fe68e24483fc0-aefc1b145c0f6e4a-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "338f0641-e619-f690-e01c-8b5a7d180dda", - "x-ms-date": "Tue, 26 Jan 2021 19:27:33 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", - "ETag": "\u00220x8D8C2306DE9295A\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", + "ETag": "\u00220x8D926D72004EDE9\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "338f0641-e619-f690-e01c-8b5a7d180dda", - "x-ms-request-id": "e50398ff-f01a-0089-4719-f46017000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be620a-e01a-0023-6fbf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d/test-directory-6314197c-121a-af64-6681-700a62dfbb4b?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d/test-directory-6314197c-121a-af64-6681-700a62dfbb4b?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-311700e2d732e040be30b25fad85b306-41fbf566c553bf4c-00", + "traceparent": "00-9338f8bf7e6ed0469d71d6fbfaf066a1-187b7f589270084c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "c5c43ec3-a7a5-2ed5-a1df-cc9876869401", - "x-ms-date": "Tue, 26 Jan 2021 19:27:33 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", - "ETag": "\u00220x8D8C2306DF3C462\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", + "ETag": "\u00220x8D926D72014950B\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "c5c43ec3-a7a5-2ed5-a1df-cc9876869401", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:27:33.1836002Z", - "x-ms-file-creation-time": "2021-01-26T19:27:33.1836002Z", + "x-ms-file-change-time": "2021-06-03T21:32:44.7679755Z", + "x-ms-file-creation-time": "2021-06-03T21:32:44.7679755Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:27:33.1836002Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:44.7679755Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "e5039902-f01a-0089-4819-f46017000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be620c-e01a-0023-70bf-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "2346af96-f51a-9da6-4a66-fd779acb0f95", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "2346af96-f51a-9da6-4a66-fd779acb0f95", - "x-ms-request-id": "e5039904-f01a-0089-4919-f46017000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be620d-e01a-0023-71bf-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-directory-6314197c-121a-af64-6681-700a62dfbb4b\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-directory-6314197c-121a-af64-6681-700a62dfbb4b\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-49ea854b-7cdb-9b20-0550-0fd6a5e59a7d?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-72965c689feab14583935795828c4702-5bf1410a4eafb64e-00", + "traceparent": "00-61d2219d6fce7047a23736d2426efd37-9fd4c08bac1ad344-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "c6022a3f-703f-6be6-9977-131c700c7aea", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "c6022a3f-703f-6be6-9977-131c700c7aea", - "x-ms-request-id": "e5039905-f01a-0089-4a19-f46017000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be620e-e01a-0023-72bf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "225527521", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiName.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiName.json index 11868edb81493..b2e6cb7316fc9 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiName.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiName.json @@ -1,151 +1,150 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-96bff0eb8a1417498038ffee538f50f1-39833235dc1e8847-00", + "traceparent": "00-14a8b6b9f5ec0b46bb09b85a09ca3d8f-ff207f0743239045-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "3c5d7e20-1245-c4ee-99d5-c4a7b45f7b5c", - "x-ms-date": "Tue, 26 Jan 2021 19:47:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:49 GMT", - "ETag": "\u00220x8D8C23343853C56\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", + "ETag": "\u00220x8D926D71FA508FA\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "3c5d7e20-1245-c4ee-99d5-c4a7b45f7b5c", - "x-ms-request-id": "1fd23808-101a-0065-641c-f47486000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6205-e01a-0023-6bbf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710/test-dire\u00A2t \u00D8\u00AE\u03D2%253A-cfadc948-6be9-7ba2-48ef-9ba331872133?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710/test-dire\u00A2t \u00D8\u00AE\u03D2%253A-cfadc948-6be9-7ba2-48ef-9ba331872133?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-4371aa0cbaf0c74e85fb23beaf5f5a20-d5ae5c85a4f6bc46-00", + "traceparent": "00-1948a9d000ca9640a9f0b1a48bfc0fad-6adbfce34da03e4b-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "78891d0a-6703-b44e-dbe2-f356774b9211", - "x-ms-date": "Tue, 26 Jan 2021 19:47:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:49 GMT", - "ETag": "\u00220x8D8C23343910050\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", + "ETag": "\u00220x8D926D71FB5259B\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "78891d0a-6703-b44e-dbe2-f356774b9211", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:47:50.5622096Z", - "x-ms-file-creation-time": "2021-01-26T19:47:50.5622096Z", + "x-ms-file-change-time": "2021-06-03T21:32:44.1425307Z", + "x-ms-file-creation-time": "2021-06-03T21:32:44.1425307Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:47:50.5622096Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:44.1425307Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "1fd2380b-101a-0065-651c-f47486000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6207-e01a-0023-6cbf-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-fbb58148c54a8b4a85358a81e492b3b0-e152b495c91daa4d-00", + "traceparent": "00-92bbdd1a9ff2194fb10c79cd1f1d8552-d6adbb0b9318eb4e-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "14982ca6-a8fe-1a30-fa45-203978741de9", - "x-ms-date": "Tue, 26 Jan 2021 19:47:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "14982ca6-a8fe-1a30-fa45-203978741de9", - "x-ms-request-id": "1fd2380d-101a-0065-661c-f47486000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6208-e01a-0023-6dbf-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-dire\u00A2t \u00D8\u00AE\u03D2%3A-cfadc948-6be9-7ba2-48ef-9ba331872133\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-dire\u00A2t \u00D8\u00AE\u03D2%3A-cfadc948-6be9-7ba2-48ef-9ba331872133\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-69ec0b9c-aa28-6359-e5b9-811a7b79a710?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-964b7cd208fedb4cbfa1f2e690528d76-e2ba2a64f9ce3e4a-00", + "traceparent": "00-47c47830b70b904ba5235cbb8cac0b32-1e960033fbc3cf42-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "4bafc6c3-7eb2-0b13-600a-70205d066489", - "x-ms-date": "Tue, 26 Jan 2021 19:47:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:44 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:47:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:43 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "4bafc6c3-7eb2-0b13-600a-70205d066489", - "x-ms-request-id": "1fd2380f-101a-0065-671c-f47486000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6209-e01a-0023-6ebf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "1547102232", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiNameAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiNameAsync.json index 122a307ffacc0..5730c31ed4bd0 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiNameAsync.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/GetDirectoryAsync_NonAsciiNameAsync.json @@ -1,150 +1,149 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-3c190693266cbf479e989a5290cd5ebb-3c367b6a5cd8da44-00", + "traceparent": "00-911f2ced947a3041b0dcc2c8ad549097-0ba5dd87c4d7e942-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "460731e9-f432-7c73-5500-8fc135a190dc", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:45 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", - "ETag": "\u00220x8D8C2306E2F7FEC\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", + "ETag": "\u00220x8D926D7203751EA\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "460731e9-f432-7c73-5500-8fc135a190dc", - "x-ms-request-id": "90aaf56e-801a-0005-7219-f40819000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be620f-e01a-0023-73bf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e/test-dire\u00A2t \u00D8\u00AE\u03D2%253A-4816ebc2-a42f-d37a-ede0-f6804cbde1de?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e/test-dire\u00A2t \u00D8\u00AE\u03D2%253A-4816ebc2-a42f-d37a-ede0-f6804cbde1de?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-c9f5d63648bcf14f81c3886d19edabec-1698e50ef5e22641-00", + "traceparent": "00-9fbda533ab0123429a8b4cea91478c8a-292c6fbc20c8a346-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "da4a1c85-dbbc-4412-b734-5852fdf22f98", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:45 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", - "ETag": "\u00220x8D8C2306E3C2530\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", + "ETag": "\u00220x8D926D72044D58E\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:45 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "da4a1c85-dbbc-4412-b734-5852fdf22f98", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:27:33.6579376Z", - "x-ms-file-creation-time": "2021-01-26T19:27:33.6579376Z", + "x-ms-file-change-time": "2021-06-03T21:32:45.0841998Z", + "x-ms-file-creation-time": "2021-06-03T21:32:45.0841998Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:27:33.6579376Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:45.0841998Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "90aaf571-801a-0005-7319-f40819000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6211-e01a-0023-74bf-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "30fb2654-0772-2821-3ac1-cd2917083993", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:45 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "30fb2654-0772-2821-3ac1-cd2917083993", - "x-ms-request-id": "90aaf573-801a-0005-7419-f40819000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6212-e01a-0023-75bf-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-67a044a7-4496-a8ca-b129-90f0b665b68e\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-dire\u00A2t \u00D8\u00AE\u03D2%3A-4816ebc2-a42f-d37a-ede0-f6804cbde1de\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-67a044a7-4496-a8ca-b129-90f0b665b68e\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Etest-dire\u00A2t \u00D8\u00AE\u03D2%3A-4816ebc2-a42f-d37a-ede0-f6804cbde1de\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-67a044a7-4496-a8ca-b129-90f0b665b68e?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-a426f67b484e98408be365ee4cef4f67-d57425bfabfac741-00", + "traceparent": "00-01b2cdcd8c5fac41b4b185ed4975cc78-9b9a5bd670cbad4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "d7fd00a5-fff6-1625-8f93-add93f543b87", - "x-ms-date": "Tue, 26 Jan 2021 19:27:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:45 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:27:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:44 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "d7fd00a5-fff6-1625-8f93-add93f543b87", - "x-ms-request-id": "90aaf574-801a-0005-7519-f40819000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6213-e01a-0023-76bf-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "955420153", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%).json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%).json index fdce799db626d..4ff1bc16433d5 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%).json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%).json @@ -1,112 +1,111 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-3a37b40896ed914b96b3502dba920597-203164b01b29c44f-00", + "traceparent": "00-9f2ce01649aa0c408b022d16ef875b72-9ffc8774c1769f4f-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "40406e7a-e636-d086-a6ef-1fc610392528", - "x-ms-date": "Tue, 26 Jan 2021 19:34:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:49 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:30 GMT", - "ETag": "\u00220x8D8C23166884758\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:48 GMT", + "ETag": "\u00220x8D926D722D9C934\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "40406e7a-e636-d086-a6ef-1fc610392528", - "x-ms-request-id": "f571e0fd-601a-0050-5b1a-f41892000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be621a-e01a-0023-79c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483/?sv=2020-08-04\u0026st=2021-01-26T18%3A34%3A31Z\u0026se=2021-01-26T20%3A34%3A31Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483?sv=2020-08-04\u0026st=2021-06-03T20%3A32%3A49Z\u0026se=2021-06-03T22%3A32%3A49Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "76dce3a0-84f0-b44c-07b5-feb05f2bca16", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:29 GMT", - "ETag": "\u00220x8D8C23166AFE05B\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:48 GMT", + "ETag": "\u00220x8D926D722E5EB71\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "76dce3a0-84f0-b44c-07b5-feb05f2bca16", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:34:30.4913499Z", - "x-ms-file-creation-time": "2021-01-26T19:34:30.4913499Z", + "x-ms-file-change-time": "2021-06-03T21:32:49.4953329Z", + "x-ms-file-creation-time": "2021-06-03T21:32:49.4953329Z", "x-ms-file-id": "0", - "x-ms-file-last-write-time": "2021-01-26T19:34:30.4913499Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:49.4953329Z", "x-ms-file-parent-id": "0", - "x-ms-request-id": "446f2c88-e01a-0071-3e1a-f43ce9000000", + "x-ms-request-id": "f1be621d-e01a-0023-7ac0-585072000000", "x-ms-server-encrypted": "false", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-a67d09cc-c48e-743b-049a-a657e431c483?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-bde4f28cf8fc7a4facb6333011f61691-06326e9bf7dfaf4b-00", + "traceparent": "00-40697ceb680f7c4bbfda6904b86ed0b8-4ea746c0097a6648-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "2d258056-af5c-4938-7588-2979294deeeb", - "x-ms-date": "Tue, 26 Jan 2021 19:34:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:49 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "2d258056-af5c-4938-7588-2979294deeeb", - "x-ms-request-id": "446f2c8b-e01a-0071-3f1a-f43ce9000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be621e-e01a-0023-7bc0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { - "DateTimeOffsetNow": "2021-01-26T13:34:31.0722179-06:00", + "DateTimeOffsetNow": "2021-06-03T14:32:49.5194414-07:00", "RandomSeed": "82004787", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%)Async.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%)Async.json index fbc972b0de34a..da47b19f36d33 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%)Async.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%LDWCR%)Async.json @@ -1,112 +1,111 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-7797c68f34f7b1409feb122855fed9d6-5a853c515ab4474b-00", + "traceparent": "00-2ae4065e6f0f744582a4710d3d05caea-b07266f55ed69d4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "4cfa67d0-f87e-cdc5-968a-877d9ecf2cf7", - "x-ms-date": "Tue, 26 Jan 2021 19:34:33 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:49 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:32 GMT", - "ETag": "\u00220x8D8C23168329C3B\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D72329A592\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "4cfa67d0-f87e-cdc5-968a-877d9ecf2cf7", - "x-ms-request-id": "4f1fcdb0-701a-003e-431a-f44dbd000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6223-e01a-0023-7fc0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516/?sv=2020-08-04\u0026st=2021-01-26T18%3A34%3A33Z\u0026se=2021-01-26T20%3A34%3A33Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516?sv=2020-08-04\u0026st=2021-06-03T20%3A32%3A50Z\u0026se=2021-06-03T22%3A32%3A50Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "814e351a-e8bf-9b97-46f0-085b8c6d28ea", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:33 GMT", - "ETag": "\u00220x8D8C231685A5BC1\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D72335795D\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "814e351a-e8bf-9b97-46f0-085b8c6d28ea", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:34:33.2863425Z", - "x-ms-file-creation-time": "2021-01-26T19:34:33.2863425Z", + "x-ms-file-change-time": "2021-06-03T21:32:50.0167005Z", + "x-ms-file-creation-time": "2021-06-03T21:32:50.0167005Z", "x-ms-file-id": "0", - "x-ms-file-last-write-time": "2021-01-26T19:34:33.2863425Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:50.0167005Z", "x-ms-file-parent-id": "0", - "x-ms-request-id": "e265bce6-601a-007f-601a-f41559000000", + "x-ms-request-id": "f1be6225-e01a-0023-80c0-585072000000", "x-ms-server-encrypted": "false", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-c90aa5c9-5038-fbd3-1f16-751fe9b93516?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-d9a09ecb2ab0ce46bcdc6b86b4e88ea6-fcf7c9a822fa6b4e-00", + "traceparent": "00-032a31b4d11f924c8fb0fdb140cd0558-3e31616387daf54b-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "686291a2-aa80-1738-67c3-d81967a8294c", - "x-ms-date": "Tue, 26 Jan 2021 19:34:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "686291a2-aa80-1738-67c3-d81967a8294c", - "x-ms-request-id": "e265bce9-601a-007f-611a-f41559000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6226-e01a-0023-01c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { - "DateTimeOffsetNow": "2021-01-26T13:34:33.8677666-06:00", + "DateTimeOffsetNow": "2021-06-03T14:32:50.0420801-07:00", "RandomSeed": "1000458038", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%).json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%).json index 5e4a39840c941..497e88892ba91 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%).json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%).json @@ -1,112 +1,111 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-93302aa1437c0e48b13e2437e2c7f462-ce21f12875cef547-00", + "traceparent": "00-f69e926287a88a4ab5e585f5f05e5d73-c48e0843725b484c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "7f5e2982-11b9-2b40-4ea9-7bd539388953", - "x-ms-date": "Tue, 26 Jan 2021 19:34:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:49 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:30 GMT", - "ETag": "\u00220x8D8C23166DF56B8\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D722FFA7A7\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "7f5e2982-11b9-2b40-4ea9-7bd539388953", - "x-ms-request-id": "be95084d-601a-000d-4e1a-f41216000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be621f-e01a-0023-7cc0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7/?sv=2020-08-04\u0026st=2021-01-26T18%3A34%3A31Z\u0026se=2021-01-26T20%3A34%3A31Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7?sv=2020-08-04\u0026st=2021-06-03T20%3A32%3A49Z\u0026se=2021-06-03T22%3A32%3A49Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "a3c501f7-0f20-8e2e-9d35-620649598783", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:30 GMT", - "ETag": "\u00220x8D8C2316704C69D\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:31 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D7230FC21D\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "a3c501f7-0f20-8e2e-9d35-620649598783", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:34:31.0477469Z", - "x-ms-file-creation-time": "2021-01-26T19:34:31.0477469Z", + "x-ms-file-change-time": "2021-06-03T21:32:49.7695261Z", + "x-ms-file-creation-time": "2021-06-03T21:32:49.7695261Z", "x-ms-file-id": "0", - "x-ms-file-last-write-time": "2021-01-26T19:34:31.0477469Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:49.7695261Z", "x-ms-file-parent-id": "0", - "x-ms-request-id": "3d3b115c-f01a-007d-4a1a-f4abe1000000", + "x-ms-request-id": "f1be6221-e01a-0023-7dc0-585072000000", "x-ms-server-encrypted": "false", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-b00ad570-fa45-6f56-5b15-3547cd7e8ee7?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-dcfd097ee035f443bdf9f42c217b5628-bc31bf57653b6e47-00", + "traceparent": "00-321c2d635fac954db724384f39d6e782-2ca46be5e27de84a-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "38dd669d-e673-6c32-e257-498b320a624c", - "x-ms-date": "Tue, 26 Jan 2021 19:34:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:49 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "38dd669d-e673-6c32-e257-498b320a624c", - "x-ms-request-id": "3d3b1160-f01a-007d-4c1a-f4abe1000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6222-e01a-0023-7ec0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { - "DateTimeOffsetNow": "2021-01-26T13:34:31.6432248-06:00", + "DateTimeOffsetNow": "2021-06-03T14:32:49.7923581-07:00", "RandomSeed": "1205265387", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%)Async.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%)Async.json index 3d6ebd5299448..b56bd85e64662 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%)Async.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileSasBuilderTests/SharePermissionsRawPermissions(%rcwdl%)Async.json @@ -1,112 +1,111 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-62af2330ed8b354287aee3f259fe1fbf-5b8ce1e9d4b72041-00", + "traceparent": "00-3fb101692c7adf418fbcbcfc7241acdb-2e6bc53c24af4940-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "305101c2-19ad-1df4-525a-961f6d5d76a5", - "x-ms-date": "Tue, 26 Jan 2021 19:34:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:33 GMT", - "ETag": "\u00220x8D8C2316889C652\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D7234DAEEA\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "305101c2-19ad-1df4-525a-961f6d5d76a5", - "x-ms-request-id": "f57e2ec2-b01a-0053-381a-f4f9f6000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6227-e01a-0023-02c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d/?sv=2020-08-04\u0026st=2021-01-26T18%3A34%3A34Z\u0026se=2021-01-26T20%3A34%3A34Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d?sv=2020-08-04\u0026st=2021-06-03T20%3A32%3A50Z\u0026se=2021-06-03T22%3A32%3A50Z\u0026sr=s\u0026sp=rcwdl\u0026sig=Sanitized\u0026restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "b767d9a0-7b1c-5860-5226-57c5ad336782", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:33 GMT", - "ETag": "\u00220x8D8C23168AD9419\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", + "ETag": "\u00220x8D926D7236C71DC\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "b767d9a0-7b1c-5860-5226-57c5ad336782", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:34:33.8317337Z", - "x-ms-file-creation-time": "2021-01-26T19:34:33.8317337Z", + "x-ms-file-change-time": "2021-06-03T21:32:50.3769564Z", + "x-ms-file-creation-time": "2021-06-03T21:32:50.3769564Z", "x-ms-file-id": "0", - "x-ms-file-last-write-time": "2021-01-26T19:34:33.8317337Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:50.3769564Z", "x-ms-file-parent-id": "0", - "x-ms-request-id": "2a9931c0-e01a-005e-261a-f43122000000", + "x-ms-request-id": "f1be6229-e01a-0023-03c0-585072000000", "x-ms-server-encrypted": "false", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-91bb8318-284b-fd7a-5223-f529b96dac0d?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-051f2e4013acc04eb0900f5324949e40-77ee4c11dc93f94b-00", + "traceparent": "00-49a9b9d4636ac545844be5259af3bb5c-c8b3f3d575a46e4e-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "947f3a6a-bef5-8789-9d87-6aea4e8c26fc", - "x-ms-date": "Tue, 26 Jan 2021 19:34:34 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:34:33 GMT", + "Date": "Thu, 03 Jun 2021 21:32:49 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "947f3a6a-bef5-8789-9d87-6aea4e8c26fc", - "x-ms-request-id": "2a9931c3-e01a-005e-271a-f43122000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be622a-e01a-0023-04c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { - "DateTimeOffsetNow": "2021-01-26T13:34:34.4368231-06:00", + "DateTimeOffsetNow": "2021-06-03T14:32:50.4011799-07:00", "RandomSeed": "1721918969", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%).json" "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%).json" index 933a7850827fd..1a9dbddc2cfa1 100644 --- "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%).json" +++ "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%).json" @@ -1,192 +1,190 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-db4c64caa4eedd49a156c8fcf1ae1640-8d94654c8833ff46-00", + "traceparent": "00-0cd28cc462662043a8801b03dc13fe35-4bc4efbdae27f248-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "cd771048-0802-ec19-e553-28fae75814ad", - "x-ms-date": "Tue, 26 Jan 2021 19:24:27 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:26 GMT", - "ETag": "\u00220x8D8C22FFF0436CC\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723A94D57\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "cd771048-0802-ec19-e553-28fae75814ad", - "x-ms-request-id": "108509e8-d01a-0037-0a18-f4086e000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be622d-e01a-0023-05c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-c11e7d809865a847bb97178af1613fe8-c09f3576ea205444-00", + "traceparent": "00-08d008a565afc144bf5b0c43ef7ba6ad-7e5dfb4de801f843-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "0966da4c-b1b6-7021-80cd-7bd89278fe70", - "x-ms-date": "Tue, 26 Jan 2021 19:24:27 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:26 GMT", - "ETag": "\u00220x8D8C22FFF147A91\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723B56EFF\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "0966da4c-b1b6-7021-80cd-7bd89278fe70", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:27.1708817Z", - "x-ms-file-creation-time": "2021-01-26T19:24:27.1708817Z", + "x-ms-file-change-time": "2021-06-03T21:32:50.8552959Z", + "x-ms-file-creation-time": "2021-06-03T21:32:50.8552959Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:27.1708817Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:50.8552959Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "108509eb-d01a-0037-0b18-f4086e000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be622f-e01a-0023-06c0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "0dae7308-0bf1-f5f7-d894-639da15a8fa9", - "x-ms-date": "Tue, 26 Jan 2021 19:24:28 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:50 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:27 GMT", - "ETag": "\u00220x8D8C22FFF147A91\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723B56EFF\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "0dae7308-0bf1-f5f7-d894-639da15a8fa9", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:27.1708817Z", - "x-ms-file-creation-time": "2021-01-26T19:24:27.1708817Z", + "x-ms-file-change-time": "2021-06-03T21:32:50.8552959Z", + "x-ms-file-creation-time": "2021-06-03T21:32:50.8552959Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:27.1708817Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:50.8552959Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "884d6e99-301a-0000-5b18-f4dac2000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6231-e01a-0023-07c0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-80eef8fae18ee643a84220254c7ae29e-4ec63ad97e455149-00", + "traceparent": "00-f112b2099879f8418f329a564ab02c62-dc3bcaa4ec196a45-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "1fcfc007-f1ca-9d7e-85fd-4f04d6998982", - "x-ms-date": "Tue, 26 Jan 2021 19:24:28 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "1fcfc007-f1ca-9d7e-85fd-4f04d6998982", - "x-ms-request-id": "884d6e9c-301a-0000-5c18-f4dac2000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6232-e01a-0023-08c0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E!\u0027();[]@\u0026amp;%=\u002B$,#\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF;\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E!\u0027();[]@\u0026amp;%=\u002B$,#\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF;\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ace796dd-500e-6cc5-546a-7bae1a2e7f24?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-5492d548225d6142b68213889fe6aaaf-bf1fd9a064bf474f-00", + "traceparent": "00-d098d3634d4b9b45aa039d9667b9616c-8973b27086d6c644-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "e195ab49-708b-12de-f50a-2439d2173c09", - "x-ms-date": "Tue, 26 Jan 2021 19:24:28 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "e195ab49-708b-12de-f50a-2439d2173c09", - "x-ms-request-id": "884d6e9e-301a-0000-5e18-f4dac2000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6233-e01a-0023-09c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "761096666", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%)Async.json" "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%)Async.json" index 4ed2e93ed1681..765b9cac07247 100644 --- "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%)Async.json" +++ "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%!'();[]@&%=+$,#\303\244\303\204\303\266\303\226\303\274\303\234\303\237;%)Async.json" @@ -1,191 +1,189 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-1d921512ca2cfb4c986985727e13c670-0a1381d8c5760043-00", + "traceparent": "00-d2d45a8627f4de48ac539f28d761ca6b-2e06574024c70848-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "dd0aa9f3-7797-32d0-e8c9-4b5409d4ba1c", - "x-ms-date": "Tue, 26 Jan 2021 19:24:49 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:48 GMT", - "ETag": "\u00220x8D8C2300C338C27\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D724F3BD99\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "dd0aa9f3-7797-32d0-e8c9-4b5409d4ba1c", - "x-ms-request-id": "d4326ab6-201a-0041-0a18-f48226000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6246-e01a-0023-19c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-81b179ccf8809946aeeca8992ff4927e-eb1994eb16004943-00", + "traceparent": "00-4b0c07f4f25033488d257a388e5c1fdf-f8112ab10ae26d42-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "201bcb01-5d95-fb74-82f6-16d84bb4e0e8", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:48 GMT", - "ETag": "\u00220x8D8C2300C3EA687\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D725007ABD\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "201bcb01-5d95-fb74-82f6-16d84bb4e0e8", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:49.2576391Z", - "x-ms-file-creation-time": "2021-01-26T19:24:49.2576391Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.0248381Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.0248381Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:49.2576391Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.0248381Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "d4326ab9-201a-0041-0b18-f48226000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6249-e01a-0023-1ac0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c/%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "3e52cfcd-99b8-be87-38cb-787d05a89850", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:48 GMT", - "ETag": "\u00220x8D8C2300C3EA687\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D725007ABD\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "3e52cfcd-99b8-be87-38cb-787d05a89850", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:49.2576391Z", - "x-ms-file-creation-time": "2021-01-26T19:24:49.2576391Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.0248381Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.0248381Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:49.2576391Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.0248381Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "e50397de-f01a-0089-6718-f46017000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be624a-e01a-0023-1bc0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "7b0b8e19-a161-b730-2743-108d78acd17f", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:48 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "7b0b8e19-a161-b730-2743-108d78acd17f", - "x-ms-request-id": "e50397e1-f01a-0089-6818-f46017000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be624b-e01a-0023-1cc0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E!\u0027();[]@\u0026amp;%=\u002B$,#\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF;\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E!\u0027();[]@\u0026amp;%=\u002B$,#\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF;\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-73ea0d7a-1fa9-f17f-9ced-690fca9f3a0c?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-51c8d66b5ce25d4e8b0e06e104031253-362f313f6bf9f543-00", + "traceparent": "00-ef74894f95022e4f8bdf865c09021576-f150abcde2e95143-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "76642891-1c9d-7fef-9c95-7f19a29597f4", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:48 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "76642891-1c9d-7fef-9c95-7f19a29597f4", - "x-ms-request-id": "e50397e2-f01a-0089-6918-f46017000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be624c-e01a-0023-1dc0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "155079301", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%).json" "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%).json" index a93d162032765..f8200db789553 100644 --- "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%).json" +++ "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%).json" @@ -1,192 +1,190 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-cf7061f9cd2f1c4d84cc568825946e15-8f2fbc5110ae5a47-00", + "traceparent": "00-e99fb5700102344fbdfdb9731c8874fc-3c89571e59632c4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "ad7362ed-bc0d-90c6-22b4-45d23a846201", - "x-ms-date": "Tue, 26 Jan 2021 19:24:28 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:27 GMT", - "ETag": "\u00220x8D8C22FFF857BF6\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723E59E2E\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "ad7362ed-bc0d-90c6-22b4-45d23a846201", - "x-ms-request-id": "17341938-201a-009a-0b18-f4441b000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6234-e01a-0023-0ac0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-78de7e4b23f7b948b490e9d65f09ca4b-71a8b2793faf4c41-00", + "traceparent": "00-5dd2278c677abc43af1a526891bcdfe4-e7bb3e7857970246-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "e4e8a65e-11b2-d626-7aee-548947ba0373", - "x-ms-date": "Tue, 26 Jan 2021 19:24:28 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:27 GMT", - "ETag": "\u00220x8D8C22FFF913B5B\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723FCE540\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "e4e8a65e-11b2-d626-7aee-548947ba0373", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:27.9884635Z", - "x-ms-file-creation-time": "2021-01-26T19:24:27.9884635Z", + "x-ms-file-change-time": "2021-06-03T21:32:51.3236288Z", + "x-ms-file-creation-time": "2021-06-03T21:32:51.3236288Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:27.9884635Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:51.3236288Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "1734193c-201a-009a-0c18-f4441b000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6236-e01a-0023-0bc0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "94734c57-7e9b-214e-e7e3-95c9e8c41988", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", - "ETag": "\u00220x8D8C22FFF913B5B\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:27 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", + "ETag": "\u00220x8D926D723FCE540\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "94734c57-7e9b-214e-e7e3-95c9e8c41988", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:27.9884635Z", - "x-ms-file-creation-time": "2021-01-26T19:24:27.9884635Z", + "x-ms-file-change-time": "2021-06-03T21:32:51.3236288Z", + "x-ms-file-creation-time": "2021-06-03T21:32:51.3236288Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:27.9884635Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:51.3236288Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "ed2cf0ed-901a-0054-5318-f49595000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6237-e01a-0023-0cc0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-ba29d05b7c91ca46b18d5319df886a17-872c627b79f82c4d-00", + "traceparent": "00-3398b8909178ad46a81a8ba21ab5d87a-77a2818e39a2dd40-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "fa32a6d8-6f47-60d7-c367-adefd90bc84f", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", + "Date": "Thu, 03 Jun 2021 21:32:50 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "fa32a6d8-6f47-60d7-c367-adefd90bc84f", - "x-ms-request-id": "ed2cf0f0-901a-0054-5418-f49595000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6238-e01a-0023-0dc0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-1429d0ed-8da4-0031-85dd-33d64625be33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-1429d0ed-8da4-0031-85dd-33d64625be33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-1429d0ed-8da4-0031-85dd-33d64625be33?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-74ad857bf06e9b4fbfe9cd6a41d57b8c-c1780381f5089e4e-00", + "traceparent": "00-853c3e6cb67bf0419dc1027531f5828a-25fa8535e1ce9e4e-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "41f07fad-1e92-7641-d222-a484193617c6", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "41f07fad-1e92-7641-d222-a484193617c6", - "x-ms-request-id": "ed2cf0f1-901a-0054-5518-f49595000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6239-e01a-0023-0ec0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "1916785726", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%)Async.json" "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%)Async.json" index e861640be08d8..3138539eb33b6 100644 --- "a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%)Async.json" +++ "b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\303\244\303\204\303\266\303\226\303\274\303\234\303\237%3B%)Async.json" @@ -1,191 +1,189 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-3906b2233a33d94cb53239cf2c82500a-45ffdc968ca4254f-00", + "traceparent": "00-7f413386de51724d9a06c12daa976bd2-db8476e45883634f-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "b0b5def1-7445-0dc0-67b1-be46a8e2d0b3", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:49 GMT", - "ETag": "\u00220x8D8C2300CA45808\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D725331C27\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "b0b5def1-7445-0dc0-67b1-be46a8e2d0b3", - "x-ms-request-id": "ec1ed3cf-101a-0017-3a18-f473c9000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be624d-e01a-0023-1ec0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-f518801eaa1dde4ea6da68447290e62a-2cf3d4c9f5d45d4e-00", + "traceparent": "00-e5894bb8ea1c0b4486720225037603b9-1807d38641a1b346-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "e481a5b6-804b-c517-8e93-bfb73fda2623", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:49 GMT", - "ETag": "\u00220x8D8C2300CAFA577\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D7253F3CDB\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "e481a5b6-804b-c517-8e93-bfb73fda2623", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:49.9981687Z", - "x-ms-file-creation-time": "2021-01-26T19:24:49.9981687Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.4361307Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.4361307Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:49.9981687Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.4361307Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "ec1ed3d2-101a-0017-3b18-f473c9000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be624f-e01a-0023-1fc0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d/%2521%2527%2528%2529%253B%255B%255D%2540%2526%2525%253D%252B%2524%252C%2523\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%253B?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "028fb290-ec61-8268-a18c-485c1b204fac", - "x-ms-date": "Tue, 26 Jan 2021 19:24:50 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:49 GMT", - "ETag": "\u00220x8D8C2300CAFA577\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:52 GMT", + "ETag": "\u00220x8D926D7253F3CDB\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "028fb290-ec61-8268-a18c-485c1b204fac", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:49.9981687Z", - "x-ms-file-creation-time": "2021-01-26T19:24:49.9981687Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.4361307Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.4361307Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:49.9981687Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.4361307Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "53671a77-b01a-006c-2918-f43155000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6250-e01a-0023-20c0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "8d2755b8-244a-08c2-2ccd-1b95b051fae5", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "8d2755b8-244a-08c2-2ccd-1b95b051fae5", - "x-ms-request-id": "53671a7b-b01a-006c-2b18-f43155000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6251-e01a-0023-21c0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-cc7ea68b-79a0-974f-8085-4372c300305d\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-cc7ea68b-79a0-974f-8085-4372c300305d\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003E%21%27%28%29%3B%5B%5D%40%26%25%3D%2B%24%2C%23\u00E4\u00C4\u00F6\u00D6\u00FC\u00DC\u00DF%3B\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-cc7ea68b-79a0-974f-8085-4372c300305d?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-1102cb661019f6428d3d9437d13469f5-79630d31c5a6d042-00", + "traceparent": "00-87df18abb9d6174499e6551d25eec734-bd0b695cfb870e43-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "c6a49e76-c1f9-6462-dfdf-71de48540da6", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:49 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "c6a49e76-c1f9-6462-dfdf-71de48540da6", - "x-ms-request-id": "53671a7c-b01a-006c-2c18-f43155000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6252-e01a-0023-22c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "950539642", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%).json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%).json index 258fe0f76f58c..fcda4709585db 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%).json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%).json @@ -1,192 +1,190 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-96f41027564a144183f59d07568017c4-dac80cab2a062843-00", + "traceparent": "00-dc7367a6ccddf541bde9d9365442546a-428f734a4f6c9d4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "19612234-e1b6-9ac0-afa0-0c9405d5279e", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", - "ETag": "\u00220x8D8C230012FD1CA\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D7247DDBA8\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "19612234-e1b6-9ac0-afa0-0c9405d5279e", - "x-ms-request-id": "52e066fc-901a-0009-8018-f49f11000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6240-e01a-0023-14c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448/directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448/directory?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-a7a6ba5e2e3b7a4fa4380ba7d16b1f21-b2f1dcecc8ed4f44-00", + "traceparent": "00-b06e86bee275644490543bd6a13043d6-eee805299382f04a-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "ce1891f9-ca24-6492-a438-b01f74388315", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", - "ETag": "\u00220x8D8C2300139BAA9\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D7248B5C84\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "ce1891f9-ca24-6492-a438-b01f74388315", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:30.7704489Z", - "x-ms-file-creation-time": "2021-01-26T19:24:30.7704489Z", + "x-ms-file-change-time": "2021-06-03T21:32:52.2572932Z", + "x-ms-file-creation-time": "2021-06-03T21:32:52.2572932Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:30.7704489Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:52.2572932Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "52e066ff-901a-0009-0118-f49f11000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6242-e01a-0023-15c0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448/directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448/directory?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "749a934e-58bd-ac79-0672-e29db9c2a271", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", - "ETag": "\u00220x8D8C2300139BAA9\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D7248B5C84\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:52 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "749a934e-58bd-ac79-0672-e29db9c2a271", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:30.7704489Z", - "x-ms-file-creation-time": "2021-01-26T19:24:30.7704489Z", + "x-ms-file-change-time": "2021-06-03T21:32:52.2572932Z", + "x-ms-file-creation-time": "2021-06-03T21:32:52.2572932Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:30.7704489Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:52.2572932Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "90aaf385-801a-0005-0518-f40819000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6243-e01a-0023-16c0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-7cde202e130dd643abb338f3405c0dd7-dc7edcd11fad6d47-00", + "traceparent": "00-04be7f361a30d54e97ac304c5947e8b0-424eb2d2f268bf4c-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "e1d09239-0f9d-2d57-499d-b7048724117d", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "e1d09239-0f9d-2d57-499d-b7048724117d", - "x-ms-request-id": "90aaf389-801a-0005-0618-f40819000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6244-e01a-0023-17c0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-27737598-fd50-a952-c5ea-284df186e448\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Edirectory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-27737598-fd50-a952-c5ea-284df186e448\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Edirectory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-27737598-fd50-a952-c5ea-284df186e448?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-0d26d659447e6c4f8990f92d5f099dcd-fa6ec152bb70eb42-00", + "traceparent": "00-ce10e4f2497293419aed0300aa2b257e-f973c360fc610e45-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "27635ab2-c1f2-57d3-cff0-8fa9dbfd08aa", - "x-ms-date": "Tue, 26 Jan 2021 19:24:32 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "27635ab2-c1f2-57d3-cff0-8fa9dbfd08aa", - "x-ms-request-id": "90aaf38a-801a-0005-0718-f40819000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6245-e01a-0023-18c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "1661684217", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%)Async.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%)Async.json index 4b89e8ecfe0e2..77d7c527e6694 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%)Async.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%directory%)Async.json @@ -1,191 +1,189 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-666df9ec8ac5034ea03c854bb3813577-ac0142614658a948-00", + "traceparent": "00-a77502eddce8b343bdc9e2bb6f1efcba-5fbdbec8ece83c49-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "f5eebc2d-73d5-a5cf-5b23-a88fabd0099c", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:54 GMT", - "ETag": "\u00220x8D8C2300ECCC36E\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:53 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D725CEDE96\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:54 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "f5eebc2d-73d5-a5cf-5b23-a88fabd0099c", - "x-ms-request-id": "2f9eb120-701a-0011-5b18-f44076000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be625a-e01a-0023-29c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b/directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b/directory?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-0553e2b9731a6942b68f2816c974bc49-0462b5efc3348846-00", + "traceparent": "00-33f01e8c61f5284186055f82024ce9ea-f582a95f33c02e41-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "0e1c4aff-9953-4fc5-efa7-28a82bd80e0e", - "x-ms-date": "Tue, 26 Jan 2021 19:24:55 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:54 GMT", - "ETag": "\u00220x8D8C2300F7C67BA\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:54 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D725DBE78A\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:54 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "0e1c4aff-9953-4fc5-efa7-28a82bd80e0e", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:54.6955194Z", - "x-ms-file-creation-time": "2021-01-26T19:24:54.6955194Z", + "x-ms-file-change-time": "2021-06-03T21:32:54.4628618Z", + "x-ms-file-creation-time": "2021-06-03T21:32:54.4628618Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:54.6955194Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:54.4628618Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "2f9eb127-701a-0011-5c18-f44076000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be625d-e01a-0023-2bc0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b/directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b/directory?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "6190dec5-fbb3-f948-221d-666a414d86c3", - "x-ms-date": "Tue, 26 Jan 2021 19:24:55 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:54 GMT", - "ETag": "\u00220x8D8C2300F7C67BA\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:54 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D725DBE78A\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:54 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "6190dec5-fbb3-f948-221d-666a414d86c3", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:54.6955194Z", - "x-ms-file-creation-time": "2021-01-26T19:24:54.6955194Z", + "x-ms-file-change-time": "2021-06-03T21:32:54.4628618Z", + "x-ms-file-creation-time": "2021-06-03T21:32:54.4628618Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:54.6955194Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:54.4628618Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "3c2d2e2d-a01a-0012-4418-f4a112000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be625e-e01a-0023-2cc0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "4ce2ddcd-ac48-885b-1aae-cd4125668179", - "x-ms-date": "Tue, 26 Jan 2021 19:24:55 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:54 GMT", + "Date": "Thu, 03 Jun 2021 21:32:54 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "4ce2ddcd-ac48-885b-1aae-cd4125668179", - "x-ms-request-id": "3c2d2e30-a01a-0012-4518-f4a112000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be625f-e01a-0023-2dc0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Edirectory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Edirectory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-5f570486-cc9e-374a-95e1-2d4acb428f9b?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-ae2aa321f8a50a4f83aa4df87efdc12b-702d532b67fa244a-00", + "traceparent": "00-c2399f5a0dcf8a40a6f79b2e5d143cae-b0bbafccc5fae74e-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "649c34c0-396a-e27b-1706-4eb89f284d12", - "x-ms-date": "Tue, 26 Jan 2021 19:24:55 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:55 GMT", + "Date": "Thu, 03 Jun 2021 21:32:54 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "649c34c0-396a-e27b-1706-4eb89f284d12", - "x-ms-request-id": "3c2d2e31-a01a-0012-4618-f4a112000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6260-e01a-0023-2ec0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "759001369", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%).json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%).json index 208a31cdfb76f..beae156eef876 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%).json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%).json @@ -1,192 +1,190 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-0006e96fe097f845b6fd754e337c25f4-a9fd15e0475dc34d-00", + "traceparent": "00-52f02aa9e6243348b10b6ae1902d0c2f-a6e8e9aa94b4864a-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "b9e28eb4-2b89-3fc1-ebda-5c09069b0809", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", - "ETag": "\u00220x8D8C23000BCCDAC\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:29 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D7244386FC\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "b9e28eb4-2b89-3fc1-ebda-5c09069b0809", - "x-ms-request-id": "a5914838-001a-0079-0218-f426e6000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be623a-e01a-0023-0fc0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72/my cool directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72/my cool directory?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-090bb71bedcc224b9238064f45377650-d78af8ef9754b24d-00", + "traceparent": "00-735833fd476dba4a9d3ddac39123684e-7b6546e634084344-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "5defa045-140f-82e8-6cd0-713df1e7c745", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", - "ETag": "\u00220x8D8C23000C86DA3\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D724501D7C\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "5defa045-140f-82e8-6cd0-713df1e7c745", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:30.0279203Z", - "x-ms-file-creation-time": "2021-01-26T19:24:30.0279203Z", + "x-ms-file-change-time": "2021-06-03T21:32:51.8690172Z", + "x-ms-file-creation-time": "2021-06-03T21:32:51.8690172Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:30.0279203Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:51.8690172Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "a591483b-001a-0079-0318-f426e6000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be623c-e01a-0023-10c0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72/my cool directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72/my cool directory?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "65c39d4d-aaac-edfa-4663-e42a612f733b", - "x-ms-date": "Tue, 26 Jan 2021 19:24:30 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:51 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", - "ETag": "\u00220x8D8C23000C86DA3\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", + "ETag": "\u00220x8D926D724501D7C\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "65c39d4d-aaac-edfa-4663-e42a612f733b", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:30.0279203Z", - "x-ms-file-creation-time": "2021-01-26T19:24:30.0279203Z", + "x-ms-file-change-time": "2021-06-03T21:32:51.8690172Z", + "x-ms-file-creation-time": "2021-06-03T21:32:51.8690172Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:30.0279203Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:51.8690172Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "5e58c2a8-f01a-0020-5818-f4a165000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be623d-e01a-0023-11c0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-7c79f8e7047e8541a309f47daccdc930-8ceb4fc6a3b9fc40-00", + "traceparent": "00-f2c22a11ba40944abb64e62c3887f914-0cfb446b36354348-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "54efbda4-6123-6a99-f113-9700dca47ff1", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:29 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "54efbda4-6123-6a99-f113-9700dca47ff1", - "x-ms-request-id": "5e58c2ab-f01a-0020-5918-f4a165000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be623e-e01a-0023-12c0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Emy cool directory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Emy cool directory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-ff3014b3-0837-993a-0a57-6aa4ecf2cd72?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-a53cc0756d0cb1469aecc0f8f1f657cd-b16d1b9198072647-00", + "traceparent": "00-2038cc8af72c3142a5f683e26a942b2a-63ea565eeb76c846-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "a3851eed-1f40-3817-3f9b-3523175aa82d", - "x-ms-date": "Tue, 26 Jan 2021 19:24:31 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:52 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:30 GMT", + "Date": "Thu, 03 Jun 2021 21:32:51 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "a3851eed-1f40-3817-3f9b-3523175aa82d", - "x-ms-request-id": "5e58c2ac-f01a-0020-5a18-f4a165000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be623f-e01a-0023-13c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "390893096", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%)Async.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%)Async.json index ff5e396591ad4..374d721aa31a0 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%)Async.json +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/GetDirectoryClient_SpecialCharacters(%my cool directory%)Async.json @@ -1,191 +1,189 @@ { "Entries": [ { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33?restype=share", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-441f15708a990f4eb4832632d98c5237-79b6c38556d6dc40-00", + "traceparent": "00-7dd5ee6aa9700a43b7c7abaa418d603a-11130c8ba94db34d-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "7ba29124-9a84-ae72-49d8-53d95f50ee64", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:50 GMT", - "ETag": "\u00220x8D8C2300D0E66F8\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D72571420F\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "7ba29124-9a84-ae72-49d8-53d95f50ee64", - "x-ms-request-id": "579ffe08-401a-0047-0618-f4b199000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6253-e01a-0023-23c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33/my cool directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33/my cool directory?restype=directory", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-84d120473b5676459fa899f5be28a140-e5f1399768983e4e-00", + "traceparent": "00-e5a1e19af87f2a4c813f9d875a418dd8-250c6b8a1dea1642-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "59e1116b-10bf-f0af-ced4-03a9de9ec258", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-file-attributes": "None", "x-ms-file-creation-time": "Now", "x-ms-file-last-write-time": "Now", "x-ms-file-permission": "Inherit", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 201, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:50 GMT", - "ETag": "\u00220x8D8C2300D18DACA\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D7257D3B83\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "59e1116b-10bf-f0af-ced4-03a9de9ec258", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:50.6876618Z", - "x-ms-file-creation-time": "2021-01-26T19:24:50.6876618Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.8424195Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.8424195Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:50.6876618Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.8424195Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "579ffe0b-401a-0047-0718-f4b199000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6255-e01a-0023-24c0-585072000000", "x-ms-request-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33/my cool directory?restype=directory", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33/my cool directory?restype=directory", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "4e6e0ddd-946e-38a4-08ac-9f530e4e276c", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:53 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:50 GMT", - "ETag": "\u00220x8D8C2300D18DACA\u0022", - "Last-Modified": "Tue, 26 Jan 2021 19:24:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", + "ETag": "\u00220x8D926D7257D3B83\u0022", + "Last-Modified": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], - "Vary": "Origin", "x-ms-client-request-id": "4e6e0ddd-946e-38a4-08ac-9f530e4e276c", "x-ms-file-attributes": "Directory", - "x-ms-file-change-time": "2021-01-26T19:24:50.6876618Z", - "x-ms-file-creation-time": "2021-01-26T19:24:50.6876618Z", + "x-ms-file-change-time": "2021-06-03T21:32:53.8424195Z", + "x-ms-file-creation-time": "2021-06-03T21:32:53.8424195Z", "x-ms-file-id": "13835128424026341376", - "x-ms-file-last-write-time": "2021-01-26T19:24:50.6876618Z", + "x-ms-file-last-write-time": "2021-06-03T21:32:53.8424195Z", "x-ms-file-parent-id": "0", - "x-ms-file-permission-key": "17860367565182308406*11459378189709739967", - "x-ms-request-id": "aba7da64-301a-0010-1a18-f41faa000000", + "x-ms-file-permission-key": "3917056552249722909*6811422022089678740", + "x-ms-request-id": "f1be6256-e01a-0023-25c0-585072000000", "x-ms-server-encrypted": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "ResponseBody": [] }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33/?restype=directory\u0026comp=list", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33?restype=directory\u0026comp=list", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "d0cbd225-7430-e0e9-8789-933f87f1044c", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Content-Type": "application/xml", - "Date": "Tue, 26 Jan 2021 19:24:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "Transfer-Encoding": "chunked", - "Vary": "Origin", "x-ms-client-request-id": "d0cbd225-7430-e0e9-8789-933f87f1044c", - "x-ms-request-id": "aba7da68-301a-0010-1b18-f41faa000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6257-e01a-0023-26c0-585072000000", + "x-ms-version": "2020-08-04" }, - "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://seanmcccanary3.file.core.windows.net/\u0022 ShareName=\u0022test-share-3d818437-90d9-4f23-cf00-7e06eb628b33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Emy cool directory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" + "ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://kasobolcanadacentral.file.core.windows.net/\u0022 ShareName=\u0022test-share-3d818437-90d9-4f23-cf00-7e06eb628b33\u0022 DirectoryPath=\u0022\u0022\u003E\u003CEntries\u003E\u003CDirectory\u003E\u003CName\u003Emy cool directory\u003C/Name\u003E\u003CProperties /\u003E\u003C/Directory\u003E\u003C/Entries\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E" }, { - "RequestUri": "https://seanmcccanary3.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33?restype=share", + "RequestUri": "https://kasobolcanadacentral.file.core.windows.net/test-share-3d818437-90d9-4f23-cf00-7e06eb628b33?restype=share", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/xml", "Authorization": "Sanitized", - "traceparent": "00-5a1a1311bc3c6c43a38d4af7f5d7f66f-c905292fdecf0c4d-00", + "traceparent": "00-f96e937876e87e429b73588007f97422-648c7a77f96cbc42-00", "User-Agent": [ - "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210126.1", - "(.NET 5.0.2; Microsoft Windows 10.0.19042)" + "azsdk-net-Storage.Files.Shares/12.7.0-alpha.20210603.1", + "(.NET 5.0.6; Microsoft Windows 10.0.19043)" ], "x-ms-client-request-id": "3c2ecec1-5682-283b-521e-4ccccb1bbcda", - "x-ms-date": "Tue, 26 Jan 2021 19:24:51 GMT", + "x-ms-date": "Thu, 03 Jun 2021 21:32:54 GMT", "x-ms-delete-snapshots": "include", "x-ms-return-client-request-id": "true", - "x-ms-version": "2020-08-04" + "x-ms-version": "2020-08-04" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Content-Length": "0", - "Date": "Tue, 26 Jan 2021 19:24:50 GMT", + "Date": "Thu, 03 Jun 2021 21:32:53 GMT", "Server": [ "Windows-Azure-File/1.0", "Microsoft-HTTPAPI/2.0" ], "x-ms-client-request-id": "3c2ecec1-5682-283b-521e-4ccccb1bbcda", - "x-ms-request-id": "aba7da69-301a-0010-1c18-f41faa000000", - "x-ms-version": "2020-08-04" + "x-ms-request-id": "f1be6258-e01a-0023-27c0-585072000000", + "x-ms-version": "2020-08-04" }, "ResponseBody": [] } ], "Variables": { "RandomSeed": "1264959959", - "Storage_TestConfigDefault": "ProductionTenant\nseanmcccanary3\nU2FuaXRpemVk\nhttps://seanmcccanary3.blob.core.windows.net\nhttps://seanmcccanary3.file.core.windows.net\nhttps://seanmcccanary3.queue.core.windows.net\nhttps://seanmcccanary3.table.core.windows.net\n\n\n\n\nhttps://seanmcccanary3-secondary.blob.core.windows.net\nhttps://seanmcccanary3-secondary.file.core.windows.net\nhttps://seanmcccanary3-secondary.queue.core.windows.net\nhttps://seanmcccanary3-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://seanmcccanary3.blob.core.windows.net/;QueueEndpoint=https://seanmcccanary3.queue.core.windows.net/;FileEndpoint=https://seanmcccanary3.file.core.windows.net/;BlobSecondaryEndpoint=https://seanmcccanary3-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://seanmcccanary3-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://seanmcccanary3-secondary.file.core.windows.net/;AccountName=seanmcccanary3;AccountKey=Kg==;\nseanscope1" + "Storage_TestConfigDefault": "ProductionTenant\nkasobolcanadacentral\nU2FuaXRpemVk\nhttps://kasobolcanadacentral.blob.core.windows.net\nhttps://kasobolcanadacentral.file.core.windows.net\nhttps://kasobolcanadacentral.queue.core.windows.net\nhttps://kasobolcanadacentral.table.core.windows.net\n\n\n\n\nhttps://kasobolcanadacentral-secondary.blob.core.windows.net\nhttps://kasobolcanadacentral-secondary.file.core.windows.net\nhttps://kasobolcanadacentral-secondary.queue.core.windows.net\nhttps://kasobolcanadacentral-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://kasobolcanadacentral.blob.core.windows.net/;QueueEndpoint=https://kasobolcanadacentral.queue.core.windows.net/;FileEndpoint=https://kasobolcanadacentral.file.core.windows.net/;BlobSecondaryEndpoint=https://kasobolcanadacentral-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://kasobolcanadacentral-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://kasobolcanadacentral-secondary.file.core.windows.net/;AccountName=kasobolcanadacentral;AccountKey=Kg==;\nencryptionScope" } } \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/MessageIdRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/MessageIdRestClient.cs index 9599e6b32e438..de6329746c569 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/MessageIdRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/MessageIdRestClient.cs @@ -17,7 +17,6 @@ namespace Azure.Storage.Queues internal partial class MessageIdRestClient { private string url; - private string queueName; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -26,26 +25,20 @@ internal partial class MessageIdRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, queue or message that is the targe of the desired operation. - /// The queue name. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public MessageIdRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string queueName, string version = "2018-03-28") + /// or is null. + public MessageIdRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2018-03-28") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (queueName == null) - { - throw new ArgumentNullException(nameof(queueName)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.queueName = queueName; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -58,8 +51,6 @@ internal HttpMessage CreateUpdateRequest(string messageid, string popReceipt, in request.Method = RequestMethod.Put; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages/", false); uri.AppendPath(messageid, true); uri.AppendQuery("popreceipt", popReceipt, true); @@ -150,8 +141,6 @@ internal HttpMessage CreateDeleteRequest(string messageid, string popReceipt, in request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages/", false); uri.AppendPath(messageid, true); uri.AppendQuery("popreceipt", popReceipt, true); diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/MessagesRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/MessagesRestClient.cs index ec1eb50b7085d..49fab4575ac7c 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/MessagesRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/MessagesRestClient.cs @@ -19,7 +19,6 @@ namespace Azure.Storage.Queues internal partial class MessagesRestClient { private string url; - private string queueName; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -28,26 +27,20 @@ internal partial class MessagesRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, queue or message that is the targe of the desired operation. - /// The queue name. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public MessagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string queueName, string version = "2018-03-28") + /// or is null. + public MessagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2018-03-28") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (queueName == null) - { - throw new ArgumentNullException(nameof(queueName)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.queueName = queueName; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -60,8 +53,6 @@ internal HttpMessage CreateDequeueRequest(int? numberOfMessages, int? visibility request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages", false); if (numberOfMessages != null) { @@ -152,8 +143,6 @@ internal HttpMessage CreateClearRequest(int? timeout) request.Method = RequestMethod.Delete; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages", false); if (timeout != null) { @@ -206,8 +195,6 @@ internal HttpMessage CreateEnqueueRequest(QueueMessage queueMessage, int? visibi request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages", false); if (visibilitytimeout != null) { @@ -316,8 +303,6 @@ internal HttpMessage CreatePeekRequest(int? numberOfMessages, int? timeout) request.Method = RequestMethod.Get; var uri = new RawRequestUriBuilder(); uri.AppendRaw(url, false); - uri.AppendPath("/", false); - uri.AppendPath(queueName, true); uri.AppendPath("/messages", false); uri.AppendQuery("peekonly", "true", true); if (numberOfMessages != null) diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs index f12d7229e60f6..0e79d8ee7caac 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs @@ -19,7 +19,6 @@ namespace Azure.Storage.Queues internal partial class QueueRestClient { private string url; - private string queueName; private string version; private ClientDiagnostics _clientDiagnostics; private HttpPipeline _pipeline; @@ -28,26 +27,20 @@ internal partial class QueueRestClient /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The URL of the service account, queue or message that is the targe of the desired operation. - /// The queue name. /// Specifies the version of the operation to use for this request. - /// , , or is null. - public QueueRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string queueName, string version = "2018-03-28") + /// or is null. + public QueueRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string url, string version = "2018-03-28") { if (url == null) { throw new ArgumentNullException(nameof(url)); } - if (queueName == null) - { - throw new ArgumentNullException(nameof(queueName)); - } if (version == null) { throw new ArgumentNullException(nameof(version)); } this.url = url; - this.queueName = queueName; this.version = version; _clientDiagnostics = clientDiagnostics; _pipeline = pipeline; @@ -60,8 +53,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, IDictionary for (const property in $) { - if (property.includes('{queueName}')) - { - $[property].parameters.push({ - "$ref": "#/parameters/QueueName" - }); - }; if (property.includes('{messageid}')) { $[property].parameters.push({ @@ -51,6 +46,24 @@ directive: } ``` +### Remove queueName as a parameter - we have direct URIs +``` yaml +directive: +- from: swagger-document + where: $["x-ms-paths"] + transform: > + for (const property in $) + { + if (property.includes('/{queueName}')) + { + var oldName = property; + var newName = property.replace('/{queueName}', ''); + $[newName] = $[oldName]; + delete $[oldName]; + } + } +``` + ### Metrics ``` yaml directive: