Skip to content

Commit 5370d07

Browse files
cdavernascdavernas
committed
fix(Operator): Fixed the WorkflowScheduler to name correlations after the workflow they are associated to
fix(Runner): Fixed the WorkflowExecutionContext to name correlations using a concatenation of the name of the instance and the task they are associated to fix(Solution): Updated Neuroglia packages to latest version Fixes #372
1 parent e613231 commit 5370d07

File tree

9 files changed

+28
-29
lines changed

9 files changed

+28
-29
lines changed

‎src/api/Synapse.Api.Http/Synapse.Api.Http.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.2" />
14-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.2" />
13+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.3" />
14+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.3" />
1515
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
1616
</ItemGroup>
1717

‎src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="IdentityModel" Version="7.0.0" />
13-
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.15.2" />
14-
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.15.2" />
15-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.2" />
16-
<PackageReference Include="Neuroglia.Mediation" Version="4.15.2" />
17-
<PackageReference Include="Neuroglia.Plugins" Version="4.15.2" />
13+
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.15.3" />
14+
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.15.3" />
15+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.3" />
16+
<PackageReference Include="Neuroglia.Mediation" Version="4.15.3" />
17+
<PackageReference Include="Neuroglia.Plugins" Version="4.15.3" />
1818
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.12" />
19-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
19+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/core/Synapse.Core/Synapse.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.15.2" />
36-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.15.2" />
35+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.15.3" />
36+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.15.3" />
3737
<PackageReference Include="Semver" Version="2.3.0" />
3838
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha2.12" />
3939
</ItemGroup>

‎src/correlator/Synapse.Correlator/Synapse.Correlator.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="8.0.8" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
1818
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
19-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.15.2" />
20-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.2" />
21-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.15.2" />
22-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.2" />
23-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.15.2" />
24-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.2" />
19+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.15.3" />
20+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.3" />
21+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.15.3" />
22+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.15.3" />
23+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.15.3" />
24+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.15.3" />
2525
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
2626
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
2727
</ItemGroup>

‎src/dashboard/Synapse.Dashboard/Synapse.Dashboard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.8" />
3535
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
3636
<PackageReference Include="moment.net" Version="1.3.4" />
37-
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.15.2" />
37+
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.15.3" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎src/operator/Synapse.Operator/Services/WorkflowScheduler.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@ public virtual async Task ScheduleAsync(CancellationToken cancellationToken = de
6969
if (this.WorkflowDefinition.Schedule == null) return;
7070
if (this.WorkflowDefinition.Schedule.On != null)
7171
{
72-
var correlationName = $"{this.Workflow.Resource.GetName()}-schedule";
73-
var correlation = await this.Resources.GetAsync<Correlation>(correlationName, this.Workflow.Resource.GetNamespace(), cancellationToken).ConfigureAwait(false);
72+
var correlation = await this.Resources.GetAsync<Correlation>(this.Workflow.Resource.GetName(), this.Workflow.Resource.GetNamespace(), cancellationToken).ConfigureAwait(false);
7473
if (correlation != null) return;
7574
correlation = new Correlation()
7675
{
7776
Metadata = new()
7877
{
7978
Namespace = this.Workflow.Resource.GetNamespace(),
80-
Name = correlationName,
79+
Name = this.Workflow.Resource.GetName(),
8180
Labels = new Dictionary<string, string>()
8281
{
8382
{ SynapseDefaults.Resources.Labels.Workflow, this.Workflow.Resource.GetQualifiedName() }

‎src/runner/Synapse.Runner/Services/WorkflowExecutionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public virtual async Task<CorrelationContext> CorrelateAsync(ITaskExecutionConte
224224
if (task.Definition is not ListenTaskDefinition listenTask) throw new ArgumentException("The specified task's definition must be a 'listen' task", nameof(task));
225225
if (this.Instance.Status?.Correlation?.Contexts?.TryGetValue(task.Instance.Reference.OriginalString, out var context) == true && context != null) return context;
226226
var @namespace = task.Workflow.Instance.GetNamespace()!;
227-
var name = $"{@namespace}.{task.Workflow.Instance.GetName()}.{task.Instance.Id}";
227+
var name = $"{task.Workflow.Instance.GetName()}.{task.Instance.Id}";
228228
Correlation? correlation = null;
229229
try { correlation = await this.Api.Correlations.GetAsync(name, @namespace, cancellationToken).ConfigureAwait(false); }
230230
catch { }

‎src/runner/Synapse.Runner/Synapse.Runner.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
4141
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.19" />
4242
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
43-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.15.2" />
44-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.2" />
45-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.15.2" />
46-
<PackageReference Include="Neuroglia.Scripting.NodeJS" Version="4.15.2" />
47-
<PackageReference Include="Neuroglia.Scripting.Python" Version="4.15.2" />
43+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.15.3" />
44+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.3" />
45+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.15.3" />
46+
<PackageReference Include="Neuroglia.Scripting.NodeJS" Version="4.15.3" />
47+
<PackageReference Include="Neuroglia.Scripting.Python" Version="4.15.3" />
4848
<PackageReference Include="protobuf-net.Grpc.ClientFactory" Version="1.1.1" />
4949
<PackageReference Include="System.Reactive" Version="6.0.1" />
5050
</ItemGroup>

‎tests/Synapse.UnitTests/Synapse.UnitTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
2121
<PackageReference Include="Moq" Version="4.20.70" />
22-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.2" />
23-
<PackageReference Include="Neuroglia.Data.Infrastructure.Memory" Version="4.15.2" />
24-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.2" />
22+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.15.3" />
23+
<PackageReference Include="Neuroglia.Data.Infrastructure.Memory" Version="4.15.3" />
24+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.15.3" />
2525
<PackageReference Include="ServerlessWorkflow.Sdk.Builders" Version="1.0.0-alpha2.12" />
2626
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.12" />
2727
<PackageReference Include="Testcontainers" Version="3.9.0" />

0 commit comments

Comments
 (0)