diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp index 6e0d1c5b6..eed379673 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.cpp @@ -265,7 +265,7 @@ namespace Azure { namespace Storage { namespace Test { auto blobClient = GetAppendBlobClientForTest(RandomString()); auto blobClientWithoutAuth = Azure::Storage::Blobs::AppendBlobClient( - blobClient.GetUrl(), InitClientOptions()); + blobClient.GetUrl(), InitStorageClientOptions()); EXPECT_THROW(blobClientWithoutAuth.CreateIfNotExists(), StorageException); { auto response = blobClient.CreateIfNotExists(); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp index 26d916603..0814f4de8 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp @@ -107,7 +107,7 @@ namespace Azure { namespace Storage { namespace Test { auto serviceClient = *m_blobServiceClient; GetBlobContainerClientForTest(containerName).CreateIfNotExists(); Blobs::BlobClientOptions clientOptions; - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto containerClient = Blobs::BlobContainerClient( serviceClient.GetBlobContainerClient(containerName).GetUrl() + containerSasToken, clientOptions); @@ -135,7 +135,7 @@ namespace Azure { namespace Storage { namespace Test { = std::make_shared( AadTenantId(), AadClientId(), AadClientSecret()); Blobs::BlobClientOptions clientOptions; - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto serviceClient = Blobs::BlobServiceClient(m_blobServiceClient->GetUrl(), credential, clientOptions); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp index 8be8f3d05..1dc17f88a 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp @@ -55,7 +55,7 @@ namespace Azure { namespace Storage { namespace Test { const std::string& containerName, Blobs::BlobClientOptions clientOptions) { - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto blobContainerClient = Blobs::BlobContainerClient::CreateFromConnectionString( StandardStorageConnectionString(), containerName, clientOptions); m_resourceCleanupFunctions.push_back( diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp index dbb2d1796..0bd9e5d92 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp @@ -355,7 +355,7 @@ namespace Azure { namespace Storage { namespace Test { auto secondaryServiceClient = Blobs::BlobServiceClient( InferSecondaryUrl(serviceClient.GetUrl()), keyCredential, - InitClientOptions()); + InitStorageClientOptions()); auto serviceStatistics = secondaryServiceClient.GetStatistics().Value; EXPECT_FALSE(serviceStatistics.GeoReplication.Status.ToString().empty()); @@ -448,7 +448,7 @@ namespace Azure { namespace Storage { namespace Test { = std::make_shared( AadTenantId(), AadClientId(), AadClientSecret()); Blobs::BlobClientOptions options; - InitClientOptions(options); + InitStorageClientOptions(options); auto blobServiceClient1 = Blobs::BlobServiceClient(serviceClient.GetUrl(), credential, options); diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp index dc1eb8878..f3e30e657 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp +++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp @@ -15,7 +15,7 @@ namespace Azure { namespace Storage { namespace Test { { StorageTest::SetUp(); - auto options = InitClientOptions(); + auto options = InitStorageClientOptions(); m_blobServiceClient = std::make_shared( Blobs::BlobServiceClient::CreateFromConnectionString( StandardStorageConnectionString(), options)); diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp index 9ad68c461..1b226bbcb 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp @@ -693,7 +693,7 @@ namespace Azure { namespace Storage { namespace Test { auto blobClient = GetBlockBlobClientForTest(RandomString()); auto blobClientWithoutAuth = Azure::Storage::Blobs::BlockBlobClient( - blobClient.GetUrl(), InitClientOptions()); + blobClient.GetUrl(), InitStorageClientOptions()); { auto response = blobClient.DeleteIfExists(); EXPECT_FALSE(response.Value.Deleted); diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp index f9aa17d59..0401e4dd5 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp @@ -361,7 +361,8 @@ namespace Azure { namespace Storage { namespace Test { auto pageBlobClient = GetPageBlobClientTestForTest(RandomString()); auto blobClientWithoutAuth = Azure::Storage::Blobs::PageBlobClient( - pageBlobClient.GetUrl(), InitClientOptions()); + pageBlobClient.GetUrl(), + InitStorageClientOptions()); EXPECT_THROW(blobClientWithoutAuth.CreateIfNotExists(m_blobContent.size()), StorageException); { auto response = pageBlobClient.CreateIfNotExists(m_blobContent.size()); diff --git a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp index 34fd18ccf..13c7d0802 100644 --- a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp +++ b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp @@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Test { }; auto peekPolicyPtr = std::make_unique(callback); - Blobs::BlobClientOptions clientOptions = InitClientOptions(); + Blobs::BlobClientOptions clientOptions = InitStorageClientOptions(); clientOptions.PerRetryPolicies.emplace_back(std::move(peekPolicyPtr)); auto containerClient = Azure::Storage::Blobs::BlobContainerClient::CreateFromConnectionString( StandardStorageConnectionString(), LowercaseRandomString(), clientOptions); diff --git a/sdk/storage/azure-storage-common/test/ut/bearer_token_test.cpp b/sdk/storage/azure-storage-common/test/ut/bearer_token_test.cpp index 8fc594ee9..5c26892f1 100644 --- a/sdk/storage/azure-storage-common/test/ut/bearer_token_test.cpp +++ b/sdk/storage/azure-storage-common/test/ut/bearer_token_test.cpp @@ -14,9 +14,9 @@ namespace Azure { namespace Storage { namespace Test { AadTenantId(), AadClientId(), AadClientSecret(), - InitClientOptions()); + InitStorageClientOptions()); containerClient = Blobs::BlobContainerClient( - containerClient.GetUrl(), credential, InitClientOptions()); + containerClient.GetUrl(), credential, InitStorageClientOptions()); EXPECT_NO_THROW(containerClient.Create()); EXPECT_NO_THROW(containerClient.Delete()); diff --git a/sdk/storage/azure-storage-common/test/ut/test_base.cpp b/sdk/storage/azure-storage-common/test/ut/test_base.cpp index f8a320631..98c2b08cc 100644 --- a/sdk/storage/azure-storage-common/test/ut/test_base.cpp +++ b/sdk/storage/azure-storage-common/test/ut/test_base.cpp @@ -357,6 +357,190 @@ namespace Azure { namespace Storage { namespace Test { return secondaryUri.GetAbsoluteUrl(); } + void StorageTest::InitLoggingOptions(Azure::Core::_internal::ClientOptions& options) + { + // cspell:ignore mibps, numofmessages, rscc, rscd, rsce, rscl, rsct + const std::set allowedHttpHeaders = { + "x-ms-version", + "x-ms-write", + "x-ms-version-id", + "x-ms-type", + "x-ms-time-next-visible", + "x-ms-tags", + "x-ms-tag-count", + "x-ms-source-range", + "x-ms-source-lease-id", + "x-ms-source-if-unmodified-since", + "x-ms-source-if-tags", + "x-ms-source-if-none-match-crc64", + "x-ms-source-if-none-match", + "x-ms-source-if-modified-since", + "x-ms-source-if-match-crc64", + "x-ms-source-if-match", + "x-ms-source-content-md5", + "x-ms-source-content-crc64", + "x-ms-snapshot", + "x-ms-sku-name", + "x-ms-share-quota", + "x-ms-request-server-encrypted", + "x-ms-requires-sync", + "x-ms-resource-type", + "x-ms-root-squash", + "x-ms-seal-blob", + "x-ms-sequence-number-action", + "x-ms-server-encrypted", + "x-ms-share-next-allowed-quota-downgrade-time", + "x-ms-share-provisioned-bandwidth-mibps", + "x-ms-share-provisioned-egress-mbps", + "x-ms-share-provisioned-ingress-mbps", + "x-ms-share-provisioned-iops", + "x-ms-page-write", + "x-ms-permissions", + "x-ms-popreceipt", + "x-ms-properties", + "x-ms-proposed-lease-id", + "x-ms-range", + "x-ms-range-get-content-crc64", + "x-ms-range-get-content-md5", + "x-ms-rehydrate-priority", + "x-ms-meta-*", + "x-ms-namespace-enabled", + "x-ms-number-of-handles-closed", + "x-ms-number-of-handles-failed", + "x-ms-has-immutability-policy", + "x-ms-has-legal-hold", + "x-ms-if-sequence-number-eq", + "x-ms-if-sequence-number-le", + "x-ms-if-sequence-number-lt", + "x-ms-if-tags", + "x-ms-immutable-storage-with-versioning-enabled", + "x-ms-incremental-copy", + "x-ms-is-current-version", + "x-ms-is-hns-enabled", + "x-ms-is-soft-deleted", + "x-ms-lease-action", + "x-ms-lease-break-period", + "x-ms-lease-duration", + "x-ms-lease-id", + "x-ms-lease-renewed", + "x-ms-lease-state", + "x-ms-lease-status", + "x-ms-lease-time", + "accept-ranges", + "content-disposition", + "content-encoding", + "content-language", + "content-md5", + "content-range", + "x-ms-access-tier", + "x-ms-access-tier-change-time", + "x-ms-access-tier-inferred", + "x-ms-account-kind", + "x-ms-approximate-messages-count", + "x-ms-archive-status", + "x-ms-blob-append-offset", + "x-ms-blob-cache-control", + "x-ms-blob-committed-block-count", + "x-ms-blob-condition-appendpos", + "x-ms-blob-condition-maxsize", + "x-ms-blob-content-disposition", + "x-ms-blob-content-encoding", + "x-ms-blob-content-language", + "x-ms-blob-content-length", + "x-ms-blob-content-md5", + "x-ms-blob-content-type", + "x-ms-blob-public-access", + "x-ms-blob-sealed", + "x-ms-blob-sequence-number", + "x-ms-blob-type", + "x-ms-cache-control", + "x-ms-content-crc64", + "x-ms-content-disposition", + "x-ms-content-encoding", + "x-ms-content-language", + "x-ms-content-length", + "x-ms-content-type", + "x-ms-copy-completion-time", + "x-ms-copy-destination-snapshot", + "x-ms-copy-id", + "x-ms-copy-progress", + "x-ms-copy-source-blob-properties", + "x-ms-copy-source-tag-option", + "x-ms-copy-status", + "x-ms-creation-time", + "x-ms-date", + "x-ms-delete-snapshots", + "x-ms-delete-type-permanent", + "x-ms-deleted-container-name", + "x-ms-deleted-container-version", + "x-ms-deletion-id", + "x-ms-deny-encryption-scope-override", + "x-ms-destination-lease-id", + "x-ms-enabled-protocols", + "x-ms-encryption-algorithm", + "x-ms-error-code", + "x-ms-existing-resource-type", + "x-ms-expiry-option", + "x-ms-expiry-time", + "x-ms-file-attributes", + "x-ms-file-change-time", + "x-ms-file-creation-time", + "x-ms-file-last-write-time", + "x-ms-file-permission-copy-mode", + "x-ms-file-rename-ignore-readonly", + "x-ms-file-rename-replace-if-exists", + }; + const std::set allowedQueryParameters = { + "comp", + "blockid", + "restype", + "versionid", + "snapshot", + "sv", + "sr", + "sp", + "spr", + "se", + "where", + "prefix", + "maxresults", + "delimiter", + "include", + "blocklisttype", + "ss", + "st", + "srt", + "popreceipt", + "visibilitytimeout", + "peekonly", + "numofmessages", + "messagettl", + "rscc", + "rscd", + "rsce", + "rscl", + "rsct", + "resource", + "action", + "recursive", + "timeout", + "position", + "mode", + "showonly", + "flush", + "maxResults", + "ske", + "sks", + "skv", + "skt", + "sdd", + "directory", + }; + options.Log.AllowedHttpHeaders.insert(allowedHttpHeaders.begin(), allowedHttpHeaders.end()); + options.Log.AllowedHttpQueryParameters.insert( + allowedQueryParameters.begin(), allowedQueryParameters.end()); + } + const Azure::ETag StorageTest::DummyETag("0x8D83B58BDF51D75"); const Azure::ETag StorageTest::DummyETag2("0x8D812645BFB0CDE"); diff --git a/sdk/storage/azure-storage-common/test/ut/test_base.hpp b/sdk/storage/azure-storage-common/test/ut/test_base.hpp index da26d99ee..3955b896c 100644 --- a/sdk/storage/azure-storage-common/test/ut/test_base.hpp +++ b/sdk/storage/azure-storage-common/test/ut/test_base.hpp @@ -152,9 +152,25 @@ namespace Azure { namespace Storage { return Azure::Core::Convert::Base64Encode(std::vector(text.begin(), text.end())); } + template T InitStorageClientOptions() + { + T options; + InitStorageClientOptions(options); + return options; + } + template void InitStorageClientOptions(T& options) + { + InitClientOptions(options); + InitLoggingOptions(options); + } + protected: std::vector> m_resourceCleanupFunctions; + private: + void InitLoggingOptions(Azure::Core::_internal::ClientOptions& options); + using TestBase::InitClientOptions; + private: std::mt19937_64 m_randomGenerator; }; diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp index 43aabe43e..b891792a4 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp @@ -170,7 +170,7 @@ namespace Azure { namespace Storage { namespace Test { Files::DataLake::DataLakeDirectoryClient directoryClientSas( Files::DataLake::_detail::GetDfsUrlFromUrl(baseDirectoryClient.GetUrl()) + GetSas(), - InitClientOptions()); + InitStorageClientOptions()); directoryClientSas.RenameFile(sourceFilename, destinationFilename); EXPECT_THROW( baseDirectoryClient.GetFileClient(sourceFilename).GetProperties(), StorageException); diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp index 43009ca13..9b6f25570 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp @@ -66,7 +66,7 @@ namespace Azure { namespace Storage { namespace Test { const std::string& fileSystemName, Files::DataLake::DataLakeClientOptions clientOptions) { - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto fsClient = Files::DataLake::DataLakeFileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), fileSystemName, clientOptions); m_resourceCleanupFunctions.push_back([fsClient]() { fsClient.DeleteIfExists(); }); @@ -278,7 +278,7 @@ namespace Azure { namespace Storage { namespace Test { = Azure::Storage::Files::DataLake::DataLakeFileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), fileSystemName, - InitClientOptions()); + InitStorageClientOptions()); EXPECT_NO_THROW(connectionStringClient.Create()); EXPECT_NO_THROW(connectionStringClient.Delete()); } @@ -711,7 +711,7 @@ namespace Azure { namespace Storage { namespace Test { fileClient.CreateIfNotExists(); Files::DataLake::DataLakeClientOptions options; - InitClientOptions(options); + InitStorageClientOptions(options); Files::DataLake::DataLakeFileSystemClient fileSystemClientSas( Files::DataLake::_detail::GetDfsUrlFromUrl(m_fileSystemClient->GetUrl()) + GetSas(), options); diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp index 137b6c51c..16a88bd0d 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp @@ -331,7 +331,7 @@ namespace Azure { namespace Storage { namespace Test { AdlsGen2ConnectionString(), m_fileSystemName, baseName + "1", - InitClientOptions()); + InitStorageClientOptions()); pathClient.Create(Files::DataLake::Models::PathResourceType::File); std::string pathPermissions = "rwxrw-rw-"; EXPECT_NO_THROW(pathClient.SetPermissions(pathPermissions)); @@ -353,7 +353,7 @@ namespace Azure { namespace Storage { namespace Test { AdlsGen2ConnectionString(), m_fileSystemName, baseName + "2", - InitClientOptions()); + InitStorageClientOptions()); auto response = pathClient.Create(Files::DataLake::Models::PathResourceType::File); Files::DataLake::SetPathPermissionsOptions options1, options2; options1.AccessConditions.IfUnmodifiedSince = response.Value.LastModified; @@ -368,7 +368,7 @@ namespace Azure { namespace Storage { namespace Test { AdlsGen2ConnectionString(), m_fileSystemName, baseName + "3", - InitClientOptions()); + InitStorageClientOptions()); auto response = pathClient.Create(Files::DataLake::Models::PathResourceType::File); Files::DataLake::SetPathPermissionsOptions options1, options2; options1.AccessConditions.IfMatch = response.Value.ETag; diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp index c922e88e7..04b28787f 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.cpp @@ -180,7 +180,7 @@ namespace Azure { namespace Storage { namespace Test { .GetUrl(); auto datalakeServiceClient = Azure::Storage::Files::DataLake::DataLakeServiceClient( datalakeServiceUrl + sasToken, - InitClientOptions()); + InitStorageClientOptions()); EXPECT_NO_THROW(datalakeServiceClient.ListFileSystems()); } diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp index a19ce04bf..408e42616 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp @@ -12,7 +12,7 @@ namespace Azure { namespace Storage { namespace Test { void SetUp() override { StorageTest::SetUp(); - auto options = InitClientOptions(); + auto options = InitStorageClientOptions(); m_dataLakeServiceClient = std::make_shared( Files::DataLake::DataLakeServiceClient::CreateFromConnectionString( AdlsGen2ConnectionString(), options)); diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp index 1c83a1925..101a4af7e 100644 --- a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp @@ -67,7 +67,7 @@ namespace Azure { namespace Storage { namespace Test { const std::string& shareName, Files::Shares::ShareClientOptions clientOptions) { - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString( StandardStorageConnectionString(), shareName, clientOptions); m_resourceCleanupFunctions.push_back([shareClient]() { @@ -83,7 +83,7 @@ namespace Azure { namespace Storage { namespace Test { const std::string& shareName, Files::Shares::ShareClientOptions clientOptions) { - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto shareClient = Files::Shares::ShareClient::CreateFromConnectionString( PremiumFileConnectionString(), shareName, clientOptions); m_resourceCleanupFunctions.push_back([shareClient]() { shareClient.DeleteIfExists(); }); @@ -531,7 +531,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(FileShareClientTest, PremiumShare) { - auto shareClientOptions = InitClientOptions(); + auto shareClientOptions = InitStorageClientOptions(); auto shareServiceClient = Files::Shares::ShareServiceClient::CreateFromConnectionString( PremiumFileConnectionString(), shareClientOptions); { diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp index 3a7366bb9..2025212f5 100644 --- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp @@ -825,7 +825,7 @@ namespace Azure { namespace Storage { namespace Test { TEST_F(FileShareFileClientTest, StorageExceptionAdditionalInfo) { - auto options = InitClientOptions(); + auto options = InitStorageClientOptions(); class InvalidQueryParameterPolicy final : public Azure::Core::Http::Policies::HttpPolicy { public: ~InvalidQueryParameterPolicy() override {} diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp index 6ba1eec5f..12bf9f3e6 100644 --- a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp +++ b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.cpp @@ -20,7 +20,7 @@ namespace Azure { namespace Storage { namespace Test { { StorageTest::SetUp(); - auto options = InitClientOptions(); + auto options = InitStorageClientOptions(); m_shareServiceClient = std::make_shared( Files::Shares::ShareServiceClient::CreateFromConnectionString( StandardStorageConnectionString(), options)); diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_client_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_client_test.cpp index 791c6e79a..f81236826 100644 --- a/sdk/storage/azure-storage-queues/test/ut/queue_client_test.cpp +++ b/sdk/storage/azure-storage-queues/test/ut/queue_client_test.cpp @@ -28,7 +28,7 @@ namespace Azure { namespace Storage { namespace Test { { return; } - auto options = InitClientOptions(); + auto options = InitStorageClientOptions(); m_queueServiceClient = std::make_shared( Queues::QueueServiceClient::CreateFromConnectionString( StandardStorageConnectionString(), options)); @@ -63,7 +63,7 @@ namespace Azure { namespace Storage { namespace Test { const std::string& queueName, Queues::QueueClientOptions clientOptions) { - InitClientOptions(clientOptions); + InitStorageClientOptions(clientOptions); auto queueClient = Queues::QueueClient::CreateFromConnectionString( StandardStorageConnectionString(), queueName, clientOptions); m_resourceCleanupFunctions.push_back([queueClient]() { queueClient.Delete(); }); diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp index b04874688..1be6664b5 100644 --- a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp +++ b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp @@ -43,8 +43,7 @@ namespace Azure { namespace Storage { namespace Test { void SetUp() { StorageTest::SetUp(); - - m_options = InitClientOptions(); + m_options = InitStorageClientOptions(); m_queueServiceClient = std::make_shared( Queues::QueueServiceClient::CreateFromConnectionString( StandardStorageConnectionString(), m_options));