Merge pull request #729 from amulyavarote/parallel_workflows

Added parallelism to pubsub workflow

.github/workflows/validate_new_quickstarts_pubsub.yaml

@@ -28,10 +28,11 @@ on:
       - feature/new_quickstarts
       - release-*
 jobs:
-  deploy:
+  validate:
-    name: Validate quickstarts on ${{ matrix.os }}
+    name: Validate quickstart for `${{ matrix.quickstart_language }}` with `${{ matrix.quickstart_variant }}` on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
+      DAPR_DEFAULT_IMAGE_REGISTRY: GHCR
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install
       GOVER: 1.17
       KUBERNETES_VERSION: v1.21.1
@@ -40,6 +41,8 @@ jobs:
     strategy:
       matrix: 
         os: [ubuntu-latest, macos-10.15]
+        quickstart_language: [go, csharp, javascript, python, java]
+        quickstart_variant: [http, sdk]
     steps:
       - name: Install docker - MacOS
         if: matrix.os == 'macos-10.15'
@@ -56,6 +59,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 11
+      - name: Install .NET Core 
+        uses: actions/setup-dotnet@v1.9.0
+        with:
+          dotnet-version: |
+            6.0.x
       - name: Determine latest Dapr Runtime version including Pre-releases
         run: |
           helm repo add dapr https://dapr.github.io/helm-charts/ && helm repo update && export RUNTIME_VERSION=$(helm search repo dapr/dapr --devel --versions | awk '/dapr\/dapr/ {print $3; exit}' )
@@ -86,44 +94,9 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
-      - name: Validate Go http pubsub
+      - name: Validate ${{ matrix.quickstart_language }} ${{ matrix.quickstart_variant }} pubsub
         run: |
-          pushd pub_sub/go/http
+          pushd pub_sub/${{ matrix.quickstart_language }}/${{ matrix.quickstart_variant }}
-          make validate
-          popd
-      - name: Validate Go sdk pubsub
-        run: |
-          pushd pub_sub/go/sdk
-          make validate
-          popd
-      - name: Validate JS http pubsub
-        run: |
-          pushd pub_sub/javascript/http
-          make validate
-          popd
-      - name: Validate JS sdk pubsub
-        run: |
-          pushd pub_sub/javascript/sdk
-          make validate
-          popd
-      - name: Validate python http pubsub
-        run: |
-          pushd pub_sub/python/http
-          make validate
-          popd
-      - name: Validate python sdk pubsub
-        run: |
-          pushd pub_sub/python/sdk
-          make validate
-          popd
-      - name: Validate java http pubsub
-        run: |
-          pushd pub_sub/java/http
-          make validate
-          popd
-      - name: Validate java sdk pubsub
-        run: |
-          pushd pub_sub/java/sdk
           make validate
           popd
       - name: Linkcheck README.md

.github/workflows/validate_new_quickstarts_secrets_management.yaml

@@ -28,8 +28,8 @@ on:
       - feature/new_quickstarts
       - release-*
 jobs:
-  deploy:
+  validate:
-    name: Validate quickstarts on ${{ matrix.os }}
+    name: Validate quickstart for `${{ matrix.quickstart_language }}` with `${{ matrix.quickstart_variant }}` on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install
@@ -40,6 +40,8 @@ jobs:
     strategy:
       matrix: 
         os: [ubuntu-latest, macos-10.15]
+        quickstart_language: [go, csharp, javascript, python, java]
+        quickstart_variant: [http, sdk]
     steps:
       - name: Install docker - MacOS
         if: matrix.os == 'macos-10.15'
@@ -56,6 +58,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 11
+      - name: Install .NET Core 
+        uses: actions/setup-dotnet@v1.9.0
+        with:
+          dotnet-version: |
+            6.0.x
       - name: Determine latest Dapr Runtime version including Pre-releases
         run: |
           helm repo add dapr https://dapr.github.io/helm-charts/ && helm repo update && export RUNTIME_VERSION=$(helm search repo dapr/dapr --devel --versions | awk '/dapr\/dapr/ {print $3; exit}' )
@@ -86,44 +93,9 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
-      - name: Validate Python http Secrets Management
+      - name: Validate ${{ matrix.quickstart_language }} ${{ matrix.quickstart_variant }} secrets management
         run: |
