Syncing Release 1.12 with master and multi-run changes (#936)

* Add holopin.yml config (#923) Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Updating Readme's to default to `dapr run -f .` (#874) * Updating Invoke readme in C# to favor dapr run -f Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> * Adding back single app run steps and tests, but to the end. Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> * Update service_invocation/csharp/http/README.md Co-authored-by: Mark Fussell <markfussell@gmail.com> Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com> * Updated and hardened test Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> * Invoke * and partial PubSub with multi-run files & readmes & tests Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> * Multi run done for Pubsub C#, Python and Node (http, sdk) Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> * Added Pubsub support for Go, Java Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> * updating readmes with correct appid Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> * Updating tests for PubSub and Service invoke to Paas with multiapp run Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> * More fine tuning of pubsub tests (timeouts, step ends) Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> * Fixing Python FastAPI and C# Pubsub tests Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> --------- Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com> Co-authored-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> Co-authored-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> Co-authored-by: Mark Fussell <markfussell@gmail.com> * Patching tests to pass (C# timing, Python uvicorn) (#933) Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com> --------- Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> Signed-off-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com> Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com> Co-authored-by: Paul Yuknewicz <paulyuk@Pauls-MacBook-Pro-2.local> Co-authored-by: Paul Yuknewicz <paulyuk@Pauls-MBP-2.lan> Co-authored-by: Mark Fussell <markfussell@gmail.com>
dapr · Sep 25, 2023 · 088b5f6 · 088b5f6
1 parent 72f6823
commit 088b5f6
Show file tree

Hide file tree

Showing 31 changed files with 1,369 additions and 781 deletions.
diff --git a/.github/holopin.yml b/.github/holopin.yml
@@ -0,0 +1,6 @@
+organization: dapr
+defaultSticker: clmjkxscc122740fl0mkmb7egi
+stickers:
+ -
+ id: clmjkxscc122740fl0mkmb7egi
+ alias: ghc2023
diff --git a/.github/workflows/validate_python_quicstarts.yaml b/.github/workflows/validate_python_quicstarts.yaml
@@ -99,6 +99,7 @@ jobs:
  echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
  pip3 install setuptools wheel
  pip3 install mechanical-markdown
+ pip3 install fastapi uvicorn
  - name: Validate building blocks with Python
  run: |
  variants=("http" "sdk")

diff --git a/pub_sub/csharp/http/README.md b/pub_sub/csharp/http/README.md
@@ -14,78 +14,87 @@ And one subscriber:
 
 - Dotnet subscriber `order-processor`
 
-### Run Dotnet message subscriber with Dapr
+## Run all apps with multi-app run template file:
 
-1. Navigate to the directory and install dependencies: 
+This section shows how to run both applications at once using [multi-app run template files](https://docs.dapr.io/developing-applications/local-development/multi-app-dapr-run/multi-app-overview/) with `dapr run -f .`. This enables to you test the interactions between multiple applications.  
 
-<!-- STEP
-name: Install Dotnet dependencies
--->
-
-```bash
-cd ./order-processor
-dotnet restore
-dotnet build
-```
-<!-- END_STEP -->
-2. Run the Dotnet subscriber app with Dapr: 
+1. Open a new terminal window and run `order-processor` and `checkout` using the multi app run template defined in [dapr.yaml](./dapr.yaml):
 
 <!-- STEP
-name: Run Dotnet subscriber
+name: Run multi app run template
 expected_stdout_lines:
- - "You're up and running! Both Dapr and your app logs will appear here."
- - '== APP == Subscriber received : 2'
- - "Exited Dapr successfully"
- - "Exited App successfully"
+ - 'Started Dapr with app id "order-processor-http"'
+ - 'Started Dapr with app id "checkout-http"'
+ - '== APP - checkout-http == Published data: Order { OrderId = 2 }'
+ - '== APP - order-processor-http == Subscriber received : 2'
 expected_stderr_lines:
-working_dir: ./order-processor
 output_match_mode: substring
+match_order: none
 background: true
-sleep: 10
+sleep: 15
+timeout_seconds: 45
 -->
 
-
 ```bash
-dapr run --app-id order-processor-http --resources-path ../../../components/ --app-port 7005 -- dotnet run --project .
+dapr run -f .
 ```
 
+The terminal console output should look similar to this:
+
+```text
+== APP - checkout-http == Published data: Order { OrderId = 1 }
+== APP - order-processor-http == Subscriber received : 1
+== APP - checkout-http == Published data: Order { OrderId = 2 }
+== APP - order-processor-http == Subscriber received : 2
+== APP - checkout-http == Published data: Order { OrderId = 3 }
+== APP - order-processor-http == Subscriber received : 3
+== APP - checkout-http == Published data: Order { OrderId = 4 }
+== APP - order-processor-http == Subscriber received : 4
+== APP - checkout-http == Published data: Order { OrderId = 5 }
+== APP - order-processor-http == Subscriber received : 5
+== APP - checkout-http == Published data: Order { OrderId = 6 }
+== APP - order-processor-http == Subscriber received : 6
+== APP - checkout-http == Published data: Order { OrderId = 7 }
+== APP - order-processor-http == Subscriber received : 7
+== APP - checkout-http == Published data: Order { OrderId = 8 }
+== APP - order-processor-http == Subscriber received : 8
+== APP - checkout-http == Published data: Order { OrderId = 9 }
+== APP - order-processor-http == Subscriber received : 9
+== APP - checkout-http == Published data: Order { OrderId = 10 }
+== APP - order-processor-http == Subscriber received : 10
+```
+
+2. Stop and clean up application processes
+
+```bash
+dapr stop -f .
+```
 <!-- END_STEP -->
-### Run Dotnet message publisher with Dapr
 
-1. Navigate to the directory and install dependencies: 
+## Run a single app at a time with Dapr (Optional)
 
-<!-- STEP
-name: Install Dotnet dependencies
--->
+An alternative to running all or multiple applications at once is to run single apps one-at-a-time using multiple `dapr run .. -- dotnet run` commands. This next section covers how to do this. 
+
+### Run Dotnet message subscriber with Dapr
+
+1. Run the Dotnet subscriber app with Dapr: 
 
 ```bash
-cd ./checkout
-dotnet restore
-dotnet build
+cd ./order-processor
+dapr run --app-id order-processor-http --resources-path ../../../components/ --app-port 7005 -- dotnet run
 ```
-<!-- END_STEP -->
-2. Run the Dotnet publisher app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet publisher
-expected_stdout_lines:
- - "You're up and running! Both Dapr and your app logs will appear here."
- - '== APP == Published data: Order { OrderId = 1 }'
- - '== APP == Published data: Order { OrderId = 2 }'
- - "Exited App successfully"
- - "Exited Dapr successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
-
+### Run Dotnet message publisher with Dapr
+
+1. Run the Dotnet publisher app with Dapr: 
+
+
 ```bash
-dapr run --app-id checkout-http --resources-path ../../../components/ -- dotnet run --project .
+cd ./checkout
+dapr run --app-id checkout-http --resources-path ../../../components/ -- dotnet run
 ```
 
-<!-- END_STEP -->
+2. Stop and clean up application processes
 
 ```bash
 dapr stop --app-id order-processor-http

diff --git a/pub_sub/csharp/http/dapr.yaml b/pub_sub/csharp/http/dapr.yaml
@@ -0,0 +1,11 @@
+version: 1
+common:
+ resourcesPath: ../../components/
+apps:
+ - appID: order-processor-http
+ appDirPath: ./order-processor/
+ appPort: 7005
+ command: ["dotnet", "run"]
+ - appID: checkout-http
+ appDirPath: ./checkout/
+ command: ["dotnet", "run"]
diff --git a/pub_sub/csharp/sdk/README.md b/pub_sub/csharp/sdk/README.md
@@ -14,78 +14,87 @@ And one subscriber:
 
 - Dotnet subscriber `order-processor`
 
-### Run Dotnet message subscriber with Dapr
+## Run all apps with multi-app run template file:
 
-1. Navigate to the directory and install dependencies: 
+This section shows how to run both applications at once using [multi-app run template files](https://docs.dapr.io/developing-applications/local-development/multi-app-dapr-run/multi-app-overview/) with `dapr run -f .`. This enables to you test the interactions between multiple applications.  
 
-<!-- STEP
-name: Install Dotnet dependencies
--->
-
-```bash
-cd ./order-processor
-dotnet restore
-dotnet build
-```
-<!-- END_STEP -->
-2. Run the Dotnet subscriber app with Dapr: 
+1. Open a new terminal window and run the multi app run template:
 
 <!-- STEP
-name: Run Dotnet subscriber
+name: Run multi app run template
 expected_stdout_lines:
- - "You're up and running! Both Dapr and your app logs will appear here."
- - '== APP == Subscriber received : Order { OrderId = 2 }'
- - "Exited Dapr successfully"
- - "Exited App successfully"
+ - 'Started Dapr with app id "order-processor"'
+ - 'Started Dapr with app id "checkout-sdk"'
+ - 'Published data: Order { OrderId = 2 }'
+ - 'Subscriber received : Order { OrderId = 2 }'
 expected_stderr_lines:
-working_dir: ./order-processor
 output_match_mode: substring
+match_order: none
 background: true
-sleep: 10
+sleep: 15
+timeout_seconds: 60
 -->
 
-
 ```bash
-dapr run --app-id order-processor --resources-path ../../../components/ --app-port 7006 -- dotnet run --project .
+dapr run -f .
 ```
 
+The terminal console output should look similar to this:
+
+```text
+== APP - checkout-sdk == Published data: Order { OrderId = 1 }
+== APP - order-processor == Subscriber received : Order { OrderId = 1 }
+== APP - checkout-sdk == Published data: Order { OrderId = 2 }
+== APP - order-processor == Subscriber received : Order { OrderId = 2 }
+== APP - checkout-sdk == Published data: Order { OrderId = 3 }
+== APP - order-processor == Subscriber received : Order { OrderId = 3 }
+== APP - checkout-sdk == Published data: Order { OrderId = 4 }
+== APP - order-processor == Subscriber received : Order { OrderId = 4 }
+== APP - checkout-sdk == Published data: Order { OrderId = 5 }
+== APP - order-processor == Subscriber received : Order { OrderId = 5 }
+== APP - checkout-sdk == Published data: Order { OrderId = 6 }
+== APP - order-processor == Subscriber received : Order { OrderId = 6 }
+== APP - checkout-sdk == Published data: Order { OrderId = 7 }
+== APP - order-processor == Subscriber received : Order { OrderId = 7 }
+== APP - checkout-sdk == Published data: Order { OrderId = 8 }
+== APP - order-processor == Subscriber received : Order { OrderId = 8 }
+== APP - checkout-sdk == Published data: Order { OrderId = 9 }
+== APP - order-processor == Subscriber received : Order { OrderId = 9 }
+== APP - checkout-sdk == Published data: Order { OrderId = 10 }
+== APP - order-processor == Subscriber received : Order { OrderId = 10 }
+```
+
+2. Stop and clean up application processes
+
+```bash
+dapr stop -f .
+```
 <!-- END_STEP -->
-### Run Dotnet message publisher with Dapr
 
-1. Navigate to the directory and install dependencies: 
+## Run a single app at a time with Dapr (Optional)
 
-<!-- STEP
-name: Install Dotnet dependencies
--->
+An alternative to running all or multiple applications at once is to run single apps one-at-a-time using multiple `dapr run .. -- dotnet run` commands. This next section covers how to do this. 
+
+### Run Dotnet message subscriber with Dapr
+
+1. Run the Dotnet subscriber app with Dapr: 
 
 ```bash
-cd ./checkout
-dotnet restore
-dotnet build
+cd ./order-processor
+dapr run --app-id order-processor --resources-path ../../../components/ --app-port 7006 -- dotnet run
 ```
-<!-- END_STEP -->
-2. Run the Dotnet publisher app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet publisher
-expected_stdout_lines:
- - "You're up and running! Both Dapr and your app logs will appear here."
- - '== APP == Published data: Order { OrderId = 1 }'
- - '== APP == Published data: Order { OrderId = 2 }'
- - "Exited App successfully"
- - "Exited Dapr successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
-
+### Run Dotnet message publisher with Dapr
+
+1. Run the Dotnet publisher app with Dapr: 
+
+
 ```bash
-dapr run --app-id checkout-sdk --resources-path ../../../components/ -- dotnet run --project .
+cd ./checkout
+dapr run --app-id checkout-sdk --resources-path ../../../components/ -- dotnet run
 ```
 
-<!-- END_STEP -->
+2. Stop and clean up application processes
 
 ```bash
 dapr stop --app-id order-processor

diff --git a/pub_sub/csharp/sdk/dapr.yaml b/pub_sub/csharp/sdk/dapr.yaml
@@ -0,0 +1,11 @@
+version: 1
+common:
+ resourcesPath: ../../components/
+apps:
+ - appID: order-processor
+ appDirPath: ./order-processor/
+ appPort: 7006
+ command: ["dotnet", "run"]
+ - appID: checkout-sdk
+ appDirPath: ./checkout/
+ command: ["dotnet", "run"]