Skip to content

Fixed bug in Eventhubs live tests #5290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LarryOsterman merged 3 commits into from
Jan 24, 2024
Merged

Fixed bug in Eventhubs live tests #5290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b18b8
Fixed bug in Eventhubs live tests
LarryOsterman Jan 24, 2024
7d40223
clang-format
LarryOsterman Jan 24, 2024
89db636
switched back to DAC for tests
LarryOsterman Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixed bug in Eventhubs live tests
  • Loading branch information
@LarryOsterman
LarryOsterman committed Jan 24, 2024
commit 82b18b8cd8aac1eb81490cc1e027bd3efb36311c
7 changes: 5 additions & 2 deletions ...bs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor_partition_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ namespace Azure { namespace Messaging { namespace EventHubs {
/// Returns the partition ID associated with this ProcessorPartitionClient.
std::string PartitionId() const { return m_partitionId; }

/** Closes the partition client. */
void Close(Core::Context const& context)
/** @brief Closes the partition client.
*
* @param context The context to pass to the close operation.
*/
void Close(Core::Context const& context = {})
{
if (m_cleanupFunc)
{
Expand Down
37 changes: 4 additions & 33 deletions sdk/eventhubs/azure-messaging-eventhubs/test/ut/eventhubs_admin_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <azure/core/internal/json/json.hpp>
#include <azure/core/platform.hpp>
#include <azure/core/response.hpp>
#include <azure/identity/default_azure_credential.hpp>
#include <azure/identity/azure_cli_credential.hpp>

#include <memory>
#include <sstream>
Expand All @@ -35,7 +35,7 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace Test {
tokenContext.Scopes = {"https://management.azure.com/.default"};
perRetrypolicies.emplace_back(
std::make_unique<Azure::Core::Http::Policies::_internal::BearerTokenAuthenticationPolicy>(
std::make_unique<Azure::Identity::DefaultAzureCredential>(), tokenContext));
std::make_unique<Azure::Identity::AzureCliCredential>(), tokenContext));
}
std::vector<std::unique_ptr<Azure::Core::Http::Policies::HttpPolicy>> perCallpolicies;
options.Telemetry.ApplicationId = "eventhubs.test";
Expand All @@ -48,35 +48,6 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace Test {
std::move(perCallpolicies));
}

Azure::Core::Json::_internal::json ParseAzureCliOutput(std::string const& cliOutput)
{
GTEST_LOG_(INFO) << "Azure CLI output: " << cliOutput;
std::string jsonOutput = cliOutput;
if (jsonOutput.find("WARNING:") == 0)
{
// Erase the warning from the CLI.
jsonOutput = jsonOutput.erase(0, cliOutput.find('\n') + 1);
}
if (jsonOutput.find("DEBUG:") == 0)
{
// Erase the warning from the CLI.
GTEST_LOG_(WARNING) << "Azure CLI debug output: " << jsonOutput;
jsonOutput = jsonOutput.erase(0, cliOutput.find('\n') + 1);
}
if (jsonOutput.find("ERROR:") == 0)
{
throw std::runtime_error("Error processing Azure CLI: " + jsonOutput);
}
if (jsonOutput.empty())
{
return {};
}
else
{
return Azure::Core::Json::_internal::json::parse(jsonOutput);
}
}

EventHubsManagement::EventHubsCreateOrUpdateOperation EventHubsManagement::CreateNamespace(
std::string const& namespaceName,
EventHubsPricingTier pricingTier,
Expand Down Expand Up @@ -435,8 +406,8 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace Test {
std::string const& resourceGroup,
std::string const& subscriptionId,
Azure::Core::Context const& context)
: m_name(name), m_resourceGroup(resourceGroup),
m_subscriptionId(subscriptionId), m_pipeline{pipeline}
: m_name(name), m_resourceGroup(resourceGroup), m_subscriptionId(subscriptionId),
m_pipeline{pipeline}
{
Azure::Core::Url requestUrl(
"https://management.azure.com/subscriptions/" + Azure::Core::Url::Encode(m_subscriptionId)
Expand Down
9 changes: 7 additions & 2 deletions sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,17 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace Test {
while (!partitionClients.empty())
{
auto partitionClientIterator = partitionClients.begin();
auto partitionClient = partitionClientIterator->second;
std::shared_ptr<ProcessorPartitionClient> partitionClient;
if (partitionClientIterator != partitionClients.end())
{
partitionClient = partitionClientIterator->second;
partitionClients.erase(partitionClientIterator);
}
partitionClient->Close(context);
// Don't re-use the context variable here, because it's been canceled.
if (partitionClient)
{
partitionClient->Close();
}
}

processor.Stop();
Expand Down