-          pushd secrets_management/python/http
+          pushd secrets_management/${{ matrix.quickstart_language }}/${{ matrix.quickstart_variant }}
-          make validate
-          popd
-      - name: Validate Python sdk Secrets Management
-        run: |
-          pushd secrets_management/python/sdk
-          make validate
-          popd
-      - name: Validate Javascript http Secrets Management
-        run: |
-          pushd secrets_management/javascript/http
-          make validate
-          popd
-      - name: Validate Javascript sdk Secrets Management
-        run: |
-          pushd secrets_management/javascript/sdk
-          make validate
-          popd
-      - name: Validate Java http Secret Management
-        run: |
-          pushd secrets_management/java/http
-          make validate
-          popd
-      - name: Validate Java sdk Secrets Management
-        run: |
-          pushd secrets_management/java/sdk
-          make validate
-          popd
-      - name: Validate Go http Secret Management
-        run: |
-          pushd secrets_management/go/http
-          make validate
-          popd
-      - name: Validate Go sdk Secrets Management
-        run: |
-          pushd secrets_management/go/sdk
           make validate
           popd
       - name: Linkcheck README.md

.github/workflows/validate_new_quickstarts_service_invo.yaml

@@ -28,8 +28,8 @@ on:
       - feature/new_quickstarts
       - release-*
 jobs:
-  deploy:
+  validate:
-    name: Validate quickstarts on ${{ matrix.os }}
+    name: Validate quickstart for `${{ matrix.quickstart_language }}` with `${{ matrix.quickstart_variant }}` on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install
@@ -40,6 +40,8 @@ jobs:
     strategy:
       matrix: 
         os: [ubuntu-latest, macos-10.15]
+        quickstart_language: [go, csharp, javascript, python, java]
+        quickstart_variant: [http]
     steps:
       - name: Install docker - MacOS
         if: matrix.os == 'macos-10.15'
@@ -56,6 +58,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 11
+      - name: Install .NET Core 
+        uses: actions/setup-dotnet@v1.9.0
+        with:
+          dotnet-version: |
+            6.0.x
       - name: Determine latest Dapr Runtime version including Pre-releases
         run: |
           helm repo add dapr https://dapr.github.io/helm-charts/ && helm repo update && export RUNTIME_VERSION=$(helm search repo dapr/dapr --devel --versions | awk '/dapr\/dapr/ {print $3; exit}' )
@@ -86,24 +93,9 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
-      - name: Validate Go http service invocation
+      - name: Validate ${{ matrix.quickstart_language }} ${{ matrix.quickstart_variant }} service invocation
         run: |
-          pushd service_invocation/go/http
+          pushd service_invocation/${{ matrix.quickstart_language }}/${{ matrix.quickstart_variant }}
-          make validate
-          popd
-      - name: Validate JS http service invocation
-        run: |
-          pushd service_invocation/javascript/http
-          make validate
-          popd
-      - name: Validate Python http service invocation
-        run: |
-          pushd service_invocation/python/http
-          make validate
-          popd
-      - name: Validate java http service invocation
-        run: |
-          pushd service_invocation/java/http
           make validate
           popd
       - name: Linkcheck README.md

.github/workflows/validate_new_quickstarts_state_management.yaml

@@ -28,8 +28,8 @@ on:
       - feature/new_quickstarts
       - release-*
 jobs:
-  deploy:
+  validate:
-    name: Validate quickstarts on ${{ matrix.os }}
+    name: Validate quickstart for `${{ matrix.quickstart_language }}` with `${{ matrix.quickstart_variant }}` on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install
@@ -40,6 +40,8 @@ jobs:
     strategy:
       matrix: 
         os: [ubuntu-latest, macos-10.15]
+        quickstart_language: [go, csharp, javascript, python, java]
+        quickstart_variant: [http, sdk]
     steps:
       - name: Install docker - MacOS
         if: matrix.os == 'macos-10.15'
@@ -56,6 +58,11 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 11
+      - name: Install .NET Core 
+        uses: actions/setup-dotnet@v1.9.0
+        with:
+          dotnet-version: |
+            6.0.x
       - name: Determine latest Dapr Runtime version including Pre-releases
         run: |
           helm repo add dapr https://dapr.github.io/helm-charts/ && helm repo update && export RUNTIME_VERSION=$(helm search repo dapr/dapr --devel --versions | awk '/dapr\/dapr/ {print $3; exit}' )
