Skip to content

Commit

Permalink
[Workflow] Fix issue with ignored external event payload (dapr#1119)
Browse files Browse the repository at this point in the history
* [Workflow] Fix issue with ignored external event payload

Signed-off-by: Chris Gillum <[email protected]>

* Pushing missing commits

Signed-off-by: Chris Gillum <[email protected]>

* Remove unnecessary steps from itests.yml

Signed-off-by: Chris Gillum <[email protected]>

---------

Signed-off-by: Chris Gillum <[email protected]>
Signed-off-by: Bradley Cotier <[email protected]>
  • Loading branch information
cgillum authored and MonkeyTennis committed Jul 14, 2023
1 parent 8e9db70 commit ef73f9d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/itests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,6 @@ jobs:
- uses: actions/checkout@v1
- name: Parse release version
run: python ./.github/scripts/get_release_version.py
- name: Install Local kafka using docker-compose
run: |
docker-compose -f test/Dapr.E2E.Test/deploy/local-test-kafka.yml up -d
docker ps
- name: Install Local Hashicorp Vault using docker-compose
run: |
docker-compose -f test/Dapr.E2E.Test/deploy/local-test-vault.yml up -d
docker ps
- name: Setup Vault's test token
run: echo myroot > /tmp/.hashicorp_vault_token
- name: Setup ${{ matrix.display-name }}
uses: actions/setup-dotnet@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions src/Dapr.Workflow/Dapr.Workflow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<PackageId>Dapr.Workflow</PackageId>
<Title>Dapr Workflow Authoring SDK</Title>
<Description>Dapr Workflow SDK for building workflows as code with Dapr</Description>
<VersionPrefix>0.2.0</VersionPrefix>
<VersionPrefix>0.3.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
<LangVersion>10.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.0" />
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.0" />
<PackageReference Include="Microsoft.DurableTask.Client.Grpc" Version="1.0.*" />
<PackageReference Include="Microsoft.DurableTask.Worker.Grpc" Version="1.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions src/Dapr.Workflow/DaprWorkflowClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public Task<string> ScheduleNewWorkflowAsync(
/// <param name="instanceId">The unique ID of the workflow instance to fetch.</param>
/// <param name="getInputsAndOutputs">
/// Specify <c>true</c> to fetch the workflow instance's inputs, outputs, and custom status, or <c>false</c> to
/// omit them. Defaults to false.
/// omit them. Defaults to true.
/// </param>
public async Task<WorkflowState> GetWorkflowStateAsync(string instanceId, bool getInputsAndOutputs = false)
public async Task<WorkflowState> GetWorkflowStateAsync(string instanceId, bool getInputsAndOutputs = true)
{
OrchestrationMetadata? metadata = await this.innerClient.GetInstancesAsync(
instanceId,
Expand All @@ -94,7 +94,7 @@ public async Task<WorkflowState> GetWorkflowStateAsync(string instanceId, bool g
/// <param name="instanceId">The unique ID of the workflow instance to wait for.</param>
/// <param name="getInputsAndOutputs">
/// Specify <c>true</c> to fetch the workflow instance's inputs, outputs, and custom status, or <c>false</c> to
/// omit them. The default value is <c>false</c> to minimize the network bandwidth, serialization, and memory costs
/// omit them. Setting this value to <c>false</c> can help minimize the network bandwidth, serialization, and memory costs
/// associated with fetching the instance metadata.
/// </param>
/// <param name="cancellation">A <see cref="CancellationToken"/> that can be used to cancel the wait operation.</param>
Expand All @@ -104,7 +104,7 @@ public async Task<WorkflowState> GetWorkflowStateAsync(string instanceId, bool g
/// </returns>
public async Task<WorkflowState> WaitForWorkflowStartAsync(
string instanceId,
bool getInputsAndOutputs = false,
bool getInputsAndOutputs = true,
CancellationToken cancellation = default)
{
OrchestrationMetadata metadata = await this.innerClient.WaitForInstanceStartAsync(
Expand Down Expand Up @@ -135,7 +135,7 @@ public async Task<WorkflowState> WaitForWorkflowStartAsync(
/// <inheritdoc cref="WaitForWorkflowStartAsync(string, bool, CancellationToken)"/>
public async Task<WorkflowState> WaitForWorkflowCompletionAsync(
string instanceId,
bool getInputsAndOutputs = false,
bool getInputsAndOutputs = true,
CancellationToken cancellation = default)
{
OrchestrationMetadata metadata = await this.innerClient.WaitForInstanceCompletionAsync(
Expand Down Expand Up @@ -218,7 +218,7 @@ public Task RaiseEventAsync(
object? eventPayload = null,
CancellationToken cancellation = default)
{
return this.innerClient.RaiseEventAsync(instanceId, eventName, cancellation);
return this.innerClient.RaiseEventAsync(instanceId, eventName, eventPayload, cancellation);
}

/// <summary>
Expand Down

0 comments on commit ef73f9d

Please sign in to comment.