Fix inconsistent dapr.yaml and appIDs (#1152)

* Fix inconsistent multi-app run files Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Rename appID for consistency Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Update appID for consistency Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * fix appID Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Fix appID Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Remove schedulerHostAddress Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> --------- Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
dapr · Feb 3, 2025 · 9449aa4 · 9449aa4
1 parent ce7638a
commit 9449aa4
Show file tree

Hide file tree

Showing 24 changed files with 201 additions and 203 deletions.
diff --git a/jobs/go/http/README.md b/jobs/go/http/README.md
@@ -20,11 +20,11 @@ Open a new terminal window and run the multi app run template:
 <!-- STEP
 name: Run multi app run template
 expected_stdout_lines:
-  - '== APP - job-service == Received job request...'
-  - '== APP - job-service == Executing maintenance job: Oil Change'
-  - '== APP - job-scheduler == Job Scheduled: C-3PO'
-  - '== APP - job-service == Received job request...'
-  - '== APP - job-service == Executing maintenance job: Limb Calibration'
+  - '== APP - job-service-http == Received job request...'
+  - '== APP - job-service-http == Executing maintenance job: Oil Change'
+  - '== APP - job-scheduler-http == Job Scheduled: C-3PO'
+  - '== APP - job-service-http == Received job request...'
+  - '== APP - job-service-http == Executing maintenance job: Limb Calibration'
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none
@@ -45,20 +45,20 @@ The terminal console output should look similar to this, where:
 - The `C-3PO` job is being retrieved.
 
 ```text
-== APP - job-scheduler == Job Scheduled: R2-D2
-== APP - job-service == Received job request...
-== APP - job-service == Starting droid: R2-D2
-== APP - job-service == Executing maintenance job: Oil Change
-== APP - job-scheduler == Job Scheduled: C-3PO
-== APP - job-scheduler == Job details: {"name":"C-3PO", "dueTime":"30s", "data":{"@type":"ttype.googleapis.com/google.protobuf.StringValue", "expression":"C-3PO:Limb Calibration"}}
+== APP - job-scheduler-http == Job Scheduled: R2-D2
+== APP - job-service-http == Received job request...
+== APP - job-service-http == Starting droid: R2-D2
+== APP - job-service-http == Executing maintenance job: Oil Change
+== APP - job-scheduler-http == Job Scheduled: C-3PO
+== APP - job-scheduler-http == Job details: {"name":"C-3PO", "dueTime":"30s", "data":{"@type":"ttype.googleapis.com/google.protobuf.StringValue", "expression":"C-3PO:Limb Calibration"}}
 ```
 
 After 30 seconds, the terminal output should present the `C-3PO` job being processed:
 
 ```text
-== APP - job-service == Received job request...
-== APP - job-service == Starting droid: C-3PO
-== APP - job-service == Executing maintenance job: Limb Calibration
+== APP - job-service-http == Received job request...
+== APP - job-service-http == Starting droid: C-3PO
+== APP - job-service-http == Executing maintenance job: Limb Calibration
 ```
 
 <!-- END_STEP -->
@@ -83,7 +83,7 @@ dapr stop -f .
 1. Open a terminal and run the `job-service` app:
 
 ```bash
-dapr run --app-id job-service --app-port 6200 --dapr-http-port 6280 -- go run .
+dapr run --app-id job-service-http --app-port 6200 --dapr-http-port 6280 -- go run .
 ```
 
 2. On a new terminal window, schedule the `R2-D2` Job using the Jobs API.
@@ -104,9 +104,9 @@ curl -X POST \
 Back at the `job-service` app terminal window, the output should be:
 
 ```text
-== APP - job-app == Received job request...
-== APP - job-app == Starting droid: R2-D2
-== APP - job-app == Executing maintenance job: Oil Change
+== APP - job-service-http == Received job request...
+== APP - job-service-http == Starting droid: R2-D2
+== APP - job-service-http == Executing maintenance job: Oil Change
 ```
 
 3. On the same terminal window, schedule the `C-3PO` Job using the Jobs API.
@@ -155,5 +155,5 @@ curl -X GET http://localhost:6280/v1.0-alpha1/jobs/c-3po -H "Content-Type: appli
 Back at the `job-service` app terminal window, the output should be:
 
 ```text
-ERRO[0249] Error getting job c-3po due to: rpc error: code = Unknown desc = job not found: app||default||job-service||c-3po  instance=diagrid.local scope=dapr.api type=log ver=1.14.0-rc.2
+ERRO[0249] Error getting job c-3po due to: rpc error: code = Unknown desc = job not found: app||default||job-service-http||c-3po  instance=diagrid.local scope=dapr.api type=log ver=1.14.0-rc.2
 ```
diff --git a/jobs/go/http/dapr.yaml b/jobs/go/http/dapr.yaml
@@ -1,13 +1,12 @@
 version: 1
 apps:
-  - appDirPath: ./job-service/
-    appID: job-service
+  - appID: job-service-http
+    appDirPath: ./job-service/
     appPort: 6200
     daprHTTPPort: 6280
-    schedulerHostAddress: localhost
     command: ["go", "run", "."]
-  - appDirPath: ./job-scheduler/
-    appID: job-scheduler
+  - appID: job-scheduler-http
+    appDirPath: ./job-scheduler/
     appPort: 6300
     daprHTTPPort: 6380
     command: ["go", "run", "."]
diff --git a/jobs/go/sdk/README.md b/jobs/go/sdk/README.md
@@ -20,10 +20,10 @@ Open a new terminal window and run the multi app run template:
 <!-- STEP
  name: Run multi app run template
  expected_stdout_lines:
-   - '== APP - job-service == Starting droid: R2-D2'
-   - '== APP - job-service == Executing maintenance job: Oil Change'
-   - '== APP - job-service == Starting droid: C-3PO'
-   - '== APP - job-service == Executing maintenance job: Memory Wipe'
+   - '== APP - job-service-sdk == Starting droid: R2-D2'
+   - '== APP - job-service-sdk == Executing maintenance job: Oil Change'
+   - '== APP - job-service-sdk == Starting droid: C-3PO'
+   - '== APP - job-service-sdk == Executing maintenance job: Memory Wipe'
  expected_stderr_lines:
  output_match_mode: substring
  match_order: none
@@ -49,33 +49,33 @@ The terminal console output should look similar to this, where:
 
 
 ```text
-== APP - job-service == dapr client initializing for: 127.0.0.1:6481
-== APP - job-service == Registered job handler for:  R2-D2
-== APP - job-service == Registered job handler for:  C-3PO
-== APP - job-service == Registered job handler for:  BB-8
-== APP - job-service == Starting server on port: 6400
-== APP - job-service == Job scheduled:  R2-D2
-== APP - job-service == Job scheduled:  C-3PO
-== APP - job-service == 2024/07/17 18:09:59 job:{name:"C-3PO"  due_time:"10s"  data:{value:"{\"droid\":\"C-3PO\",\"Task\":\"Memory Wipe\"}"}}
-== APP - job-scheduler == Get job response:  {"droid":"C-3PO","Task":"Memory Wipe"}
-== APP - job-service == Job scheduled:  BB-8
-== APP - job-service == 2024/07/17 18:09:59 job:{name:"BB-8"  due_time:"15s"  data:{value:"{\"droid\":\"BB-8\",\"Task\":\"Internal Gyroscope Check\"}"}}
-== APP - job-scheduler == Get job response:  {"droid":"BB-8","Task":"Internal Gyroscope Check"}
-== APP - job-scheduler == Deleted job:  BB-8
+== APP - job-service-sdk == dapr client initializing for: 127.0.0.1:6481
+== APP - job-service-sdk == Registered job handler for:  R2-D2
+== APP - job-service-sdk == Registered job handler for:  C-3PO
+== APP - job-service-sdk == Registered job handler for:  BB-8
+== APP - job-service-sdk == Starting server on port: 6400
+== APP - job-service-sdk == Job scheduled:  R2-D2
+== APP - job-service-sdk == Job scheduled:  C-3PO
+== APP - job-service-sdk == 2024/07/17 18:09:59 job:{name:"C-3PO"  due_time:"10s"  data:{value:"{\"droid\":\"C-3PO\",\"Task\":\"Memory Wipe\"}"}}
+== APP - job-scheduler-sdk == Get job response:  {"droid":"C-3PO","Task":"Memory Wipe"}
+== APP - job-service-sdk == Job scheduled:  BB-8
+== APP - job-service-sdk == 2024/07/17 18:09:59 job:{name:"BB-8"  due_time:"15s"  data:{value:"{\"droid\":\"BB-8\",\"Task\":\"Internal Gyroscope Check\"}"}}
+== APP - job-scheduler-sdk == Get job response:  {"droid":"BB-8","Task":"Internal Gyroscope Check"}
+== APP - job-scheduler-sdk == Deleted job:  BB-8
 ```
 
 After 5 seconds, the terminal output should present the `R2-D2` job being processed:
 
 ```text
-== APP - job-service == Starting droid: R2-D2
-== APP - job-service == Executing maintenance job: Oil Change
+== APP - job-service-sdk == Starting droid: R2-D2
+== APP - job-service-sdk == Executing maintenance job: Oil Change
 ```
 
 After 10 seconds, the terminal output should present the `C3-PO` job being processed:
 
 ```text
-== APP - job-service == Starting droid: C-3PO
-== APP - job-service == Executing maintenance job: Memory Wipe
+== APP - job-service-sdk == Starting droid: C-3PO
+== APP - job-service-sdk == Executing maintenance job: Memory Wipe
 ```
 
 <!-- END_STEP -->
@@ -99,7 +99,7 @@ dapr stop -f .
 1. Open a terminal and run the `job-service` app:
 
 ```bash
-dapr run --app-id job-service --app-port 6400 --dapr-grpc-port 6481 --app-protocol grpc -- go run .
+dapr run --app-id job-service-sdk --app-port 6400 --dapr-grpc-port 6481 --app-protocol grpc -- go run .
 ```
 
 The output should be:
@@ -115,7 +115,7 @@ The output should be:
 2. On a new terminal window, run the `job-scheduler` app:
 
 ```bash
-dapr run --app-id job-scheduler --app-port 6500 -- go run .
+dapr run --app-id job-scheduler-sdk --app-port 6500 -- go run .
 ```
 
 The output should be:

diff --git a/jobs/go/sdk/dapr.yaml b/jobs/go/sdk/dapr.yaml
@@ -3,14 +3,13 @@ common:
    daprdLogDestination: console
    logLevel: info
 apps:
-  - appDirPath: ./job-service/
-    appID: job-service
+  - appID: job-service-sdk
+    appDirPath: ./job-service/
     appPort: 6400
     daprGRPCPort: 6481
     appProtocol: grpc
-    schedulerHostAddress: localhost
     command: ["go", "run", "."]
-  - appDirPath: ./job-scheduler/
-    appID: job-scheduler
+  - appID: job-scheduler-sdk
+    appDirPath: ./job-scheduler/
     appPort: 6500
     command: ["go", "run", "."]
diff --git a/jobs/go/sdk/job-scheduler/job-scheduler.go b/jobs/go/sdk/job-scheduler/job-scheduler.go
@@ -112,7 +112,7 @@ func schedule(droidJob DroidJob) error {
 	}
 
 	// Schedule Job
-	_, err = app.daprClient.InvokeMethodWithContent(context.Background(), "job-service", "scheduleJob", "POST", content)
+	_, err = app.daprClient.InvokeMethodWithContent(context.Background(), "job-service-sdk", "scheduleJob", "POST", content)
 	if err != nil {
 		fmt.Println("Error invoking method: ", err)
 		return err

diff --git a/pub_sub/csharp/sdk/README.md b/pub_sub/csharp/sdk/README.md
@@ -23,7 +23,7 @@ This section shows how to run both applications at once using [multi-app run tem
 <!-- STEP
 name: Run multi app run template
 expected_stdout_lines:
-  - 'Started Dapr with app id "order-processor"'
+  - 'Started Dapr with app id "order-processor-sdk"'
   - 'Started Dapr with app id "checkout-sdk"'
   - 'Published data: Order { OrderId = 2 }'
   - 'Subscriber received : Order { OrderId = 2 }'
@@ -43,25 +43,25 @@ 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 - order-processor-sdk == Subscriber received : Order { OrderId = 1 }
 == APP - checkout-sdk == Published data: Order { OrderId = 2 }
-== APP - order-processor == Subscriber received : Order { OrderId = 2 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 2 }
 == APP - checkout-sdk == Published data: Order { OrderId = 3 }
-== APP - order-processor == Subscriber received : Order { OrderId = 3 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 3 }
 == APP - checkout-sdk == Published data: Order { OrderId = 4 }
-== APP - order-processor == Subscriber received : Order { OrderId = 4 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 4 }
 == APP - checkout-sdk == Published data: Order { OrderId = 5 }
-== APP - order-processor == Subscriber received : Order { OrderId = 5 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 5 }
 == APP - checkout-sdk == Published data: Order { OrderId = 6 }
-== APP - order-processor == Subscriber received : Order { OrderId = 6 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 6 }
 == APP - checkout-sdk == Published data: Order { OrderId = 7 }
-== APP - order-processor == Subscriber received : Order { OrderId = 7 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 7 }
 == APP - checkout-sdk == Published data: Order { OrderId = 8 }
-== APP - order-processor == Subscriber received : Order { OrderId = 8 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 8 }
 == APP - checkout-sdk == Published data: Order { OrderId = 9 }
-== APP - order-processor == Subscriber received : Order { OrderId = 9 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 9 }
 == APP - checkout-sdk == Published data: Order { OrderId = 10 }
-== APP - order-processor == Subscriber received : Order { OrderId = 10 }
+== APP - order-processor-sdk == Subscriber received : Order { OrderId = 10 }
 ```
 
 2. Stop and clean up application processes
@@ -81,7 +81,7 @@ An alternative to running all or multiple applications at once is to run single
 
 ```bash
 cd ./order-processor
-dapr run --app-id order-processor --resources-path ../../../components/ --app-port 7006 -- dotnet run
+dapr run --app-id order-processor-sdk --resources-path ../../../components/ --app-port 7006 -- dotnet run
 ```
 
 ### Run Dotnet message publisher with Dapr
@@ -97,6 +97,6 @@ dapr run --app-id checkout-sdk --resources-path ../../../components/ -- dotnet r
 2. Stop and clean up application processes
 
 ```bash
-dapr stop --app-id order-processor
+dapr stop --app-id order-processor-sdk
 dapr stop --app-id checkout-sdk
 ```
diff --git a/pub_sub/csharp/sdk/dapr.yaml b/pub_sub/csharp/sdk/dapr.yaml
@@ -2,7 +2,7 @@ version: 1
 common:
   resourcesPath: ../../components/
 apps:
-  - appID: order-processor
+  - appID: order-processor-sdk
     appDirPath: ./order-processor/
     appPort: 7006
     command: ["dotnet", "run"]

diff --git a/pub_sub/go/sdk/README.md b/pub_sub/go/sdk/README.md
@@ -19,10 +19,10 @@ This section shows how to run both applications at once using [multi-app run tem
 <!-- STEP
 name: Run multi app run template
 expected_stdout_lines:
-  - 'Started Dapr with app id "order-processor"'
+  - 'Started Dapr with app id "order-processor-sdk"'
   - 'Started Dapr with app id "checkout-sdk"'
   - '== APP - checkout-sdk == Published data: {"orderId":1}'
-  - '== APP - order-processor == Subscriber received: map[orderId:1]'
+  - '== APP - order-processor-sdk == Subscriber received: map[orderId:1]'
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none
@@ -39,25 +39,25 @@ The terminal console output should look similar to this:
 
 ```text
 == APP - checkout-sdk == Published data: {"orderId":1}
-== APP - order-processor == Subscriber received: map[orderId:1]
+== APP - order-processor-sdk == Subscriber received: map[orderId:1]
 == APP - checkout-sdk == Published data: {"orderId":2}
-== APP - order-processor == Subscriber received: map[orderId:2]
+== APP - order-processor-sdk == Subscriber received: map[orderId:2]
 == APP - checkout-sdk == Published data: {"orderId":3}
-== APP - order-processor == Subscriber received: map[orderId:3]
+== APP - order-processor-sdk == Subscriber received: map[orderId:3]
 == APP - checkout-sdk == Published data: {"orderId":4}
-== APP - order-processor == Subscriber received: map[orderId:4]
+== APP - order-processor-sdk == Subscriber received: map[orderId:4]
 == APP - checkout-sdk == Published data: {"orderId":5}
-== APP - order-processor == Subscriber received: map[orderId:5]
+== APP - order-processor-sdk == Subscriber received: map[orderId:5]
 == APP - checkout-sdk == Published data: {"orderId":6}
-== APP - order-processor == Subscriber received: map[orderId:6]
+== APP - order-processor-sdk == Subscriber received: map[orderId:6]
 == APP - checkout-sdk == Published data: {"orderId":7}
-== APP - order-processor == Subscriber received: map[orderId:7]
+== APP - order-processor-sdk == Subscriber received: map[orderId:7]
 == APP - checkout-sdk == Published data: {"orderId":8}
-== APP - order-processor == Subscriber received: map[orderId:8]
+== APP - order-processor-sdk == Subscriber received: map[orderId:8]
 == APP - checkout-sdk == Published data: {"orderId":9}
-== APP - order-processor == Subscriber received: map[orderId:9]
+== APP - order-processor-sdk == Subscriber received: map[orderId:9]
 == APP - checkout-sdk == Published data: {"orderId":10}
-== APP - order-processor == Subscriber received: map[orderId:10]
+== APP - order-processor-sdk == Subscriber received: map[orderId:10]
 ```
 <!-- END_STEP -->
 

diff --git a/pub_sub/go/sdk/dapr.yaml b/pub_sub/go/sdk/dapr.yaml
@@ -2,7 +2,7 @@ version: 1
 common:
   resourcesPath: ../../components/
 apps:
-  - appID: order-processor
+  - appID: order-processor-sdk
     appDirPath: ./order-processor/
     appPort: 6005
     command: ["go", "run", "."]

diff --git a/pub_sub/javascript/sdk/README.md b/pub_sub/javascript/sdk/README.md
@@ -39,10 +39,10 @@ cd ..
 <!-- STEP
 name: Run multi app run template
 expected_stdout_lines:
-  - 'Started Dapr with app id "order-processor"'
+  - 'Started Dapr with app id "order-processor-sdk"'
   - 'Started Dapr with app id "checkout-sdk"'
   - '== APP - checkout-sdk == Published data: {"orderId":1}'
-  - '== APP - order-processor == Subscriber received: {"orderId":1}'
+  - '== APP - order-processor-sdk == Subscriber received: {"orderId":1}'
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none
@@ -59,25 +59,25 @@ The terminal console output should look similar to this:
 
 ```text
 == APP - checkout-sdk == Published data: {"orderId":1}
-== APP - order-processor == Subscriber received: {"orderId":1}
+== APP - order-processor-sdk == Subscriber received: {"orderId":1}
 == APP - checkout-sdk == Published data: {"orderId":2}
-== APP - order-processor == Subscriber received: {"orderId":2}
+== APP - order-processor-sdk == Subscriber received: {"orderId":2}
 == APP - checkout-sdk == Published data: {"orderId":3}
-== APP - order-processor == Subscriber received: {"orderId":3}
+== APP - order-processor-sdk == Subscriber received: {"orderId":3}
 == APP - checkout-sdk == Published data: {"orderId":4}
-== APP - order-processor == Subscriber received: {"orderId":4}
+== APP - order-processor-sdk == Subscriber received: {"orderId":4}
 == APP - checkout-sdk == Published data: {"orderId":5}
-== APP - order-processor == Subscriber received: {"orderId":5}
+== APP - order-processor-sdk == Subscriber received: {"orderId":5}
 == APP - checkout-sdk == Published data: {"orderId":6}
-== APP - order-processor == Subscriber received: {"orderId":6}
+== APP - order-processor-sdk == Subscriber received: {"orderId":6}
 == APP - checkout-sdk == Published data: {"orderId":7}
-== APP - order-processor == Subscriber received: {"orderId":7}
+== APP - order-processor-sdk == Subscriber received: {"orderId":7}
 == APP - checkout-sdk == Published data: {"orderId":8}
-== APP - order-processor == Subscriber received: {"orderId":8}
+== APP - order-processor-sdk == Subscriber received: {"orderId":8}
 == APP - checkout-sdk == Published data: {"orderId":9}
-== APP - order-processor == Subscriber received: {"orderId":9}
+== APP - order-processor-sdk == Subscriber received: {"orderId":9}
 == APP - checkout-sdk == Published data: {"orderId":10}
-== APP - order-processor == Subscriber received: {"orderId":10}
+== APP - order-processor-sdk == Subscriber received: {"orderId":10}
 ```
 
 3. Stop and clean up application processes

diff --git a/pub_sub/javascript/sdk/dapr.yaml b/pub_sub/javascript/sdk/dapr.yaml
@@ -2,7 +2,7 @@ version: 1
 common:
   resourcesPath: ../../components/
 apps:
-  - appID: order-processor
+  - appID: order-processor-sdk
     appDirPath: ./order-processor/
     appPort: 5002
     command: ["npm", "run", "start"]