Skip to content

Commit 3a65951

Browse files
cdavernascdavernas
committed
fix(Sdk): Updated the EventDefinition by adding the DataOnly property
fix(Solution): Updated solution packages fix(Solution): Updated solution to v0.8.1.9 fix(UnitTests): Fixed all unit tests
1 parent ab7f317 commit 3a65951

File tree

8 files changed

+45
-31
lines changed

8 files changed

+45
-31
lines changed

‎src/ServerlessWorkflow.Sdk.UnitTests/Cases/Validation/FunctionDefinitionValidationTests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ public void Validate_Function_WithAutentication_ShouldWork()
3636
result.Should()
3737
.NotBeNull();
3838
result.Errors.Should()
39-
.NotBeNullOrEmpty()
40-
.And.HaveCount(1)
41-
.And.Contain(e => e.PropertyName == nameof(FunctionDefinition.AuthRef));
39+
.BeNullOrEmpty();
4240
}
4341

4442
[Fact]

‎src/ServerlessWorkflow.Sdk.UnitTests/Resources/workflows/externalref.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"id": "ExternalRef",
33
"name": "ExternalRef",
44
"version": "0.1.0",
5-
//"dataInputSchema": "file:///resources/schemas/externalref.json",
6-
"constants": "file:///resources/constants/petstore.json",
7-
"events": "file:///resources/events/petstore.json",
8-
"functions": "file:///resources/functions/petstore.json",
9-
"retries": "file:///resources/retries/default.json",
10-
"secrets": "file:///resources/secrets/default.json",
11-
"auth": "file:///resources/auths/default.json",
5+
//"dataInputSchema": "file://resources/schemas/externalref.json",
6+
"constants": "file://resources/constants/petstore.json",
7+
"events": "file://resources/events/petstore.json",
8+
"functions": "file://resources/functions/petstore.json",
9+
"retries": "file://resources/retries/default.json",
10+
"secrets": "file://resources/secrets/default.json",
11+
"auth": "file://resources/auths/default.json",
1212
"states": [
1313
{
1414
"name": "CreatePet",

‎src/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FluentAssertions" Version="6.6.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
12-
<PackageReference Include="Moq" Version="4.17.2" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
10+
<PackageReference Include="FluentAssertions" Version="6.7.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
12+
<PackageReference Include="Moq" Version="4.18.2" />
13+
<PackageReference Include="xunit" Version="2.4.2" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>

‎src/ServerlessWorkflow.Sdk/Models/EventDefinition.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,17 @@ public class EventDefinition
7272
public virtual List<EventCorrelationDefinition>? Correlations { get; set; }
7373

7474
/// <summary>
75-
/// Gets/sets the <see cref="EventDefinition"/>'s metadata
75+
/// Gets/sets a boolean indicating whether or not to use the event's data only (thus making data the top level element, instead of including all context attributes at top level). Defaults to true.
7676
/// </summary>
7777
[ProtoMember(6)]
7878
[DataMember(Order = 6)]
79+
public virtual bool DataOnly { get; set; } = true;
80+
81+
/// <summary>
82+
/// Gets/sets the <see cref="EventDefinition"/>'s metadata
83+
/// </summary>
84+
[ProtoMember(7)]
85+
[DataMember(Order = 7)]
7986
public virtual DynamicObject? Metadata { get; set; }
8087

8188
/// <inheritdoc/>

‎src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<NeutralLanguage>en</NeutralLanguage>
7-
<AssemblyVersion>0.8.1.8</AssemblyVersion>
8-
<FileVersion>0.8.1.8</FileVersion>
9-
<Version>0.8.1.8</Version>
7+
<AssemblyVersion>0.8.1.9</AssemblyVersion>
8+
<FileVersion>0.8.1.9</FileVersion>
9+
<Version>0.8.1.9</Version>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1111
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1212
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -43,22 +43,22 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="CloudNative.CloudEvents" Version="2.2.0" />
47-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="10.4.0" />
46+
<PackageReference Include="CloudNative.CloudEvents" Version="2.3.1" />
47+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.2.0" />
4848
<PackageReference Include="Iso8601DurationHelper" Version="1.0.5" />
4949
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
5050
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
5151
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
52-
<PackageReference Include="Neuroglia.Serialization.Dynamic" Version="2.0.1.57" />
53-
<PackageReference Include="Neuroglia.Serialization.Json" Version="2.0.1.57" />
54-
<PackageReference Include="Neuroglia.Serialization.NewtonsoftJson" Version="2.0.1.57" />
55-
<PackageReference Include="Neuroglia.Serialization.Protobuf" Version="2.0.1.57" />
56-
<PackageReference Include="Neuroglia.Serialization.YamlDotNet" Version="2.0.1.57" />
52+
<PackageReference Include="Neuroglia.Serialization.Dynamic" Version="2.0.1.70" />
53+
<PackageReference Include="Neuroglia.Serialization.Json" Version="2.0.1.70" />
54+
<PackageReference Include="Neuroglia.Serialization.NewtonsoftJson" Version="2.0.1.70" />
55+
<PackageReference Include="Neuroglia.Serialization.Protobuf" Version="2.0.1.70" />
56+
<PackageReference Include="Neuroglia.Serialization.YamlDotNet" Version="2.0.1.70" />
5757
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
5858
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
59-
<PackageReference Include="Octokit" Version="0.50.0" />
60-
<PackageReference Include="protobuf-net.Core" Version="3.0.101" />
61-
<PackageReference Include="YamlDotNet" Version="11.2.1" />
59+
<PackageReference Include="Octokit" Version="2.0.1" />
60+
<PackageReference Include="protobuf-net.Core" Version="3.1.17" />
61+
<PackageReference Include="YamlDotNet" Version="12.0.0" />
6262
</ItemGroup>
6363

6464
</Project>

‎src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.xml‎

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ServerlessWorkflow.Sdk/Services/FluentBuilders/SwitchStateBuilder.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public virtual IDataSwitchStateBuilder Case(Action<IDataSwitchCaseBuilder> caseS
6262
throw new ArgumentException(nameof(caseSetup));
6363
IDataSwitchCaseBuilder builder = new DataSwitchCaseBuilder(this.Pipeline);
6464
caseSetup(builder);
65+
this.State.DataConditions = new();
6566
this.State.DataConditions.Add(builder.Build());
6667
return this;
6768
}

‎src/ServerlessWorkflow.Sdk/Services/IO/WorkflowReader.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ protected virtual Uri ResolveRelativeUri(Uri uri, WorkflowReaderOptions options)
258258
throw new NullReferenceException($"The '{nameof(WorkflowReaderOptions.BaseUri)}' property must be set when using the specified {nameof(RelativeUriReferenceResolutionMode)} '{RelativeUriReferenceResolutionMode.ConvertToAbsolute}'");
259259
return new(options.BaseUri, uri.ToString());
260260
case RelativeUriReferenceResolutionMode.ConvertToRelativeFilePath:
261-
return new(Path.Combine(options.BaseDirectory, uri.ToString()));
261+
var localPath = uri.LocalPath;
262+
if(localPath.StartsWith("//") || localPath.StartsWith("\\\\"))
263+
localPath = localPath.Substring(2);
264+
return new Uri(Path.Combine(options.BaseDirectory, localPath));
262265
case RelativeUriReferenceResolutionMode.None:
263266
throw new NotSupportedException($"Relative uris are not supported when using the specified {nameof(RelativeUriReferenceResolutionMode)} '{RelativeUriReferenceResolutionMode.ConvertToAbsolute}'");
264267
default:

0 commit comments

Comments
 (0)