Skip to content
This repository was archived by the owner on Oct 3, 2025. It is now read-only.

update hotchocolate #56

Open
Carael wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update hotchocolate #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7791c61
update hotchocolate
Carael Mar 26, 2025
68f936e
Update HotChocolate packages and configure Azure credential options
Carael Jun 4, 2025
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="13.9.0" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="13.9.0" />
<PackageVersion Include="HotChocolate.Data" Version="13.9.0" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="15.1.5" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="15.1.5" />
<PackageVersion Include="HotChocolate.Data" Version="15.1.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
Expand Down
17 changes: 15 additions & 2 deletions src/Messaging.AzureServiceBus/MessageBus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ public sealed class MessageBus : IMessageBus
private readonly ILogger<MessageBus> _logger;
private readonly ServiceBusClient _client;
private readonly ServiceBusAdministrationClient _adminClient;
private readonly DefaultAzureCredentialOptions _azureCredentialOptions = new DefaultAzureCredentialOptions
{
ExcludeEnvironmentCredential = true,
ExcludeManagedIdentityCredential = true,
ExcludeSharedTokenCacheCredential = true,
ExcludeInteractiveBrowserCredential = true,
ExcludeVisualStudioCredential = true,
ExcludeVisualStudioCodeCredential = true,
ExcludeAzurePowerShellCredential = true,
ExcludeAzureDeveloperCliCredential = true,
ExcludeWorkloadIdentityCredential = false,
ExcludeAzureCliCredential = false
};

public MessageBus(AzureServiceBusOptions options, ILogger<MessageBus> logger)
{
Expand All @@ -33,7 +46,7 @@ public MessageBus(AzureServiceBusOptions options, ILogger<MessageBus> logger)
{ Url: { } url } when !string.IsNullOrEmpty(url) =>
new ServiceBusClient(
url,
new WorkloadIdentityCredential(),
new DefaultAzureCredential(_azureCredentialOptions),
new ServiceBusClientOptions { TransportType = options.TransportType }),
_ => throw new ArgumentException(
"ConnectionString or Url is required for Azure Service Bus.")
Expand All @@ -49,7 +62,7 @@ private ServiceBusAdministrationClient GetServiceBusAdministrationClient(
{ Url: { } url } when !string.IsNullOrEmpty(url) =>
new ServiceBusAdministrationClient(
url,
new WorkloadIdentityCredential(),
new DefaultAzureCredential(_azureCredentialOptions),
new ServiceBusAdministrationClientOptions { Diagnostics = { IsDistributedTracingEnabled = true } }),
_ => throw new ArgumentException(
"ConnectionString or Url is required for Azure Service Bus.")
Expand Down