Provide the ability to Mock WorkflowActivityContext #1358

siri-varma · 2024-10-10T17:36:16Z

Description

Made the WorkflowActivityContext abstract.
Created DaprWorkflowActivityContext and made it inherit from WorkflowActivityContext

Issue reference

We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.

Please reference the issue this PR will close: #1200

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

Code compiles correctly
Created/updated tests
Extended the documentation

WhitWaldo · 2024-10-10T19:39:05Z

@siri-varma It looks like the DCO check failed.

Could you please make sure each of your commits are signed?

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

WhitWaldo · 2024-12-11T21:34:03Z

@siri-varma Looks like we've got several build errors regarding nullability. If you can fix those, I'd appreciate it!

…xunit.runner.visualstudio, Microsoft.AspNetCore.Mvc.Testing, Moq to the same version in all projects. Signed-off-by: Manuel Menegazzo <manuel.menegazzo@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…quest Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…d types Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…ality has been moved out to the Dapr.Workflow project instead. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

This PR takes the implementation of the static method and puts it into the DaprClient instance, pulling from the existing apiTokenHeader on the instance to populate the daprApiToken, pulling the endpoint from the instance's httpEndpoint value and accepting only an appId argument so as to specify the ID of the Dapr app to connect to and place in the resulting URI. --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…irect) (dapr#1366) Migrating whole solution to Central Package Management - several package version upgrades to address security advisories and otherwise. --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Extracting classes out to common project --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Protos pulled out to separate shared project Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Add link about Dapr bot to contribution documentation Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…rops s headers (dapr#1153) * forward cloudevent props Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * refactor middleware Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * add cloud event property filters Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * update string check Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * forward cloudevent props Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * refactor middleware Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * add cloud event property filters Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> * update checks Signed-off-by: Ilias Politsopoulos <polil91@hotmail.com> --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Co-authored-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