@@ -86,44 +93,9 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
-      - name: Validate Python http State Management
+      - name: Validate ${{ matrix.quickstart_language }} ${{ matrix.quickstart_variant }} state management
         run: |
-          pushd state_management/python/http
+          pushd state_management/${{ matrix.quickstart_language }}/${{ matrix.quickstart_variant }}
-          make validate
-          popd
-      - name: Validate Python sdk State Management
-        run: |
-          pushd state_management/python/sdk
-          make validate
-          popd
-      - name: Validate Javascript http State Management
-        run: |
-          pushd state_management/javascript/http
-          make validate
-          popd
-      - name: Validate Javascript sdk State Management
-        run: |
-          pushd state_management/javascript/sdk
-          make validate
-          popd
-      - name: Validate Java http State Management
-        run: |
-          pushd state_management/java/http
-          make validate
-          popd
-      - name: Validate Java sdk State Management
-        run: |
-          pushd state_management/java/sdk
-          make validate
-          popd
-      - name: Validate Go http State Management
-        run: |
-          pushd state_management/go/http
-          make validate
-          popd
-      - name: Validate Go sdk State Management
-        run: |
-          pushd state_management/go/sdk
           make validate
           popd
       - name: Linkcheck README.md

pub_sub/csharp/http/README.md

@@ -46,7 +46,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
+dapr run --app-id order-processor-http --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
@@ -82,11 +82,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- dotnet run --project .
+dapr run --app-id checkout-http --components-path ../../../components/ -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-http
+dapr stop --app-id checkout-http
 ```

pub_sub/csharp/sdk/README.md

@@ -46,7 +46,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 7001 -- dotnet run --project .
+dapr run --app-id order-processor --components-path ../../../components/ --app-port 7002 -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
@@ -82,11 +82,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- dotnet run --project .
+dapr run --app-id checkout-sdk --components-path ../../../components/ -- dotnet run --project .
 ```
 
 <!-- END_STEP -->
 
 ```bash
 dapr stop --app-id order-processor
+dapr stop --app-id checkout-sdk
 ```

pub_sub/csharp/sdk/order-processor/Properties/launchSettings.json

@@ -6,7 +6,7 @@
       "dotnetRunMessages": "true",
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:7001",
+      "applicationUrl": "http://localhost:7002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

pub_sub/go/http/README.md

@@ -44,7 +44,7 @@ sleep: 15
 
 ```bash
 cd ./order-processor
-dapr run --app-port 6002 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
+dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
@@ -78,12 +78,12 @@ sleep: 15
     
 ```bash
 cd ./checkout
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
+dapr run --app-id checkout-http --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-http
 dapr stop --app-id order-processor
 ```

pub_sub/go/http/order-processor/app.go

@@ -61,7 +61,7 @@ func postOrder(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	appPort := "6002"
+	appPort := "6001"
 	if value, ok := os.LookupEnv("APP_PORT"); ok {
 		appPort = value
 	}

pub_sub/go/sdk/README.md

@@ -43,7 +43,7 @@ sleep: 15
 
 ```bash
 cd ./order-processor
-dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
+dapr run --app-port 6002 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 15
     
 ```bash
 cd ./checkout
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
+dapr run --app-id checkout-sdk --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- go run .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-sdk
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
 ```

pub_sub/go/sdk/order-processor/app.go

