From 9f58947056352c55def5eabef2b013227741c642 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Fri, 18 Feb 2022 17:15:07 -0800 Subject: [PATCH] use ref instead of pointer (#3364) --- .../azure-core-test/inc/azure/core/test/test_base.hpp | 10 +++++----- .../test/ut/certificate_client_base_test.hpp | 2 +- .../test/ut/key_client_base_test.hpp | 6 +++--- .../test/ut/secret_client_base_test.hpp | 2 +- .../test/ut/blob_service_client_test.cpp | 2 +- sdk/storage/azure-storage-common/test/ut/test_base.hpp | 2 +- .../test/ut/datalake_directory_client_test.cpp | 2 +- .../test/ut/datalake_file_client_test.cpp | 2 +- .../test/ut/datalake_file_system_client_test.cpp | 2 +- .../test/ut/datalake_path_client_test.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp b/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp index a43d8c92c..ec916d032 100644 --- a/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp +++ b/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp @@ -64,7 +64,7 @@ namespace Azure { namespace Core { namespace Test { // If Playback or Record is not set, no changes will be done to the clientOptions or credential. // Call this before creating the SDK client void PrepareClientOptions( - std::shared_ptr** credential, + std::shared_ptr& credential, Azure::Core::_internal::ClientOptions& options) { // Set up client options depending on the test-mode @@ -74,7 +74,7 @@ namespace Azure { namespace Core { namespace Test { // - playback transport adapter to read and return payload from json files // - never-expiring test credential to never require a token options.Transport.Transport = m_interceptor->GetPlaybackTransport(); - **credential = m_interceptor->GetTestCredential(); + credential = m_interceptor->GetTestCredential(); } else if (!m_testContext.IsLiveMode()) { @@ -190,12 +190,12 @@ namespace Azure { namespace Core { namespace Test { template std::unique_ptr InitTestClient( std::string const& url, - std::shared_ptr* credential, + std::shared_ptr& credential, O& options) { // Run instrumentation before creating the client - PrepareClientOptions(&credential, options); - return std::make_unique(url, *credential, options); + PrepareClientOptions(credential, options); + return std::make_unique(url, credential, options); } template T InitClientOptions() diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp index a155f8f4f..dde88453e 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp @@ -77,7 +77,7 @@ namespace Azure { m_client = InitTestClient< Azure::Security::KeyVault::Certificates::CertificateClient, Azure::Security::KeyVault::Certificates::CertificateClientOptions>( - m_keyVaultUrl, &m_credential, options); + m_keyVaultUrl, m_credential, options); // Update default time depending on test mode. UpdateWaitingTime(m_defaultWait); diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp index fd65f44d5..d7553a6f2 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp @@ -48,7 +48,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam return InitTestClient< Azure::Security::KeyVault::Keys::Cryptography::CryptographyClient, Azure::Security::KeyVault::Keys::Cryptography::CryptographyClientOptions>( - keyId, &m_credential, options); + keyId, m_credential, options); } // Create @@ -66,7 +66,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam // `InitTestClient` takes care of setting up Record&Playback. m_client = InitTestClient< Azure::Security::KeyVault::Keys::KeyClient, - Azure::Security::KeyVault::Keys::KeyClientOptions>(m_keyVaultUrl, &m_credential, options); + Azure::Security::KeyVault::Keys::KeyClientOptions>(m_keyVaultUrl, m_credential, options); UpdateWaitingTime(m_testPollingIntervalMs); } @@ -77,7 +77,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam m_client = InitTestClient< Azure::Security::KeyVault::Keys::KeyClient, Azure::Security::KeyVault::Keys::KeyClientOptions>( - m_keyVaultHsmUrl, &m_credential, options); + m_keyVaultHsmUrl, m_credential, options); } public: diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp index 95de32c49..a37bf6ad3 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp @@ -53,7 +53,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Secrets { m_client = InitTestClient< Azure::Security::KeyVault::Secrets::SecretClient, Azure::Security::KeyVault::Secrets::SecretClientOptions>( - m_keyVaultUrl, &m_credential, options); + m_keyVaultUrl, m_credential, options); // Update default time depending on test mode. UpdateWaitingTime(m_defaultWait); 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 1ab7a0949..8a00d7e90 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 @@ -475,7 +475,7 @@ namespace Azure { namespace Storage { namespace Test { Blobs::BlobClientOptions options; auto blobServiceClient1 = InitTestClient( - client.GetUrl(), &credential, options); + client.GetUrl(), credential, options); auto userDelegationKey = blobServiceClient1->GetUserDelegationKey(sasExpiresOn).Value; 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 f6ac42305..d75ba434a 100644 --- a/sdk/storage/azure-storage-common/test/ut/test_base.hpp +++ b/sdk/storage/azure-storage-common/test/ut/test_base.hpp @@ -192,7 +192,7 @@ namespace Azure { namespace Storage { Azure::Storage::Blobs::BlobContainerClient::CreateFromConnectionString( StandardStorageConnectionString(), m_containerName) .GetUrl(), - &m_credential, + m_credential, options); } }; 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 c9adf900c..d333e2d2e 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 @@ -678,7 +678,7 @@ namespace Azure { namespace Storage { namespace Test { Azure::Storage::Files::DataLake::DataLakeDirectoryClient::CreateFromConnectionString( AdlsGen2ConnectionString(), m_fileSystemName, GetTestName() + "a") .GetUrl()), - &credential, + credential, options); EXPECT_NO_THROW(clientSecretClient->Create()); diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp index b8332a153..b79db998a 100644 --- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp +++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp @@ -539,7 +539,7 @@ namespace Azure { namespace Storage { namespace Test { Azure::Storage::Files::DataLake::DataLakeFileClient::CreateFromConnectionString( AdlsGen2ConnectionString(), m_fileSystemName, "credential") .GetUrl()), - &credential, + credential, options); EXPECT_NO_THROW(clientSecretClient->Create()); 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 bf712a773..c10849c15 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 @@ -377,7 +377,7 @@ namespace Azure { namespace Storage { namespace Test { Azure::Storage::Files::DataLake::DataLakeFileSystemClient::CreateFromConnectionString( AdlsGen2ConnectionString(), GetTestNameLowerCase()) .GetUrl(), - &credential, + credential, options); EXPECT_NO_THROW(clientSecretClient->Create()); 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 1a809d8f6..fd434af7c 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 @@ -394,7 +394,7 @@ namespace Azure { namespace Storage { namespace Test { GetTestName() + "withSecret", InitClientOptions()) .GetUrl()), - &credential, + credential, options); EXPECT_NO_THROW(clientSecretClient->Create(Files::DataLake::Models::PathResourceType::File));