* Changed headers, updated introduction to reflect the difference in serialization between either type and added a brief section to detail the use of System.Text.Json for weakly-typed Dapr actor clients and to point to official documentation on it --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…tead of directly (dapr#1363) * Implemented against Dapr.Client.AspNetCore and Dapr.Client Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * SImplified DaprWorkflow DI registration and updated to use IConfiguration preference. Needs testing. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added missing copyright header Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated actor registration to prefer the updated IConfiguration-based approach for pulling the HTTP endpoint and API token Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Adopted accepted proposal's guidelines for favoring different environment variables for determining the sidecar endpoint. Added notes to explain this in the code going forward. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Made some lines a little more concise, added hostname default to DaprDefaults to use when building endpoints. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Fixed and updated unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated to put endpoint resolution mechanism in DaprDefaults within Dapr.Common - updating projects and unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated packages to fix security advisory GHSA-447r-wph3-92pm Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated Workflow builder to use DaprDefaults with IConfiguration Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updating global.json Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Tweaked global.json comment Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Adding braces per nit Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Consolidated both registration extension methods to remove duplication Signed-off-by: Whit Waldo <whit.waldo@innovian.net> --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

* Removed Serilog nuget from Directory.Packages.props Signed-off-by: Manuel Menegazzo <manuel.menegazzo@outlook.com> * Update Directory.Packages.props Signed-off-by: Manuel Menegazzo <65919883+m3nax@users.noreply.github.com> --------- Signed-off-by: Manuel Menegazzo <manuel.menegazzo@outlook.com> Signed-off-by: Manuel Menegazzo <65919883+m3nax@users.noreply.github.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

* Corrected several unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated extension name for consistency Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated registration name for consistency Signed-off-by: Whit Waldo <whit.waldo@innovian.net> --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

… binary data (dapr#1116) * Added methods in status API supports for direct storage and reading of byte arrays dapr#906 Signed-off-by: Divya Perumal <divzi.perumal@gmail.com> Signed-off-by: Divya Perumal <diperuma@microsoft.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

@tommorvolloriddle

* Added null check - the proto suggests this shouldn't ever be null, but there's an issue reporting as much, so this fixes that Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Removed the Task.WhenAll making the operation non-blocking Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added unit test to validate that the subscription is no longer blocking Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Removed unused line from previous test, added another test Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added another test Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * More unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added more unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Updated to make DaprPublishSubscribeClientBuilder configurable via a registered IConfiguration Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added missing copyright statements Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added missing package reference Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Fixed bad reference (missed in merge) Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Fixed failing unit test Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Tweak to only pass along EventMessage payloads to developers as it's expected that the initial response will be null if EventMessage is populated Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Was missing assignment of the Data property in the TopicMessage. Shout out to both @tommorvolloriddle and @Aimless321 for catching this! Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Fix - return would be bad. Continue is the right move. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Added a simple test Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Fixed unit tests Signed-off-by: Whit Waldo <whit.waldo@innovian.net> * Merged in tweaks from dapr#1422 Signed-off-by: Whit Waldo <whit.waldo@innovian.net> --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

…Properties/launchSettings.json Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

…Properties/launchSettings.json Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma · 2024-12-27T19:15:30Z

@WhitWaldo let me know if anything else is needed on this PR. Thank you

WhitWaldo

Just a couple of nits and we're good here.

WhitWaldo · 2024-12-21T14:24:24Z

src/Dapr.Workflow/WorkflowActivityContext.cs


        /// <summary>
-        /// Gets the unique ID of the current workflow instance.
+        /// Gets the unique ID of thcurrent workflow instance.


"thcurrent" -> "the current"

@siri-varma If you can fix that typo, we're good to go here.

siri-varma requested review from a team as code owners October 10, 2024 17:36

WhitWaldo assigned siri-varma Oct 10, 2024

WhitWaldo added the area/workflow label Oct 10, 2024

svegiraju-microsoft added 2 commits October 10, 2024 14:02

Make context mockable

1a376cf

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Fix project

f51def0

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma force-pushed the users/svegira/make-context-mockable branch from a0e576f to f51def0 Compare October 10, 2024 21:02

m3nax and others added 21 commits December 20, 2024 14:38

Make context mockable

3ce4685

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Fix project

d083483

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Added unit test to prove out concern raised on Discord

0653902

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removed unused using

a7c37ce

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Added unit test to validate that headers aren't being stripped off re…

2b408c6

…quest Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Fixed spelling typo

8277fc2

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Added fix to handle null return values

53d7a0c

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removed unnecessary null check

cf9f1ca

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removed deprecated methods from DaprClient and tests as well as unuse…

5dcc4e5

…d types Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removed unused (and invalid) reference

11b3aec

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removed E2E workflow test as it validated DaprClient and the function…

c6eb1d8

…ality has been moved out to the Dapr.Workflow project instead. Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Removes floating classes and introduces Dapr.Common project (dapr#1365)

b148bc4

Extracting classes out to common project --------- Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Extracted Protos out to common project (dapr#1367)

614a92b

Protos pulled out to separate shared project Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Improvement of the dotnet-contributing files (dapr#1330)

a8e1b79

Add link about Dapr bot to contribution documentation Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

WhitWaldo and others added 5 commits December 20, 2024 14:44

Updated protos to latest in dapr/dapr (dapr#1420)

2fe08c9

Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Fix nulls

3dd8019

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma force-pushed the users/svegira/make-context-mockable branch from ab7956f to 3dd8019 Compare December 20, 2024 22:46

siri-varma and others added 10 commits December 20, 2024 14:54

Merge branch 'master' into users/svegira/make-context-mockable

f188fd1

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Delete examples/Client/PublishSubscribe/StreamingSubscriptionExample/…

ce7b2d8

…Properties/launchSettings.json Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Delete examples/AI/ConversationalAI/Properties/launchSettings.json

63bad79

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Delete daprdocs/content/en/dotnet-sdk-docs/dotnet-ai/dotnet-ai-usage.md

57c93d2

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Update dotnet-jobs-howto.md

dd6b3c3

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Update dotnet-jobs-howto.md

e11bf0e

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Update dotnet-workflowclient-usage.md

0684a6c

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

Update dotnet-workflowclient-usage.md

94763b3

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

fix thing

b519b62

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Update WorkflowActivityContext.cs

8f27ba7

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma force-pushed the users/svegira/make-context-mockable branch from 3461bc9 to 8f27ba7 Compare December 20, 2024 23:08

siri-varma and others added 4 commits December 20, 2024 21:00

Update WorkflowActivityContext.cs

096664a

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com>

fix things

dbda89d

Fix version

1c4cc5b

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Update Dapr.Workflow.Test.csproj

e3e6b0a

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma force-pushed the users/svegira/make-context-mockable branch from 7c684dc to e3e6b0a Compare December 21, 2024 06:43

svegiraju-microsoft and others added 3 commits December 20, 2024 22:45

fix things

f32fb8e

Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Delete examples/AI/ConversationalAI/Properties/launchSettings.json

b55699c

Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

Delete examples/Client/PublishSubscribe/StreamingSubscriptionExample/…

ea4ac28

…Properties/launchSettings.json Signed-off-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Siri Varma Vegiraju <svegiraju@microsoft.com>

siri-varma force-pushed the users/svegira/make-context-mockable branch from f81134b to ea4ac28 Compare December 21, 2024 06:46

siri-varma closed this Dec 27, 2024

siri-varma reopened this Dec 27, 2024

WhitWaldo requested changes Dec 27, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Provide the ability to Mock WorkflowActivityContext #1358

Provide the ability to Mock WorkflowActivityContext #1358

siri-varma commented Oct 10, 2024 •

edited

Loading

WhitWaldo commented Oct 10, 2024

WhitWaldo commented Dec 11, 2024

siri-varma commented Dec 27, 2024

WhitWaldo left a comment

WhitWaldo Dec 21, 2024

WhitWaldo Dec 21, 2024

Provide the ability to Mock WorkflowActivityContext #1358

Are you sure you want to change the base?

Provide the ability to Mock WorkflowActivityContext #1358

Conversation

siri-varma commented Oct 10, 2024 • edited Loading

Description

Issue reference

Checklist

WhitWaldo commented Oct 10, 2024

WhitWaldo commented Dec 11, 2024

siri-varma commented Dec 27, 2024

WhitWaldo left a comment

Choose a reason for hiding this comment

WhitWaldo Dec 21, 2024

Choose a reason for hiding this comment

WhitWaldo Dec 21, 2024

Choose a reason for hiding this comment

siri-varma commented Oct 10, 2024 •

edited

Loading