diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs index 68da5e74c745..e30f459c8276 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs @@ -184,7 +184,6 @@ public BlobBaseClient(string connectionString, string blobContainerName, string _clientDiagnostics = new ClientDiagnostics(options); _customerProvidedKey = options.CustomerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -280,7 +279,6 @@ internal BlobBaseClient(Uri blobUri, HttpPipelinePolicy authentication, BlobClie _clientDiagnostics = new ClientDiagnostics(options); _customerProvidedKey = options.CustomerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } /// @@ -305,7 +303,6 @@ internal BlobBaseClient(Uri blobUri, HttpPipeline pipeline, ClientDiagnostics cl _clientDiagnostics = clientDiagnostics; _customerProvidedKey = customerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs index 7352a3ec2e60..b80faf07596b 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs @@ -171,7 +171,6 @@ public BlobContainerClient(string connectionString, string blobContainerName, Bl _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); _customerProvidedKey = options.CustomerProvidedKey; - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -263,7 +262,6 @@ internal BlobContainerClient(Uri blobContainerUri, HttpPipelinePolicy authentica _clientDiagnostics = new ClientDiagnostics(options); _customerProvidedKey = options.CustomerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } /// @@ -287,7 +285,6 @@ internal BlobContainerClient(Uri containerUri, HttpPipeline pipeline, ClientDiag _clientDiagnostics = clientDiagnostics; _customerProvidedKey = customerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } /// diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs index aa6443b99159..ebe969794594 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs @@ -142,7 +142,6 @@ public BlobServiceClient(string connectionString, BlobClientOptions options) _pipeline = options.Build(_authenticationPolicy); _clientDiagnostics = new ClientDiagnostics(options); _customerProvidedKey = options.CustomerProvidedKey; - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } /// @@ -250,7 +249,6 @@ internal BlobServiceClient(Uri serviceUri, HttpPipelinePolicy authentication, Cl _clientDiagnostics = clientDiagnostics; _customerProvidedKey = customerProvidedKey; BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _customerProvidedKey); - Errors.VerifyHttpSas(_uri, new BlobUriBuilder(_uri).Sas); } /// diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs index 8ef3219ae8f6..42f7157eeca3 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs @@ -100,50 +100,6 @@ public void Ctor_CPK_Http() new ArgumentException("Cannot use client-provided key without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - BlobUriBuilder builder = new BlobUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewBlobServiceSasCredentialsContainer(GetNewContainerName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new BlobBaseClient(conn.ToString(true), GetNewContainerName(), GetNewBlobName()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobBaseClient(conn.ToString(true), GetNewContainerName(), GetNewBlobName(), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - #region Sequential Download [Test] diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs index 2737d2729cc1..c8b017ca629a 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs @@ -430,17 +430,25 @@ public BlobSignedIdentifier[] BuildSignedIdentifiers() => }; internal StorageConnectionString GetConnectionString( - bool useHttp = false, - SharedAccessSignatureCredentials credentials = default) + SharedAccessSignatureCredentials credentials = default, + bool includeEndpoint = true) { + credentials ??= GetAccountSasCredentials(); + if (!includeEndpoint) + { + return TestExtensions.CreateStorageConnectionString( + credentials, + TestConfigDefault.AccountName); + } + (Uri, Uri) blobUri = StorageConnectionString.ConstructBlobEndpoint( - useHttp ? Constants.Http : Constants.Https, + Constants.Https, TestConfigDefault.AccountName, default, default); return new StorageConnectionString( - credentials ?? GetSasCredentials(), + credentials, blobUri, (default, default), (default, default)); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs index d4e927cb2ff4..a7ad17839306 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs @@ -54,20 +54,22 @@ public void Ctor_ConnectionString() public async Task Ctor_ConnectionString_Sas() { // Arrange - SharedAccessSignatureCredentials sasCred = GetSasCredentials( + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( AccountSasServices.All, AccountSasResourceTypes.All, AccountSasPermissions.All); - StorageConnectionString conn1 = GetConnectionString(); + StorageConnectionString conn1 = GetConnectionString( + credentials: sasCred, + includeEndpoint: true); BlobContainerClient containerClient1 = GetBlobContainerClient(conn1.ToString(exportSecrets: true)); // Also test with a connection string not containing the blob endpoint. // This should still work provided account name and Sas credential are present. - StorageConnectionString conn2 = TestExtensions.CreateStorageConnectionString( - sasCred, - TestConfigDefault.AccountName); + StorageConnectionString conn2 = GetConnectionString( + credentials: sasCred, + includeEndpoint: false); BlobContainerClient containerClient2 = GetBlobContainerClient(conn2.ToString(exportSecrets: true)); @@ -107,7 +109,7 @@ public async Task Ctor_ConnectionString_Sas() public async Task Ctor_ConnectionString_Sas_Resource_Types_Container() { // Arrange - SharedAccessSignatureCredentials sasCred = GetSasCredentials( + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( AccountSasServices.All, AccountSasResourceTypes.Container, AccountSasPermissions.All); @@ -142,7 +144,7 @@ await TestHelper.AssertExpectedExceptionAsync( public async Task Ctor_ConnectionString_Sas_Resource_Types_Service() { // Arrange - SharedAccessSignatureCredentials sasCred = GetSasCredentials( + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( AccountSasServices.All, AccountSasResourceTypes.Service, AccountSasPermissions.All); @@ -161,7 +163,7 @@ await TestHelper.AssertExpectedExceptionAsync( public async Task Ctor_ConnectionString_Sas_Permissions_ReadOnly() { // Arrange - SharedAccessSignatureCredentials sasCred = GetSasCredentials( + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( AccountSasServices.All, AccountSasResourceTypes.All, AccountSasPermissions.Read); @@ -184,7 +186,7 @@ await TestHelper.AssertExpectedExceptionAsync( public async Task Ctor_ConnectionString_Sas_Permissions_WriteOnly() { // Arrange - SharedAccessSignatureCredentials sasCred = GetSasCredentials( + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( AccountSasServices.All, AccountSasResourceTypes.All, // include Delete so we can clean up the test @@ -214,37 +216,6 @@ await TestHelper.AssertExpectedExceptionAsync( await containerClient.DeleteAsync(); } } - - [Test] - public void Ctor_SAS_Http() - { - // Arrange - BlobUriBuilder builder = new BlobUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewBlobServiceSasCredentialsContainer(GetNewContainerName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - - // Act - TestHelper.AssertExpectedException( - () => new BlobContainerClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobContainerClient(httpUri, new BlobClientOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new BlobContainerClient(conn.ToString(true), GetNewContainerName()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobContainerClient(conn.ToString(true), GetNewContainerName(), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - private BlobContainerClient GetBlobContainerClient(string connectionString) => InstrumentClient( new BlobContainerClient( diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs index fbba9c8ba835..b5413f7717d5 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs @@ -99,36 +99,6 @@ public void Ctor_CPK_Http() new ArgumentException("Cannot use client-provided key without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - BlobUriBuilder builder = new BlobUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewBlobServiceSasCredentialsContainer(GetNewContainerName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - - // Act - TestHelper.AssertExpectedException( - () => new BlobServiceClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobServiceClient(httpUri, new BlobClientOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new BlobServiceClient(conn.ToString(true)), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new BlobServiceClient(conn.ToString(true), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task ListContainersSegmentAsync() { diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 7eea8965d97b..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:40:14.9312804-08:00", - "RandomSeed": "1580100173", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index 5643bc1f5ce0..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/BlobBaseClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:40:57.6724714-08:00", - "RandomSeed": "390503807", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_Http.json deleted file mode 100644 index a59364b1fd2c..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:45:09.8391704-08:00", - "RandomSeed": "453121061", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index 206f1561d2b9..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ContainerClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:45:03.4553357-08:00", - "RandomSeed": "2071420795", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json deleted file mode 100644 index ceb60ed81aa4..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:45:14.5896236-08:00", - "RandomSeed": "1181699757", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index d5f84e45ce55..000000000000 --- a/sdk/storage/Azure.Storage.Blobs/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:45:18.7012361-08:00", - "RandomSeed": "939770616", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs index 4b0df324a862..c03b4e222a5e 100644 --- a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs +++ b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs @@ -573,10 +573,5 @@ internal static class HttpStatusCode { internal const int NotFound = 404; } - - internal static class ErrorMessages - { - internal const string SasHttps = "Cannot use SAS token without HTTPS."; - } } } diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/Errors.cs b/sdk/storage/Azure.Storage.Common/src/Shared/Errors.cs index 0b6142c0a81a..93a2e9eec8dd 100644 --- a/sdk/storage/Azure.Storage.Common/src/Shared/Errors.cs +++ b/sdk/storage/Azure.Storage.Common/src/Shared/Errors.cs @@ -4,7 +4,6 @@ using System; using System.Globalization; using System.Security.Authentication; -using Azure.Storage.Sas; namespace Azure.Storage { @@ -117,13 +116,5 @@ public static void VerifyHttpsTokenAuth(Uri uri) throw new ArgumentException("Cannot use TokenCredential without HTTPS."); } } - - public static void VerifyHttpSas(Uri uri, SasQueryParameters sasQueryParameters) - { - if (sasQueryParameters != null && uri.Scheme != Constants.Https) - { - throw new ArgumentException(Constants.ErrorMessages.SasHttps); - } - } } } diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs index 5b6e638d6c4d..82d399f5f118 100644 --- a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs +++ b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs @@ -193,7 +193,7 @@ public TokenCredential GetOAuthCredential(string tenantId, string appId, string Recording.InstrumentClientOptions( new TokenCredentialOptions() { AuthorityHost = authorityHost })); - internal SharedAccessSignatureCredentials GetSasCredentials( + internal SharedAccessSignatureCredentials GetAccountSasCredentials( AccountSasServices services = AccountSasServices.All, AccountSasResourceTypes resourceTypes = AccountSasResourceTypes.All, AccountSasPermissions permissions = AccountSasPermissions.All) diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/TestExtensions.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/TestExtensions.cs index 3fa99de63e28..87d2cb1e9b4a 100644 --- a/sdk/storage/Azure.Storage.Common/tests/Shared/TestExtensions.cs +++ b/sdk/storage/Azure.Storage.Common/tests/Shared/TestExtensions.cs @@ -114,7 +114,7 @@ internal static StorageConnectionString CreateStorageConnectionString( { accountName = sharedKeyCredentials.AccountName; } - else if (string.Compare(sharedKeyCredentials.AccountName, accountName, System.StringComparison.Ordinal) != 0) + else if (string.Compare(sharedKeyCredentials.AccountName, accountName, StringComparison.Ordinal) != 0) { throw Errors.AccountMismatch(sharedKeyCredentials.AccountName, accountName); } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs index be0d70dc9545..d00f5b6e589a 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileSystemClient.cs @@ -252,7 +252,6 @@ internal DataLakeFileSystemClient(Uri fileSystemUri, HttpPipelinePolicy authenti _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); _containerClient = BlobContainerClientInternals.Create(_blobUri, _pipeline, _clientDiagnostics); - Errors.VerifyHttpSas(_uri, uriBuilder.Sas); } /// @@ -276,7 +275,6 @@ internal DataLakeFileSystemClient(Uri fileSystemUri, HttpPipeline pipeline, Clie _pipeline = pipeline; _clientDiagnostics = clientDiagnostics; _containerClient = BlobContainerClientInternals.Create(_blobUri, pipeline, _clientDiagnostics); - Errors.VerifyHttpSas(_uri, uriBuilder.Sas); } /// diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs index ea0f300d33b1..20a9e24a3e1d 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakePathClient.cs @@ -296,7 +296,6 @@ internal DataLakePathClient(Uri pathUri, HttpPipelinePolicy authentication, Data _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); _blockBlobClient = BlockBlobClientInternals.Create(_blobUri, _pipeline, _clientDiagnostics); - Errors.VerifyHttpSas(_uri, uriBuilder.Sas); } /// @@ -324,7 +323,6 @@ internal DataLakePathClient(Uri pathUri, HttpPipeline pipeline, DataLakeClientOp _pipeline = pipeline; _clientDiagnostics = new ClientDiagnostics(options ?? new DataLakeClientOptions()); _blockBlobClient = BlockBlobClientInternals.Create(_blobUri, _pipeline, _clientDiagnostics); - Errors.VerifyHttpSas(_uri, uriBuilder.Sas); } /// diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs index 308d9613ea61..eb8823488c72 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs @@ -121,39 +121,6 @@ public void Ctor_TokenCredential_Http() new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - DataLakeUriBuilder builder = new DataLakeUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewDataLakeServiceSasCredentialsFileSystem(GetNewFileSystemName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task CreateAsync() { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs index b3d0a5ace6cc..53806f428805 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs @@ -125,39 +125,6 @@ public void Ctor_TokenCredential_Http() new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - DataLakeUriBuilder builder = new DataLakeUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewDataLakeServiceSasCredentialsFileSystem(GetNewFileSystemName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeDirectoryClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task CreateAsync() { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs index 3ca7c3619d6c..6bde081be3ec 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs @@ -118,39 +118,6 @@ public void Ctor_TokenCredential_Http() new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - DataLakeUriBuilder builder = new DataLakeUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewDataLakeServiceSasCredentialsFileSystem(GetNewFileSystemName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeFileSystemClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task CreateAsync() { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/PathClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/PathClientTests.cs index f2d37e807c23..28d8a4af586f 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/PathClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/PathClientTests.cs @@ -101,38 +101,5 @@ public void Ctor_TokenCredential_Http() () => new DataLakePathClient(uri, tokenCredential, new DataLakeClientOptions()), new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - - [Test] - public void Ctor_SAS_Http() - { - // Arrange - DataLakeUriBuilder builder = new DataLakeUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewDataLakeServiceSasCredentialsFileSystem(GetNewFileSystemName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakePathClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } } } diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs index 636994b50ba0..93d047f609c7 100644 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs @@ -86,39 +86,6 @@ public void Ctor_TokenCredential_Http() new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - DataLakeUriBuilder builder = new DataLakeUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewDataLakeServiceSasCredentialsFileSystem(GetNewFileSystemName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new DataLakeServiceClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task GetUserDelegationKey() { diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 5129221a3e94..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:55:14.6448830-08:00", - "RandomSeed": "1582154777", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index b3441b4f087c..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:55:03.0104751-08:00", - "RandomSeed": "534785667", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 317a900bbe82..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:56:25.1997999-08:00", - "RandomSeed": "358300273", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index ccc61fb61a83..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:56:31.1863076-08:00", - "RandomSeed": "976125969", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_Http.json deleted file mode 100644 index ad3276e2b7ed..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:02:39.3207273-08:00", - "RandomSeed": "1892892815", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index fdfe155c74e5..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/FileSystemClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:03:31.8073134-08:00", - "RandomSeed": "127751766", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 6627661110e2..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:05:17.4517650-08:00", - "RandomSeed": "1238026670", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index 760eb2fac76b..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/PathClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:05:36.7291668-08:00", - "RandomSeed": "151561575", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json deleted file mode 100644 index f5aebe8b9443..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:06:20.3070078-08:00", - "RandomSeed": "1065413740", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index b3502e7edde0..000000000000 --- a/sdk/storage/Azure.Storage.Files.DataLake/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:06:33.2630999-08:00", - "RandomSeed": "2111474870", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/ShareClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/ShareClient.cs index 4e5b9fe46701..2a74252510ff 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/ShareClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/ShareClient.cs @@ -144,7 +144,6 @@ public ShareClient(string connectionString, string shareName, ShareClientOptions _uri = builder.ToUri(); _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -208,7 +207,6 @@ internal ShareClient(Uri shareUri, HttpPipelinePolicy authentication, ShareClien _uri = shareUri; _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } /// @@ -228,7 +226,6 @@ internal ShareClient(Uri shareUri, HttpPipeline pipeline, ClientDiagnostics clie _uri = shareUri; _pipeline = pipeline; _clientDiagnostics = clientDiagnostics; - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/ShareDirectoryClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/ShareDirectoryClient.cs index d8ba4e592db9..21e839f26f2d 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/ShareDirectoryClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/ShareDirectoryClient.cs @@ -183,7 +183,6 @@ public ShareDirectoryClient(string connectionString, string shareName, string di _uri = builder.ToUri(); _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -250,7 +249,6 @@ internal ShareDirectoryClient(Uri directoryUri, HttpPipelinePolicy authenticatio _uri = directoryUri; _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } /// diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/ShareFileClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/ShareFileClient.cs index b4c5790c66aa..cef840740af0 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/ShareFileClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/ShareFileClient.cs @@ -196,7 +196,6 @@ public ShareFileClient(string connectionString, string shareName, string filePat _uri = builder.ToUri(); _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -261,7 +260,6 @@ internal ShareFileClient(Uri fileUri, HttpPipelinePolicy authentication, ShareCl _uri = fileUri; _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } /// diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/ShareServiceClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/ShareServiceClient.cs index ffec2df7a77b..230c98c8568e 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/ShareServiceClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/ShareServiceClient.cs @@ -121,7 +121,6 @@ public ShareServiceClient(string connectionString, ShareClientOptions options) _uri = conn.FileEndpoint; _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } /// @@ -182,7 +181,6 @@ internal ShareServiceClient(Uri serviceUri, HttpPipelinePolicy authentication, S _uri = serviceUri; _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new ShareUriBuilder(_uri).Sas); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs index b212e1c6abda..e5bf14ecff1f 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs @@ -44,43 +44,6 @@ public void Ctor_ConnectionString() //Assert.AreEqual("accountName", builder.AccountName); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - ShareUriBuilder builder = new ShareUriBuilder(new Uri(TestConfigDefault.FileServiceEndpoint)) - { - Sas = GetNewFileServiceSasCredentialsShare(GetNewShareName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(conn.ToString(true), GetNewShareName(), GetNewDirectoryName()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareDirectoryClient(conn.ToString(true), GetNewShareName(), GetNewDirectoryName(), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public void DirectoryPathsParsing() { diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs index ede2e4e68ddb..2a8c4b429cb5 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs @@ -48,43 +48,6 @@ public void Ctor_ConnectionString() //Assert.AreEqual("accountName", builder.AccountName); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - ShareUriBuilder builder = new ShareUriBuilder(new Uri(TestConfigDefault.FileServiceEndpoint)) - { - Sas = GetNewFileServiceSasCredentialsFile(GetNewShareName(), GetNewFileName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new ShareFileClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareFileClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareFileClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareFileClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new ShareFileClient(conn.ToString(true), GetNewShareName(), GetNewFileName()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareFileClient(conn.ToString(true), GetNewShareName(), GetNewFileName(), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public void FilePathsParsing() { diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs index c5cf616efa04..fae0f2c4c43c 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs @@ -179,16 +179,26 @@ public ShareSignedIdentifier[] BuildSignedIdentifiers() => } }; - internal StorageConnectionString GetConnectionString(bool useHttp = false) + internal StorageConnectionString GetConnectionString( + SharedAccessSignatureCredentials credentials = default, + bool includeEndpoint = true) { + credentials ??= GetAccountSasCredentials(); + if (!includeEndpoint) + { + return TestExtensions.CreateStorageConnectionString( + credentials, + TestConfigDefault.AccountName); + } + (Uri, Uri) fileUri = StorageConnectionString.ConstructFileEndpoint( - useHttp ? Constants.Http : Constants.Https, + Constants.Https, TestConfigDefault.AccountName, default, default); return new StorageConnectionString( - GetSasCredentials(), + credentials, (default, default), (default, default), fileUri); diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs index 54b0e80ab7bb..8f0bf702a656 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs @@ -41,43 +41,6 @@ public void Ctor_ConnectionString() //Assert.AreEqual("accountName", builder.AccountName); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - ShareUriBuilder builder = new ShareUriBuilder(new Uri(TestConfigDefault.FileServiceEndpoint)) - { - Sas = GetNewFileServiceSasCredentialsShare(GetNewShareName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new ShareServiceClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareServiceClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareServiceClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareServiceClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new ShareServiceClient(conn.ToString(true)), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareServiceClient(conn.ToString(true), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task GetPropertiesAsync() { diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 61d53b8365dc..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:25:50.3708668-08:00", - "RandomSeed": "952913430", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index e8af65cfc5dd..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/DirectoryClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:25:59.9870738-08:00", - "RandomSeed": "1573352123", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 72fae104cd23..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:09:25.0875696-08:00", - "RandomSeed": "1291170204", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index 1693bb7d4f3b..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/FileClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:09:44.3759964-08:00", - "RandomSeed": "2129894504", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 804da1ce5623..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:11:55.6397286-08:00", - "RandomSeed": "962419208", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index e88fb57f353a..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:12:13.3638947-08:00", - "RandomSeed": "1385588028", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_Http.json deleted file mode 100644 index b3946a5e240b..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:25:12.5413837-08:00", - "RandomSeed": "561312269", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index c55bee24ed4c..000000000000 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/SessionRecords/ShareClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:25:06.3040457-08:00", - "RandomSeed": "989999727", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs index d606c5c4bffb..23d422a8659a 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs @@ -62,15 +62,17 @@ public async Task Ctor_ConnectionString_Sas() string sasToken = sasBuilder.ToSasQueryParameters(cred).ToString(); var sasCred = new SharedAccessSignatureCredentials(sasToken); - StorageConnectionString conn1 = GetConnectionString(); + StorageConnectionString conn1 = GetConnectionString( + credentials: sasCred, + includeEndpoint: true); ShareClient shareClient1 = GetShareClient(conn1.ToString(exportSecrets: true)); // Also test with a connection string not containing the blob endpoint. // This should still work provided account name and Sas credential are present. - StorageConnectionString conn2 = TestExtensions.CreateStorageConnectionString( - sasCred, - TestConfigDefault.AccountName); + StorageConnectionString conn2 = GetConnectionString( + credentials: sasCred, + includeEndpoint: false); ShareClient shareClient2 = GetShareClient(conn2.ToString(exportSecrets: true)); @@ -116,44 +118,6 @@ async Task GetFileClient(ShareClient share) } } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - var shareName = GetNewShareName(); - ShareUriBuilder builder = new ShareUriBuilder(new Uri(TestConfigDefault.FileServiceEndpoint)) - { - Sas = GetNewFileServiceSasCredentialsShare(shareName) - }; - Uri httpUri = builder.ToUri().ToHttp(); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new ShareClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new ShareClient(conn.ToString(true), shareName), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new ShareClient(conn.ToString(true), shareName, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public void WithSnapshot() { diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs b/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs index 2bbb1bc40bbc..5dc100fd851f 100644 --- a/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs @@ -166,7 +166,6 @@ public QueueClient(string connectionString, string queueName, QueueClientOptions options ??= new QueueClientOptions(); _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, builder.Sas); } /// @@ -257,7 +256,6 @@ internal QueueClient(Uri queueUri, HttpPipelinePolicy authentication, QueueClien options ??= new QueueClientOptions(); _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new QueueUriBuilder(_uri).Sas); } /// @@ -279,7 +277,6 @@ internal QueueClient(Uri queueUri, HttpPipeline pipeline, ClientDiagnostics clie _messagesUri = queueUri.AppendToPath(Constants.Queue.MessagesUri); _pipeline = pipeline; _clientDiagnostics = clientDiagnostics; - Errors.VerifyHttpSas(_uri, new QueueUriBuilder(_uri).Sas); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs b/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs index b4d4846034bd..cf7100d6eef7 100644 --- a/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs @@ -116,7 +116,6 @@ public QueueServiceClient(string connectionString, QueueClientOptions options) options ??= new QueueClientOptions(); _pipeline = options.Build(conn.Credentials); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new QueueUriBuilder(_uri).Sas); } /// @@ -202,7 +201,6 @@ internal QueueServiceClient(Uri serviceUri, HttpPipelinePolicy authentication, Q options ??= new QueueClientOptions(); _pipeline = options.Build(authentication); _clientDiagnostics = new ClientDiagnostics(options); - Errors.VerifyHttpSas(_uri, new QueueUriBuilder(_uri).Sas); } #endregion ctors diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs index bec3687684cf..c7927199ff8b 100644 --- a/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs +++ b/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs @@ -53,38 +53,22 @@ public void Ctor_ConnectionString() public async Task Ctor_ConnectionString_Sas() { // Arrange - var sasBuilder = new AccountSasBuilder - { - ExpiresOn = Recording.UtcNow.AddHours(1), - Services = AccountSasServices.All, - ResourceTypes = AccountSasResourceTypes.All, - Protocol = SasProtocol.Https, - }; - sasBuilder.SetPermissions(AccountSasPermissions.All); - var cred = new StorageSharedKeyCredential(TestConfigDefault.AccountName, TestConfigDefault.AccountKey); - string sasToken = sasBuilder.ToSasQueryParameters(cred).ToString(); - var sasCred = new SharedAccessSignatureCredentials(sasToken); - - (Uri, Uri) queueUri = StorageConnectionString.ConstructQueueEndpoint( - Constants.Https, - TestConfigDefault.AccountName, - default, - default); - - StorageConnectionString conn1 = - new StorageConnectionString( - sasCred, - (default, default), - queueUri, - (default, default)); + SharedAccessSignatureCredentials sasCred = GetAccountSasCredentials( + AccountSasServices.All, + AccountSasResourceTypes.All, + AccountSasPermissions.All); + + StorageConnectionString conn1 = GetConnectionString( + credentials: sasCred, + includeEndpoint: true); QueueClient queueClient1 = GetClient(conn1.ToString(exportSecrets: true)); // Also test with a connection string not containing the blob endpoint. // This should still work provided account name and Sas credential are present. - StorageConnectionString conn2 = TestExtensions.CreateStorageConnectionString( - sasCred, - TestConfigDefault.AccountName); + StorageConnectionString conn2 = GetConnectionString( + credentials: sasCred, + includeEndpoint: false); QueueClient queueClient2 = GetClient(conn2.ToString(exportSecrets: true)); @@ -145,50 +129,6 @@ public void Ctor_TokenCredential_Http() new ArgumentException("Cannot use TokenCredential without HTTPS.")); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - QueueUriBuilder builder = new QueueUriBuilder(new Uri(TestConfigDefault.QueueServiceEndpoint)) - { - Sas = GetNewQueueServiceSasCredentials(GetNewQueueName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new QueueClient(conn.ToString(true), GetNewQueueName()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueClient(conn.ToString(true), GetNewQueueName(), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task CreateAsync_WithSharedKey() { diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs index 4fcd235705eb..34fc4f1b4722 100644 --- a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs +++ b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs @@ -172,16 +172,26 @@ public SasQueryParameters GetNewQueueServiceSasCredentials(string queueName, Sto return builder.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); } - internal StorageConnectionString GetConnectionString(bool useHttp = false) + internal StorageConnectionString GetConnectionString( + SharedAccessSignatureCredentials credentials = default, + bool includeEndpoint = true) { + credentials ??= GetAccountSasCredentials(); + if (!includeEndpoint) + { + return TestExtensions.CreateStorageConnectionString( + credentials, + TestConfigDefault.AccountName); + } + (Uri, Uri) queueUri = StorageConnectionString.ConstructQueueEndpoint( - useHttp ? Constants.Http : Constants.Https, + Constants.Https, TestConfigDefault.AccountName, default, default); return new StorageConnectionString( - GetSasCredentials(), + credentials, (default, default), queueUri, (default, default)); diff --git a/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs index abf1ecf0a544..1a965a2ff178 100644 --- a/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs +++ b/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs @@ -74,50 +74,6 @@ public void Ctor_Uri() Assert.AreEqual(accountName, builder.AccountName); } - [Test] - public void Ctor_SAS_Http() - { - // Arrange - QueueUriBuilder builder = new QueueUriBuilder(new Uri(TestConfigDefault.BlobServiceEndpoint)) - { - Sas = GetNewQueueServiceSasCredentials(GetNewQueueName()) - }; - Uri httpUri = builder.ToUri().ToHttp(); - TokenCredential tokenCredential = GetOAuthCredential(TestConfigHierarchicalNamespace); - StorageSharedKeyCredential sharedKeyCredential = GetNewSharedKeyCredentials(); - - // Act - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri, tokenCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri, tokenCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri, sharedKeyCredential), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(httpUri, sharedKeyCredential, GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - - // Arrange - StorageConnectionString conn = GetConnectionString(true); - - // Act - TestHelper.AssertExpectedException( - () => new QueueServiceClient(conn.ToString(true)), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - TestHelper.AssertExpectedException( - () => new QueueServiceClient(conn.ToString(true), GetOptions()), - new ArgumentException(Constants.ErrorMessages.SasHttps)); - } - [Test] public async Task GetQueuesAsync() { diff --git a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 2af05157072b..000000000000 --- a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:59:19.5319599-08:00", - "RandomSeed": "132258889", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index ff53b1714f66..000000000000 --- a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/QueueClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T20:59:31.2770234-08:00", - "RandomSeed": "269023081", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json b/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json deleted file mode 100644 index 9bf146831259..000000000000 --- a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_Http.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T21:01:35.7807649-08:00", - "RandomSeed": "736136916", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file diff --git a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json b/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json deleted file mode 100644 index 9cc37430f812..000000000000 --- a/sdk/storage/Azure.Storage.Queues/tests/SessionRecords/ServiceClientTests/Ctor_SAS_HttpAsync.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Entries": [], - "Variables": { - "DateTimeOffsetNow": "2019-12-02T21:01:39.6170924-08:00", - "RandomSeed": "1885292138", - "Storage_TestConfigDefault": "ProductionTenant\njolovstorage\nU2FuaXRpemVk\nhttps://jolovstorage.blob.core.windows.net\nhttps://jolovstorage.file.core.windows.net\nhttps://jolovstorage.queue.core.windows.net\nhttps://jolovstorage.table.core.windows.net\n\n\n\n\nhttps://jolovstorage-secondary.blob.core.windows.net\nhttps://jolovstorage-secondary.file.core.windows.net\nhttps://jolovstorage-secondary.queue.core.windows.net\nhttps://jolovstorage-secondary.table.core.windows.net\n\nSanitized\n\n\nCloud\nBlobEndpoint=https://jolovstorage.blob.core.windows.net/;QueueEndpoint=https://jolovstorage.queue.core.windows.net/;FileEndpoint=https://jolovstorage.file.core.windows.net/;BlobSecondaryEndpoint=https://jolovstorage-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://jolovstorage-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://jolovstorage-secondary.file.core.windows.net/;AccountName=jolovstorage;AccountKey=Sanitized", - "Storage_TestConfigHierarchicalNamespace": "NamespaceTenant\nstoragedotnetdatalake\nU2FuaXRpemVk\nhttps://storagedotnetdatalake.blob.core.windows.net\nhttps://storagedotnetdatalake.file.core.windows.net\nhttps://storagedotnetdatalake.queue.core.windows.net\nhttps://storagedotnetdatalake.table.core.windows.net\n\n\n\n\nhttps://storagedotnetdatalake-secondary.blob.core.windows.net\nhttps://storagedotnetdatalake-secondary.file.core.windows.net\nhttps://storagedotnetdatalake-secondary.queue.core.windows.net\nhttps://storagedotnetdatalake-secondary.table.core.windows.net\n183fee76-3bc8-488e-866f-b6562a249293\nSanitized\n72f988bf-86f1-41af-91ab-2d7cd011db47\nhttps://login.microsoftonline.com/\nCloud\nBlobEndpoint=https://storagedotnetdatalake.blob.core.windows.net/;QueueEndpoint=https://storagedotnetdatalake.queue.core.windows.net/;FileEndpoint=https://storagedotnetdatalake.file.core.windows.net/;BlobSecondaryEndpoint=https://storagedotnetdatalake-secondary.blob.core.windows.net/;QueueSecondaryEndpoint=https://storagedotnetdatalake-secondary.queue.core.windows.net/;FileSecondaryEndpoint=https://storagedotnetdatalake-secondary.file.core.windows.net/;AccountName=storagedotnetdatalake;AccountKey=Sanitized" - } -} \ No newline at end of file