@@ -18,7 +18,7 @@ var sub = &common.Subscription{
 }
 
 func main() {
-	appPort := "6001"
+	appPort := "6002"
 	if value, ok := os.LookupEnv("APP_PORT"); ok {
 		appPort = value
 	}

pub_sub/java/http/README.md

@@ -50,7 +50,7 @@ sleep: 10
 -->
 ```bash
 cd ./order-processor
- dapr run --app-port 8080 --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+ dapr run --app-port 8080 --app-id order-processor-http --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 ### Run Java message publisher app with Dapr
@@ -83,11 +83,11 @@ sleep: 10
 
 ```bash
 cd ./checkout
- dapr run --app-id checkout --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
+ dapr run --app-id checkout-http --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-http
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-http
 ```

pub_sub/java/sdk/README.md

@@ -50,7 +50,7 @@ sleep: 10
 -->
 ```bash
 cd ./order-processor
- dapr run --app-port 8080 --app-id order-processor --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
+ dapr run --app-port 8080 --app-id order-processor-sdk --components-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
@@ -84,11 +84,11 @@ sleep: 10
 
 ```bash
 cd ./checkout
-dapr run --app-id checkout --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
+dapr run --app-id checkout-sdk --components-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-sdk
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
 ```

pub_sub/javascript/http/README.md

@@ -42,7 +42,7 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
+dapr run --app-id order-processor-http --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
@@ -76,12 +76,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
+dapr run --app-id checkout-http --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-http
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-http
 ```

pub_sub/javascript/sdk/README.md

@@ -42,7 +42,7 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-port 5001 --app-id order-processing --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- npm run start
+dapr run --app-port 5002 --app-id order-processing-sdk --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- npm run start
 ```
 
 <!-- END_STEP -->
@@ -76,12 +76,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- npm run start
+dapr run --app-id checkout-sdk --app-protocol http --dapr-http-port 3500 --components-path ../../../components -- npm run start
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-sdk
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
 ```

pub_sub/javascript/sdk/order-processor/index.js

@@ -3,7 +3,7 @@ import { DaprServer } from '@dapr/dapr';
 const DAPR_HOST = process.env.DAPR_HOST || "http://localhost";
 const DAPR_HTTP_PORT = process.env.DAPR_HTTP_PORT || "3501";
 const SERVER_HOST = process.env.SERVER_HOST || "127.0.0.1";
-const SERVER_PORT = process.env.APP_PORT || 5001;
+const SERVER_PORT = process.env.APP_PORT || 5002;
 
 async function main() {
   const server = new DaprServer(SERVER_HOST, SERVER_PORT, DAPR_HOST, DAPR_HTTP_PORT);

pub_sub/python/http/README.md

@@ -43,7 +43,7 @@ sleep: 10
 
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 6001 -- python3 app.py
+dapr run --app-id order-processor-http --components-path ../../../components/ --app-port 6001 -- python3 app.py
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 10
 -->
     
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- python3 app.py
+dapr run --app-id checkout-http --components-path ../../../components/ -- python3 app.py
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-http
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-http
 ```

pub_sub/python/sdk/README.md

@@ -42,7 +42,7 @@ sleep: 10
 -->
 
 ```bash
-dapr run --app-id order-processor --components-path ../../../components/ --app-port 6001 -- uvicorn app:app --port 6001
+dapr run --app-id order-processor-sdk --components-path ../../../components/ --app-port 6001 -- uvicorn app:app --port 6002
 ```
 
 <!-- END_STEP -->
@@ -77,12 +77,12 @@ sleep: 10
 -->
 
 ```bash
-dapr run --app-id checkout --components-path ../../../components/ -- python3 app.py
+dapr run --app-id checkout-sdk --components-path ../../../components/ -- python3 app.py
 ```
 
 <!-- END_STEP -->
 
 ```bash
-dapr stop --app-id checkout
+dapr stop --app-id checkout-sdk
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
 ```

pub_sub/python/sdk/order-processor/app.py

@@ -5,7 +5,7 @@ import os
 
 app = Flask(__name__)
 
-app_port = os.getenv('APP_PORT', '6001')
+app_port = os.getenv('APP_PORT', '6002')
 
 # Register Dapr pub/sub subscriptions
 @app.route('/dapr/subscribe', methods=['GET'])

service_invocation/csharp/http/makefile

@@ -0,0 +1,2 @@
+include ../../../docker.mk
+include ../../../validate.mk

service_invocation/python/http/README.md

@@ -42,7 +42,7 @@ sleep: 15
 
 ```bash
 cd ./order-processor
-dapr run --app-port 7001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- python3 app.py
+dapr run --app-port 8001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- python3 app.py
 ```
 
 <!-- END_STEP -->

service_invocation/python/http/order-processor/app.py

@@ -12,4 +12,4 @@ def getOrder():
         'ContentType': 'application/json'}
 
 
-app.run(port=7001)
+app.run(port=8001)

tutorials/pub-sub/README.md

@@ -502,8 +502,6 @@ kubectl logs --selector app=python-subscriber -c python-subscriber
 name: Deploy Csharp App
 expected_stdout_lines:
   - "A: Message on A"
-  - "B: Message on B"
-  - "C: Message on C"
 expected_stderr_lines:
 output_match_mode: substring
 sleep: 10