Skip to content

Commit 9449aa4

Browse files
marcduikermarcduiker
authored
Fix inconsistent dapr.yaml and appIDs (#1152)
* Fix inconsistent multi-app run files Signed-off-by: Marc Duiker <[email protected]> * Rename appID for consistency Signed-off-by: Marc Duiker <[email protected]> * Update appID for consistency Signed-off-by: Marc Duiker <[email protected]> * fix appID Signed-off-by: Marc Duiker <[email protected]> * Fix appID Signed-off-by: Marc Duiker <[email protected]> * Remove schedulerHostAddress Signed-off-by: Marc Duiker <[email protected]> --------- Signed-off-by: Marc Duiker <[email protected]>
1 parent ce7638a commit 9449aa4

File tree

24 files changed

+201
-203
lines changed

24 files changed

+201
-203
lines changed

‎jobs/go/http/README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Open a new terminal window and run the multi app run template:
2020
<!-- STEP
2121
name: Run multi app run template
2222
expected_stdout_lines:
23-
- '== APP - job-service == Received job request...'
24-
- '== APP - job-service == Executing maintenance job: Oil Change'
25-
- '== APP - job-scheduler == Job Scheduled: C-3PO'
26-
- '== APP - job-service == Received job request...'
27-
- '== APP - job-service == Executing maintenance job: Limb Calibration'
23+
- '== APP - job-service-http == Received job request...'
24+
- '== APP - job-service-http == Executing maintenance job: Oil Change'
25+
- '== APP - job-scheduler-http == Job Scheduled: C-3PO'
26+
- '== APP - job-service-http == Received job request...'
27+
- '== APP - job-service-http == Executing maintenance job: Limb Calibration'
2828
expected_stderr_lines:
2929
output_match_mode: substring
3030
match_order: none
@@ -45,20 +45,20 @@ The terminal console output should look similar to this, where:
4545
- The `C-3PO` job is being retrieved.
4646

4747
```text
48-
== APP - job-scheduler == Job Scheduled: R2-D2
49-
== APP - job-service == Received job request...
50-
== APP - job-service == Starting droid: R2-D2
51-
== APP - job-service == Executing maintenance job: Oil Change
52-
== APP - job-scheduler == Job Scheduled: C-3PO
53-
== APP - job-scheduler == Job details: {"name":"C-3PO", "dueTime":"30s", "data":{"@type":"ttype.googleapis.com/google.protobuf.StringValue", "expression":"C-3PO:Limb Calibration"}}
48+
== APP - job-scheduler-http == Job Scheduled: R2-D2
49+
== APP - job-service-http == Received job request...
50+
== APP - job-service-http == Starting droid: R2-D2
51+
== APP - job-service-http == Executing maintenance job: Oil Change
52+
== APP - job-scheduler-http == Job Scheduled: C-3PO
53+
== APP - job-scheduler-http == Job details: {"name":"C-3PO", "dueTime":"30s", "data":{"@type":"ttype.googleapis.com/google.protobuf.StringValue", "expression":"C-3PO:Limb Calibration"}}
5454
```
5555

5656
After 30 seconds, the terminal output should present the `C-3PO` job being processed:
5757

5858
```text
59-
== APP - job-service == Received job request...
60-
== APP - job-service == Starting droid: C-3PO
61-
== APP - job-service == Executing maintenance job: Limb Calibration
59+
== APP - job-service-http == Received job request...
60+
== APP - job-service-http == Starting droid: C-3PO
61+
== APP - job-service-http == Executing maintenance job: Limb Calibration
6262
```
6363

6464
<!-- END_STEP -->
@@ -83,7 +83,7 @@ dapr stop -f .
8383
1. Open a terminal and run the `job-service` app:
8484

8585
```bash
86-
dapr run --app-id job-service --app-port 6200 --dapr-http-port 6280 -- go run .
86+
dapr run --app-id job-service-http --app-port 6200 --dapr-http-port 6280 -- go run .
8787
```
8888

8989
2. On a new terminal window, schedule the `R2-D2` Job using the Jobs API.
@@ -104,9 +104,9 @@ curl -X POST \
104104
Back at the `job-service` app terminal window, the output should be:
105105

106106
```text
107-
== APP - job-app == Received job request...
108-
== APP - job-app == Starting droid: R2-D2
109-
== APP - job-app == Executing maintenance job: Oil Change
107+
== APP - job-service-http == Received job request...
108+
== APP - job-service-http == Starting droid: R2-D2
109+
== APP - job-service-http == Executing maintenance job: Oil Change
110110
```
111111

112112
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
155155
Back at the `job-service` app terminal window, the output should be:
156156

157157
```text
158-
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
158+
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
159159
```

‎jobs/go/http/dapr.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
version: 1
22
apps:
3-
- appDirPath: ./job-service/
4-
appID: job-service
3+
- appID: job-service-http
4+
appDirPath: ./job-service/
55
appPort: 6200
66
daprHTTPPort: 6280
7-
schedulerHostAddress: localhost
87
command: ["go", "run", "."]
9-
- appDirPath: ./job-scheduler/
10-
appID: job-scheduler
8+
- appID: job-scheduler-http
9+
appDirPath: ./job-scheduler/
1110
appPort: 6300
1211
daprHTTPPort: 6380
1312
command: ["go", "run", "."]

‎jobs/go/sdk/README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Open a new terminal window and run the multi app run template:
2020
<!-- STEP
2121
name: Run multi app run template
2222
expected_stdout_lines:
23-
- '== APP - job-service == Starting droid: R2-D2'
24-
- '== APP - job-service == Executing maintenance job: Oil Change'
25-
- '== APP - job-service == Starting droid: C-3PO'
26-
- '== APP - job-service == Executing maintenance job: Memory Wipe'
23+
- '== APP - job-service-sdk == Starting droid: R2-D2'
24+
- '== APP - job-service-sdk == Executing maintenance job: Oil Change'
25+
- '== APP - job-service-sdk == Starting droid: C-3PO'
26+
- '== APP - job-service-sdk == Executing maintenance job: Memory Wipe'
2727
expected_stderr_lines:
2828
output_match_mode: substring
2929
match_order: none
@@ -49,33 +49,33 @@ The terminal console output should look similar to this, where:
4949

5050

5151
```text
52-
== APP - job-service == dapr client initializing for: 127.0.0.1:6481
53-
== APP - job-service == Registered job handler for: R2-D2
54-
== APP - job-service == Registered job handler for: C-3PO
55-
== APP - job-service == Registered job handler for: BB-8
56-
== APP - job-service == Starting server on port: 6400
57-
== APP - job-service == Job scheduled: R2-D2
58-
== APP - job-service == Job scheduled: C-3PO
59-
== APP - job-service == 2024/07/17 18:09:59 job:{name:"C-3PO" due_time:"10s" data:{value:"{\"droid\":\"C-3PO\",\"Task\":\"Memory Wipe\"}"}}
60-
== APP - job-scheduler == Get job response: {"droid":"C-3PO","Task":"Memory Wipe"}
61-
== APP - job-service == Job scheduled: BB-8
62-
== 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\"}"}}
63-
== APP - job-scheduler == Get job response: {"droid":"BB-8","Task":"Internal Gyroscope Check"}
64-
== APP - job-scheduler == Deleted job: BB-8
52+
== APP - job-service-sdk == dapr client initializing for: 127.0.0.1:6481
53+
== APP - job-service-sdk == Registered job handler for: R2-D2
54+
== APP - job-service-sdk == Registered job handler for: C-3PO
55+
== APP - job-service-sdk == Registered job handler for: BB-8
56+
== APP - job-service-sdk == Starting server on port: 6400
57+
== APP - job-service-sdk == Job scheduled: R2-D2
58+
== APP - job-service-sdk == Job scheduled: C-3PO
59+
== 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\"}"}}
60+
== APP - job-scheduler-sdk == Get job response: {"droid":"C-3PO","Task":"Memory Wipe"}
61+
== APP - job-service-sdk == Job scheduled: BB-8
62+
== 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\"}"}}
63+
== APP - job-scheduler-sdk == Get job response: {"droid":"BB-8","Task":"Internal Gyroscope Check"}
64+
== APP - job-scheduler-sdk == Deleted job: BB-8
6565
```
6666

6767
After 5 seconds, the terminal output should present the `R2-D2` job being processed:
6868

6969
```text
70-
== APP - job-service == Starting droid: R2-D2
71-
== APP - job-service == Executing maintenance job: Oil Change
70+
== APP - job-service-sdk == Starting droid: R2-D2
71+
== APP - job-service-sdk == Executing maintenance job: Oil Change
7272
```
7373

7474
After 10 seconds, the terminal output should present the `C3-PO` job being processed:
7575

7676
```text
77-
== APP - job-service == Starting droid: C-3PO
78-
== APP - job-service == Executing maintenance job: Memory Wipe
77+
== APP - job-service-sdk == Starting droid: C-3PO
78+
== APP - job-service-sdk == Executing maintenance job: Memory Wipe
7979
```
8080

8181
<!-- END_STEP -->
@@ -99,7 +99,7 @@ dapr stop -f .
9999
1. Open a terminal and run the `job-service` app:
100100

101101
```bash
102-
dapr run --app-id job-service --app-port 6400 --dapr-grpc-port 6481 --app-protocol grpc -- go run .
102+
dapr run --app-id job-service-sdk --app-port 6400 --dapr-grpc-port 6481 --app-protocol grpc -- go run .
103103
```
104104

105105
The output should be:
@@ -115,7 +115,7 @@ The output should be:
115115
2. On a new terminal window, run the `job-scheduler` app:
116116

117117
```bash
118-
dapr run --app-id job-scheduler --app-port 6500 -- go run .
118+
dapr run --app-id job-scheduler-sdk --app-port 6500 -- go run .
119119
```
120120

121121
The output should be:

‎jobs/go/sdk/dapr.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ common:
33
daprdLogDestination: console
44
logLevel: info
55
apps:
6-
- appDirPath: ./job-service/
7-
appID: job-service
6+
- appID: job-service-sdk
7+
appDirPath: ./job-service/
88
appPort: 6400
99
daprGRPCPort: 6481
1010
appProtocol: grpc
11-
schedulerHostAddress: localhost
1211
command: ["go", "run", "."]
13-
- appDirPath: ./job-scheduler/
14-
appID: job-scheduler
12+
- appID: job-scheduler-sdk
13+
appDirPath: ./job-scheduler/
1514
appPort: 6500
1615
command: ["go", "run", "."]

‎jobs/go/sdk/job-scheduler/job-scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func schedule(droidJob DroidJob) error {
112112
}
113113

114114
// Schedule Job
115-
_, err = app.daprClient.InvokeMethodWithContent(context.Background(), "job-service", "scheduleJob", "POST", content)
115+
_, err = app.daprClient.InvokeMethodWithContent(context.Background(), "job-service-sdk", "scheduleJob", "POST", content)
116116
if err != nil {
117117
fmt.Println("Error invoking method: ", err)
118118
return err

‎pub_sub/csharp/sdk/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This section shows how to run both applications at once using [multi-app run tem
2323
<!-- STEP
2424
name: Run multi app run template
2525
expected_stdout_lines:
26-
- 'Started Dapr with app id "order-processor"'
26+
- 'Started Dapr with app id "order-processor-sdk"'
2727
- 'Started Dapr with app id "checkout-sdk"'
2828
- 'Published data: Order { OrderId = 2 }'
2929
- 'Subscriber received : Order { OrderId = 2 }'
@@ -43,25 +43,25 @@ The terminal console output should look similar to this:
4343

4444
```text
4545
== APP - checkout-sdk == Published data: Order { OrderId = 1 }
46-
== APP - order-processor == Subscriber received : Order { OrderId = 1 }
46+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 1 }
4747
== APP - checkout-sdk == Published data: Order { OrderId = 2 }
48-
== APP - order-processor == Subscriber received : Order { OrderId = 2 }
48+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 2 }
4949
== APP - checkout-sdk == Published data: Order { OrderId = 3 }
50-
== APP - order-processor == Subscriber received : Order { OrderId = 3 }
50+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 3 }
5151
== APP - checkout-sdk == Published data: Order { OrderId = 4 }
52-
== APP - order-processor == Subscriber received : Order { OrderId = 4 }
52+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 4 }
5353
== APP - checkout-sdk == Published data: Order { OrderId = 5 }
54-
== APP - order-processor == Subscriber received : Order { OrderId = 5 }
54+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 5 }
5555
== APP - checkout-sdk == Published data: Order { OrderId = 6 }
56-
== APP - order-processor == Subscriber received : Order { OrderId = 6 }
56+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 6 }
5757
== APP - checkout-sdk == Published data: Order { OrderId = 7 }
58-
== APP - order-processor == Subscriber received : Order { OrderId = 7 }
58+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 7 }
5959
== APP - checkout-sdk == Published data: Order { OrderId = 8 }
60-
== APP - order-processor == Subscriber received : Order { OrderId = 8 }
60+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 8 }
6161
== APP - checkout-sdk == Published data: Order { OrderId = 9 }
62-
== APP - order-processor == Subscriber received : Order { OrderId = 9 }
62+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 9 }
6363
== APP - checkout-sdk == Published data: Order { OrderId = 10 }
64-
== APP - order-processor == Subscriber received : Order { OrderId = 10 }
64+
== APP - order-processor-sdk == Subscriber received : Order { OrderId = 10 }
6565
```
6666

6767
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
8181

8282
```bash
8383
cd ./order-processor
84-
dapr run --app-id order-processor --resources-path ../../../components/ --app-port 7006 -- dotnet run
84+
dapr run --app-id order-processor-sdk --resources-path ../../../components/ --app-port 7006 -- dotnet run
8585
```
8686

8787
### Run Dotnet message publisher with Dapr
@@ -97,6 +97,6 @@ dapr run --app-id checkout-sdk --resources-path ../../../components/ -- dotnet r
9797
2. Stop and clean up application processes
9898

9999
```bash
100-
dapr stop --app-id order-processor
100+
dapr stop --app-id order-processor-sdk
101101
dapr stop --app-id checkout-sdk
102102
```

‎pub_sub/csharp/sdk/dapr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 1
22
common:
33
resourcesPath: ../../components/
44
apps:
5-
- appID: order-processor
5+
- appID: order-processor-sdk
66
appDirPath: ./order-processor/
77
appPort: 7006
88
command: ["dotnet", "run"]

‎pub_sub/go/sdk/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ This section shows how to run both applications at once using [multi-app run tem
1919
<!-- STEP
2020
name: Run multi app run template
2121
expected_stdout_lines:
22-
- 'Started Dapr with app id "order-processor"'
22+
- 'Started Dapr with app id "order-processor-sdk"'
2323
- 'Started Dapr with app id "checkout-sdk"'
2424
- '== APP - checkout-sdk == Published data: {"orderId":1}'
25-
- '== APP - order-processor == Subscriber received: map[orderId:1]'
25+
- '== APP - order-processor-sdk == Subscriber received: map[orderId:1]'
2626
expected_stderr_lines:
2727
output_match_mode: substring
2828
match_order: none
@@ -39,25 +39,25 @@ The terminal console output should look similar to this:
3939

4040
```text
4141
== APP - checkout-sdk == Published data: {"orderId":1}
42-
== APP - order-processor == Subscriber received: map[orderId:1]
42+
== APP - order-processor-sdk == Subscriber received: map[orderId:1]
4343
== APP - checkout-sdk == Published data: {"orderId":2}
44-
== APP - order-processor == Subscriber received: map[orderId:2]
44+
== APP - order-processor-sdk == Subscriber received: map[orderId:2]
4545
== APP - checkout-sdk == Published data: {"orderId":3}
46-
== APP - order-processor == Subscriber received: map[orderId:3]
46+
== APP - order-processor-sdk == Subscriber received: map[orderId:3]
4747
== APP - checkout-sdk == Published data: {"orderId":4}
48-
== APP - order-processor == Subscriber received: map[orderId:4]
48+
== APP - order-processor-sdk == Subscriber received: map[orderId:4]
4949
== APP - checkout-sdk == Published data: {"orderId":5}
50-
== APP - order-processor == Subscriber received: map[orderId:5]
50+
== APP - order-processor-sdk == Subscriber received: map[orderId:5]
5151
== APP - checkout-sdk == Published data: {"orderId":6}
52-
== APP - order-processor == Subscriber received: map[orderId:6]
52+
== APP - order-processor-sdk == Subscriber received: map[orderId:6]
5353
== APP - checkout-sdk == Published data: {"orderId":7}
54-
== APP - order-processor == Subscriber received: map[orderId:7]
54+
== APP - order-processor-sdk == Subscriber received: map[orderId:7]
5555
== APP - checkout-sdk == Published data: {"orderId":8}
56-
== APP - order-processor == Subscriber received: map[orderId:8]
56+
== APP - order-processor-sdk == Subscriber received: map[orderId:8]
5757
== APP - checkout-sdk == Published data: {"orderId":9}
58-
== APP - order-processor == Subscriber received: map[orderId:9]
58+
== APP - order-processor-sdk == Subscriber received: map[orderId:9]
5959
== APP - checkout-sdk == Published data: {"orderId":10}
60-
== APP - order-processor == Subscriber received: map[orderId:10]
60+
== APP - order-processor-sdk == Subscriber received: map[orderId:10]
6161
```
6262
<!-- END_STEP -->
6363

‎pub_sub/go/sdk/dapr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 1
22
common:
33
resourcesPath: ../../components/
44
apps:
5-
- appID: order-processor
5+
- appID: order-processor-sdk
66
appDirPath: ./order-processor/
77
appPort: 6005
88
command: ["go", "run", "."]

‎pub_sub/javascript/sdk/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ cd ..
3939
<!-- STEP
4040
name: Run multi app run template
4141
expected_stdout_lines:
42-
- 'Started Dapr with app id "order-processor"'
42+
- 'Started Dapr with app id "order-processor-sdk"'
4343
- 'Started Dapr with app id "checkout-sdk"'
4444
- '== APP - checkout-sdk == Published data: {"orderId":1}'
45-
- '== APP - order-processor == Subscriber received: {"orderId":1}'
45+
- '== APP - order-processor-sdk == Subscriber received: {"orderId":1}'
4646
expected_stderr_lines:
4747
output_match_mode: substring
4848
match_order: none
@@ -59,25 +59,25 @@ The terminal console output should look similar to this:
5959

6060
```text
6161
== APP - checkout-sdk == Published data: {"orderId":1}
62-
== APP - order-processor == Subscriber received: {"orderId":1}
62+
== APP - order-processor-sdk == Subscriber received: {"orderId":1}
6363
== APP - checkout-sdk == Published data: {"orderId":2}
64-
== APP - order-processor == Subscriber received: {"orderId":2}
64+
== APP - order-processor-sdk == Subscriber received: {"orderId":2}
6565
== APP - checkout-sdk == Published data: {"orderId":3}
66-
== APP - order-processor == Subscriber received: {"orderId":3}
66+
== APP - order-processor-sdk == Subscriber received: {"orderId":3}
6767
== APP - checkout-sdk == Published data: {"orderId":4}
68-
== APP - order-processor == Subscriber received: {"orderId":4}
68+
== APP - order-processor-sdk == Subscriber received: {"orderId":4}
6969
== APP - checkout-sdk == Published data: {"orderId":5}
70-
== APP - order-processor == Subscriber received: {"orderId":5}
70+
== APP - order-processor-sdk == Subscriber received: {"orderId":5}
7171
== APP - checkout-sdk == Published data: {"orderId":6}
72-
== APP - order-processor == Subscriber received: {"orderId":6}
72+
== APP - order-processor-sdk == Subscriber received: {"orderId":6}
7373
== APP - checkout-sdk == Published data: {"orderId":7}
74-
== APP - order-processor == Subscriber received: {"orderId":7}
74+
== APP - order-processor-sdk == Subscriber received: {"orderId":7}
7575
== APP - checkout-sdk == Published data: {"orderId":8}
76-
== APP - order-processor == Subscriber received: {"orderId":8}
76+
== APP - order-processor-sdk == Subscriber received: {"orderId":8}
7777
== APP - checkout-sdk == Published data: {"orderId":9}
78-
== APP - order-processor == Subscriber received: {"orderId":9}
78+
== APP - order-processor-sdk == Subscriber received: {"orderId":9}
7979
== APP - checkout-sdk == Published data: {"orderId":10}
80-
== APP - order-processor == Subscriber received: {"orderId":10}
80+
== APP - order-processor-sdk == Subscriber received: {"orderId":10}
8181
```
8282

8383
3. Stop and clean up application processes

0 commit comments

Comments
 (0)