Skip to content

Fix for DI registration not completing as expected #1386

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
WhitWaldo merged 11 commits into from
Nov 5, 2024
Merged

Fix for DI registration not completing as expected #1386

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
20823af
Tentative fix for DI registration not completing as expected
WhitWaldo Oct 27, 2024
26d3608
Making injected IConfiguration optional as it might not be populated …
WhitWaldo Oct 27, 2024
26b45bc
Fixed DI injection issue
WhitWaldo Oct 27, 2024
b9d8a19
Removed registration of DaprWorkflowClientBuilderFactory
WhitWaldo Oct 29, 2024
b82d046
Updated field names for consistency
WhitWaldo Oct 29, 2024
f014b09
Minor formatting changes
WhitWaldo Oct 29, 2024
e950337
Merge branch 'master' into workflow-bug
WhitWaldo Oct 29, 2024
998f46c
Merge branch 'master' into workflow-bug
WhitWaldo Nov 1, 2024
662f437
Merge branch 'master' into workflow-bug
WhitWaldo Nov 1, 2024
5374039
Merge branch 'master' into workflow-bug
WhitWaldo Nov 4, 2024
cc03821
Fixed build error caused by bad merge resolution
WhitWaldo Nov 5, 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
Prev Previous commit
Next Next commit
Updated field names for consistency 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
  • Loading branch information
@WhitWaldo
WhitWaldo committed Oct 29, 2024
commit b82d046147101eb1cc337ed6d0f7a2719b959bfa
20 changes: 10 additions & 10 deletions src/Dapr.Workflow/DaprWorkflowClientBuilderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ namespace Dapr.Workflow;
/// </summary>
internal sealed class DaprWorkflowClientBuilderFactory
{
private readonly IConfiguration? _configuration;
private readonly IHttpClientFactory _httpClientFactory;
private readonly IConfiguration? configuration;
private readonly IHttpClientFactory httpClientFactory;

/// <summary>
/// Constructor used to inject the required types into the factory.
/// </summary>
public DaprWorkflowClientBuilderFactory(IConfiguration? configuration, IHttpClientFactory httpClientFactory)
{
_configuration = configuration;
_httpClientFactory = httpClientFactory;
this.configuration = configuration;
this.httpClientFactory = httpClientFactory;
}

/// <summary>
Expand All @@ -48,10 +48,10 @@ public void CreateClientBuilder(IServiceCollection services, Action<WorkflowRunt
{
services.AddDurableTaskClient(builder =>
{
var apiToken = DaprDefaults.GetDefaultDaprApiToken(_configuration);
var grpcEndpoint = DaprDefaults.GetDefaultGrpcEndpoint(_configuration);
var apiToken = DaprDefaults.GetDefaultDaprApiToken(configuration);
var grpcEndpoint = DaprDefaults.GetDefaultGrpcEndpoint(configuration);

var httpClient = _httpClientFactory.CreateClient();
var httpClient = httpClientFactory.CreateClient();

if (!string.IsNullOrWhiteSpace(apiToken))
{
Expand All @@ -67,12 +67,12 @@ public void CreateClientBuilder(IServiceCollection services, Action<WorkflowRunt
WorkflowRuntimeOptions options = new();
configure?.Invoke(options);

var apiToken = DaprDefaults.GetDefaultDaprApiToken(_configuration);
var grpcEndpoint = DaprDefaults.GetDefaultGrpcEndpoint(_configuration);
var apiToken = DaprDefaults.GetDefaultDaprApiToken(configuration);
var grpcEndpoint = DaprDefaults.GetDefaultGrpcEndpoint(configuration);

if (!string.IsNullOrEmpty(grpcEndpoint))
{
var httpClient = _httpClientFactory.CreateClient();
var httpClient = httpClientFactory.CreateClient();

if (!string.IsNullOrWhiteSpace(apiToken))
{
Expand Down