Merge branch 'release-1.15' into release-1.15-a

alicejgibbons · Jan 23, 2025 · 97476b1 · 97476b1
2 parents dcf1f9f + bc6354e
commit 97476b1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.github/env/global.env b/.github/env/global.env
@@ -1,4 +1,4 @@
-DAPR_CLI_VERSION: 1.15.0-rc.1
+DAPR_CLI_VERSION: 1.15.0-rc.2
 DAPR_RUNTIME_VERSION: 1.15.0-rc.5
 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
 DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
@@ -11,4 +11,4 @@ GOVER: 1.22
 
 KUBERNETES_VERSION: v1.32.0
 KIND_VERSION: v0.26.0
-KIND_IMAGE_SHA: sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
+KIND_IMAGE_SHA: sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
diff --git a/actors/csharp/sdk/README.md b/actors/csharp/sdk/README.md
@@ -34,7 +34,7 @@ Run the `SmartDevice.Service`, which will start service itself and the Dapr side
 <!-- STEP
 name: Run actor service
 expected_stdout_lines:
-  - "Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - 200"
+  - "Request finished HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - 200"
 expected_stderr_lines:
 working_dir: .
 output_match_mode: substring
@@ -50,14 +50,23 @@ dapr run --app-id actorservice --app-port 5001 --app-protocol http --dapr-http-p
 Expected output:
 
 ```bash
+== APP == info: Microsoft.Hosting.Lifetime[14]
+== APP ==       Now listening on: http://localhost:5001
+== APP == info: Microsoft.Hosting.Lifetime[0]
+== APP ==       Application started. Press Ctrl+C to shut down.
+== APP == info: Microsoft.Hosting.Lifetime[0]
+== APP ==       Hosting environment: Production
+== APP == info: Microsoft.Hosting.Lifetime[0]
 == APP == info: Microsoft.AspNetCore.Hosting.Diagnostics[1]
-== APP ==       Request starting HTTP/1.1 GET http://127.0.0.1:5001/healthz - -
+== APP ==       Request starting HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - application/json -
+== APP == warn: Microsoft.AspNetCore.HttpsPolicy.HttpsRedirectionMiddleware[3]
+== APP ==       Failed to determine the https port for redirect.
 == APP == info: Microsoft.AspNetCore.Routing.EndpointMiddleware[0]
-== APP ==       Executing endpoint 'Dapr Actors Health Check'
+== APP ==       Executing endpoint 'Dapr Actors Config'
 == APP == info: Microsoft.AspNetCore.Routing.EndpointMiddleware[1]
-== APP ==       Executed endpoint 'Dapr Actors Health Check'
+== APP ==       Executed endpoint 'Dapr Actors Config'
 == APP == info: Microsoft.AspNetCore.Hosting.Diagnostics[2]
-== APP ==       Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - - - 200 - text/plain 5.2599ms
+== APP ==       Request finished HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - 200 - application/json 30.6175ms
 ```
 
 ### Step 4: Run the client app

diff --git a/cryptography/python/sdk/README.md b/cryptography/python/sdk/README.md
@@ -60,7 +60,7 @@ expected_stdout_lines:
   - '== APP == Encrypted the message, got 856 bytes'
   - '== APP == Decrypted the message, got 24 bytes'
   - '== APP == The secret is "passw0rd"'
-  - '== APP == Wrote decrypted data to encrypted.out'
+  - '== APP == Wrote encrypted data to encrypted.out'
   - '== APP == Wrote decrypted data to decrypted.out.jpg'
   - "Exited App successfully"
 expected_stderr_lines:

diff --git a/cryptography/python/sdk/crypto-quickstart/requirements.txt b/cryptography/python/sdk/crypto-quickstart/requirements.txt
@@ -1,2 +1,2 @@
-dapr>=1.13.0a,<1.14.0
+dapr>=1.14
 typing-extensions
diff --git a/workflows/python/sdk/order-processor/requirements.txt b/workflows/python/sdk/order-processor/requirements.txt
@@ -1 +1,2 @@
-dapr-ext-workflow
+dapr-ext-workflow>=0.6.0rc2
+dapr>=1.15.0rc2