Skip to content

Commit 0a32eb8

Browse files
sicoylesicoyle
authored
fix: correct build failures on validation of examples (#945)
* style: rm prefix of == APP == Signed-off-by: Samantha Coyle <sam@diagrid.io> * fix: update readmes for release branch Signed-off-by: Samantha Coyle <sam@diagrid.io> --------- Signed-off-by: Samantha Coyle <sam@diagrid.io>
1 parent 8dbfa4f commit 0a32eb8

23 files changed

Lines changed: 591 additions & 590 deletions

File tree

‎examples/configuration/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ To run this example, use the following command:
4747
name: Run get configuration example
4848
match_order: none
4949
expected_stdout_lines:
50-
- "== APP == Got key=orderId1 value=100 version=1 metadata={}"
51-
- "== APP == Got key=orderId2 value=200 version=1 metadata={}"
52-
- "== APP == Subscribe key=orderId2 value=210 version=2 metadata={}"
53-
- "== APP == Unsubscribed successfully? True"
50+
- "Got key=orderId1 value=100 version=1 metadata={}"
51+
- "Got key=orderId2 value=200 version=1 metadata={}"
52+
- "Subscribe key=orderId2 value=210 version=2 metadata={}"
53+
- "Unsubscribed successfully? True"
5454
background: true
5555
timeout_seconds: 30
5656
sleep: 3
@@ -75,7 +75,7 @@ docker exec dapr_redis redis-cli SET orderId2 "210||2"
7575

7676
You should be able to see the following output:
7777
```
78-
== APP == Got key=orderId1 value=100 version=1
79-
== APP == Got key=orderId2 value=200 version=1
80-
== APP == Subscribe key=orderId2 value=210 version=2
78+
Got key=orderId1 value=100 version=1
79+
Got key=orderId2 value=200 version=1
80+
Subscribe key=orderId2 value=210 version=2
8181
```

‎examples/conversation/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ The Conversation API supports real LLM providers including:
2828
<!-- STEP
2929
name: Run Conversation Alpha V1
3030
expected_stdout_lines:
31-
- "== APP == Result: What's Dapr?"
32-
- "== APP == Give a brief overview."
31+
- "Result: What's Dapr?"
32+
- "Give a brief overview."
3333
background: true
3434
timeout_seconds: 60
3535
-->
@@ -47,8 +47,8 @@ The Conversation API supports real LLM providers including:
4747
<!-- STEP
4848
name: Run Conversation Alpha V2
4949
expected_stdout_lines:
50-
- "== APP == Result: What's Dapr?"
51-
- "== APP == Give a brief overview."
50+
- "Result: What's Dapr?"
51+
- "Give a brief overview."
5252
background: true
5353
timeout_seconds: 60
5454
-->

‎examples/crypto/README.md‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ openssl rand -out keys/symmetric-key-256 32
3939
<!-- STEP
4040
name: Run crypto example
4141
expected_stdout_lines:
42-
- '== APP == Running gRPC client synchronous API'
43-
- '== APP == Running encrypt/decrypt operation on string'
44-
- '== APP == Encrypted the message, got 856 bytes'
45-
- '== APP == Decrypted the message, got 24 bytes'
46-
- '== APP == The secret is "passw0rd"'
47-
- '== APP == Running encrypt/decrypt operation on file'
48-
- '== APP == Wrote encrypted data to encrypted.out'
49-
- '== APP == Wrote decrypted data to decrypted.out.jpg'
42+
- 'Running gRPC client synchronous API'
43+
- 'Running encrypt/decrypt operation on string'
44+
- 'Encrypted the message, got 856 bytes'
45+
- 'Decrypted the message, got 24 bytes'
46+
- 'The secret is "passw0rd"'
47+
- 'Running encrypt/decrypt operation on file'
48+
- 'Wrote encrypted data to encrypted.out'
49+
- 'Wrote decrypted data to decrypted.out.jpg'
5050
- "Exited App successfully"
5151
output_match_mode: substring
5252
timeout_seconds: 10
@@ -63,14 +63,14 @@ dapr run --app-id crypto --resources-path ./components/ -- python3 crypto.py
6363
<!-- STEP
6464
name: Run async crypto example
6565
expected_stdout_lines:
66-
- '== APP == Running gRPC client asynchronous API'
67-
- '== APP == Running encrypt/decrypt operation on string'
68-
- '== APP == Encrypted the message, got 856 bytes'
69-
- '== APP == Decrypted the message, got 24 bytes'
70-
- '== APP == The secret is "passw0rd"'
71-
- '== APP == Running encrypt/decrypt operation on file'
72-
- '== APP == Wrote encrypted data to encrypted.out'
73-
- '== APP == Wrote decrypted data to decrypted.out.jpg'
66+
- 'Running gRPC client asynchronous API'
67+
- 'Running encrypt/decrypt operation on string'
68+
- 'Encrypted the message, got 856 bytes'
69+
- 'Decrypted the message, got 24 bytes'
70+
- 'The secret is "passw0rd"'
71+
- 'Running encrypt/decrypt operation on file'
72+
- 'Wrote encrypted data to encrypted.out'
73+
- 'Wrote decrypted data to decrypted.out.jpg'
7474
- "Exited App successfully"
7575
output_match_mode: substring
7676
timeout_seconds: 10
@@ -102,20 +102,20 @@ rm decrypted.out.jpg
102102
The output should be as follows:
103103

104104
```shell
105-
== APP == Running gRPC client synchronous API
106-
== APP == Running encrypt/decrypt operation on string
107-
== APP == Encrypted the message, got 856 bytes
108-
== APP == Decrypted the message, got 24 bytes
109-
== APP == b'The secret is "passw0rd"'
110-
== APP == Running encrypt/decrypt operation on file
111-
== APP == Wrote encrypted data to encrypted.out
112-
== APP == Wrote decrypted data to decrypted.out.jpg
113-
== APP == Running gRPC client asynchronous API
114-
== APP == Running encrypt/decrypt operation on string
115-
== APP == Encrypted the message, got 856 bytes
116-
== APP == Decrypted the message, got 24 bytes
117-
== APP == b'The secret is "passw0rd"'
118-
== APP == Running encrypt/decrypt operation on file
119-
== APP == Wrote encrypted data to encrypted.out
120-
== APP == Wrote decrypted data to decrypted.out.jpg
105+
Running gRPC client synchronous API
106+
Running encrypt/decrypt operation on string
107+
Encrypted the message, got 856 bytes
108+
Decrypted the message, got 24 bytes
109+
b'The secret is "passw0rd"'
110+
Running encrypt/decrypt operation on file
111+
Wrote encrypted data to encrypted.out
112+
Wrote decrypted data to decrypted.out.jpg
113+
Running gRPC client asynchronous API
114+
Running encrypt/decrypt operation on string
115+
Encrypted the message, got 856 bytes
116+
Decrypted the message, got 24 bytes
117+
b'The secret is "passw0rd"'
118+
Running encrypt/decrypt operation on file
119+
Wrote encrypted data to encrypted.out
120+
Wrote decrypted data to decrypted.out.jpg
121121
```

‎examples/demo_actor/README.md‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ name: Actor Service
2828
background: true
2929
sleep: 5
3030
expected_stdout_lines:
31-
- '== APP == Activate DemoActor actor!'
32-
- '== APP == has_value: False'
33-
- '== APP == has_value: False'
34-
- "== APP == set_my_data: {'data': 'new_data'}"
35-
- '== APP == has_value: True'
36-
- '== APP == set reminder to True'
37-
- '== APP == set reminder is done'
38-
- '== APP == set_timer to True'
39-
- '== APP == set_timer is done'
40-
- "== APP == receive_reminder is called - demo_reminder reminder - b'reminder_state'"
41-
- "== APP == clear_my_data"
31+
- 'Activate DemoActor actor!'
32+
- 'has_value: False'
33+
- 'has_value: False'
34+
- "set_my_data: {'data': 'new_data'}"
35+
- 'has_value: True'
36+
- 'set reminder to True'
37+
- 'set reminder is done'
38+
- 'set_timer to True'
39+
- 'set_timer is done'
40+
- "receive_reminder is called - demo_reminder reminder - b'reminder_state'"
41+
- "clear_my_data"
4242
timeout_seconds: 60
4343
-->
4444

@@ -53,23 +53,23 @@ timeout_seconds: 60
5353
Expected output:
5454
```
5555
...
56-
== APP == Activate DemoActor actor!
57-
== APP == has_value: False
58-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
59-
== APP == has_value: False
60-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
61-
== APP == set_my_data: {'data': 'new_data'}
62-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetMyData HTTP/1.1" 200 OK
63-
== APP == has_value: True
64-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
65-
== APP == set reminder to True
66-
== APP == set reminder is done
67-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetReminder HTTP/1.1" 200 OK
68-
== APP == set_timer to True
69-
== APP == set_timer is done
70-
== APP == INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetTimer HTTP/1.1" 200 OK
71-
== APP == receive_reminder is called - demo_reminder reminder - b'reminder_state'
72-
== APP == clear_my_data
56+
Activate DemoActor actor!
57+
has_value: False
58+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
59+
has_value: False
60+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
61+
set_my_data: {'data': 'new_data'}
62+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetMyData HTTP/1.1" 200 OK
63+
has_value: True
64+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/GetMyData HTTP/1.1" 200 OK
65+
set reminder to True
66+
set reminder is done
67+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetReminder HTTP/1.1" 200 OK
68+
set_timer to True
69+
set_timer is done
70+
INFO: 127.0.0.1:50739 - "PUT /actors/DemoActor/1/method/SetTimer HTTP/1.1" 200 OK
71+
receive_reminder is called - demo_reminder reminder - b'reminder_state'
72+
clear_my_data
7373
...
7474
```
7575

@@ -78,19 +78,19 @@ timeout_seconds: 60
7878
<!-- STEP
7979
name: Actor Client
8080
expected_stdout_lines:
81-
- '== APP == call actor method via proxy.invoke_method()'
82-
- "== APP == b'null'"
83-
- '== APP == call actor method using rpc style'
84-
- '== APP == None'
85-
- "== APP == Actor reentrancy enabled: b'true'"
86-
- '== APP == call SetMyData actor method to save the state'
87-
- '== APP == call GetMyData actor method to get the state'
88-
- '== APP == Register reminder'
89-
- '== APP == Register timer'
90-
- '== APP == waiting for 30 seconds'
91-
- '== APP == stop reminder'
92-
- '== APP == stop timer'
93-
- '== APP == clear actor state'
81+
- 'call actor method via proxy.invoke_method()'
82+
- "b'null'"
83+
- 'call actor method using rpc style'
84+
- 'None'
85+
- "Actor reentrancy enabled: b'true'"
86+
- 'call SetMyData actor method to save the state'
87+
- 'call GetMyData actor method to get the state'
88+
- 'Register reminder'
89+
- 'Register timer'
90+
- 'waiting for 30 seconds'
91+
- 'stop reminder'
92+
- 'stop timer'
93+
- 'clear actor state'
9494
-->
9595

9696
2. Run Demo client in new terminal window
@@ -105,20 +105,20 @@ expected_stdout_lines:
105105
Expected output:
106106
```
107107
...
108-
== APP == call actor method via proxy.invoke_method()
109-
== APP == b'null'
110-
== APP == call actor method using rpc style
111-
== APP == None
112-
== APP == Actor reentrancy enabled: True
113-
== APP == call SetMyData actor method to save the state
114-
== APP == call GetMyData actor method to get the state
115-
== APP == {'data': 'new_data', 'ts': datetime.datetime(2020, 11, 13, 0, 38, 36, 163000, tzinfo=tzutc())}
116-
== APP == Register reminder
117-
== APP == Register timer
118-
== APP == waiting for 30 seconds
119-
== APP == stop reminder
120-
== APP == stop timer
121-
== APP == clear actor state
108+
call actor method via proxy.invoke_method()
109+
b'null'
110+
call actor method using rpc style
111+
None
112+
Actor reentrancy enabled: True
113+
call SetMyData actor method to save the state
114+
call GetMyData actor method to get the state
115+
{'data': 'new_data', 'ts': datetime.datetime(2020, 11, 13, 0, 38, 36, 163000, tzinfo=tzutc())}
116+
Register reminder
117+
Register timer
118+
waiting for 30 seconds
119+
stop reminder
120+
stop timer
121+
clear actor state
122122
```
123123

124124
<!-- END_STEP -->

‎examples/demo_workflow/README.md‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ pip3 install -r demo_workflow/requirements.txt
2525
<!-- STEP
2626
name: Running this example
2727
expected_stdout_lines:
28-
- "== APP == Hi Counter!"
29-
- "== APP == New counter value is: 1!"
30-
- "== APP == New counter value is: 11!"
31-
- "== APP == Retry count value is: 0!"
32-
- "== APP == Retry count value is: 1! This print statement verifies retry"
33-
- "== APP == Appending 1 to child_orchestrator_string!"
34-
- "== APP == Appending a to child_orchestrator_string!"
35-
- "== APP == Appending a to child_orchestrator_string!"
36-
- "== APP == Appending 2 to child_orchestrator_string!"
37-
- "== APP == Appending b to child_orchestrator_string!"
38-
- "== APP == Appending b to child_orchestrator_string!"
39-
- "== APP == Appending 3 to child_orchestrator_string!"
40-
- "== APP == Appending c to child_orchestrator_string!"
41-
- "== APP == Appending c to child_orchestrator_string!"
42-
- "== APP == Get response from hello_world_wf after pause call: Suspended"
43-
- "== APP == Get response from hello_world_wf after resume call: Running"
44-
- "== APP == New counter value is: 111!"
45-
- "== APP == New counter value is: 1111!"
46-
- "== APP == Instance Successfully Purged"
47-
- "== APP == Get response from hello_world_wf after terminate call: Terminated"
48-
- "== APP == Get response from child_wf after terminate call: Terminated"
49-
- "== APP == Instance Successfully Purged"
28+
- "Hi Counter!"
29+
- "New counter value is: 1!"
30+
- "New counter value is: 11!"
31+
- "Retry count value is: 0!"
32+
- "Retry count value is: 1! This print statement verifies retry"
33+
- "Appending 1 to child_orchestrator_string!"
34+
- "Appending a to child_orchestrator_string!"
35+
- "Appending a to child_orchestrator_string!"
36+
- "Appending 2 to child_orchestrator_string!"
37+
- "Appending b to child_orchestrator_string!"
38+
- "Appending b to child_orchestrator_string!"
39+
- "Appending 3 to child_orchestrator_string!"
40+
- "Appending c to child_orchestrator_string!"
41+
- "Appending c to child_orchestrator_string!"
42+
- "Get response from hello_world_wf after pause call: Suspended"
43+
- "Get response from hello_world_wf after resume call: Running"
44+
- "New counter value is: 111!"
45+
- "New counter value is: 1111!"
46+
- "Instance Successfully Purged"
47+
- "Get response from hello_world_wf after terminate call: Terminated"
48+
- "Get response from child_wf after terminate call: Terminated"
49+
- "Instance Successfully Purged"
5050
background: true
5151
timeout_seconds: 50
5252
sleep: 15
@@ -60,25 +60,25 @@ dapr run --app-id orderapp --app-protocol grpc --dapr-grpc-port 50001 --resource
6060

6161
You should be able to see the following output:
6262
```
63-
== APP == Hi Counter!
64-
== APP == New counter value is: 1!
65-
== APP == New counter value is: 11!
66-
== APP == Retry count value is: 0!
67-
== APP == Retry count value is: 1! This print statement verifies retry
68-
== APP == Appending 1 to child_orchestrator_string!
69-
== APP == Appending a to child_orchestrator_string!
70-
== APP == Appending a to child_orchestrator_string!
71-
== APP == Appending 2 to child_orchestrator_string!
72-
== APP == Appending b to child_orchestrator_string!
73-
== APP == Appending b to child_orchestrator_string!
74-
== APP == Appending 3 to child_orchestrator_string!
75-
== APP == Appending c to child_orchestrator_string!
76-
== APP == Appending c to child_orchestrator_string!
77-
== APP == Get response from hello_world_wf after pause call: Suspended
78-
== APP == Get response from hello_world_wf after resume call: Running
79-
== APP == New counter value is: 111!
80-
== APP == New counter value is: 1111!
81-
== APP == Get response from hello_world_wf after terminate call: Terminated
82-
== APP == Get response from child_wf after terminate call: Terminated
83-
== APP == Instance Successfully Purged
63+
Hi Counter!
64+
New counter value is: 1!
65+
New counter value is: 11!
66+
Retry count value is: 0!
67+
Retry count value is: 1! This print statement verifies retry
68+
Appending 1 to child_orchestrator_string!
69+
Appending a to child_orchestrator_string!
70+
Appending a to child_orchestrator_string!
71+
Appending 2 to child_orchestrator_string!
72+
Appending b to child_orchestrator_string!
73+
Appending b to child_orchestrator_string!
74+
Appending 3 to child_orchestrator_string!
75+
Appending c to child_orchestrator_string!
76+
Appending c to child_orchestrator_string!
77+
Get response from hello_world_wf after pause call: Suspended
78+
Get response from hello_world_wf after resume call: Running
79+
New counter value is: 111!
80+
New counter value is: 1111!
81+
Get response from hello_world_wf after terminate call: Terminated
82+
Get response from child_wf after terminate call: Terminated
83+
Instance Successfully Purged
8484
```

0 commit comments

Comments
 (0)