Merging 1.15 release branch into master

alicejgibbons · alicejgibbons · commit a70f25677a71 · 2025-03-04T14:47:49.000-06:00
Signed-off-by: Alice Gibbons &lt;alice@diagrid.io&gt;
diff --git a/.github/env/global.env b/.github/env/global.env
@@ -1,5 +1,5 @@
-DAPR_CLI_VERSION: 1.15.1
-DAPR_RUNTIME_VERSION: 1.15.1
+DAPR_CLI_VERSION: 1.15.0
+DAPR_RUNTIME_VERSION: 1.15.2
 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
 DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
 
diff --git a/bindings/python/sdk/batch/requirements.txt b/bindings/python/sdk/batch/requirements.txt
@@ -1,4 +1,4 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
 Flask
 uvicorn
 typing-extensions
diff --git a/configuration/python/sdk/order-processor/requirements.txt b/configuration/python/sdk/order-processor/requirements.txt
@@ -1,2 +1,2 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
 typing-extensions
diff --git a/conversation/python/sdk/conversation/requirements.txt b/conversation/python/sdk/conversation/requirements.txt
@@ -1 +1 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
diff --git a/cryptography/python/sdk/crypto-quickstart/requirements.txt b/cryptography/python/sdk/crypto-quickstart/requirements.txt
@@ -1,2 +1,2 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
 typing-extensions
diff --git a/jobs/csharp/http/README.md b/jobs/csharp/http/README.md
@@ -57,7 +57,7 @@ expected_stdout_lines:
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none
-background: false
+background: true
 sleep: 60
 timeout_seconds: 120
 -->
@@ -95,6 +95,18 @@ After 20 seconds, the terminal output should present the `C-3PO` job being proce
 
 <!-- END_STEP -->
 
+3. Stop and clean up application processes.
+
+<!-- STEP
+name: Stop multi-app run
+-->
+
+```bash
+dapr stop -f .
+```
+
+<!-- END_STEP -->
+
 ## Run apps individually
 
 ### Schedule Jobs
diff --git a/jobs/csharp/http/job-scheduler/Program.cs b/jobs/csharp/http/job-scheduler/Program.cs
@@ -18,8 +18,7 @@
 };
 
 var daprHost = Environment.GetEnvironmentVariable("DAPR_HOST") ?? "http://localhost";
-var schedulerDaprHttpPort = "6280";
-
+var jobServiceDaprHttpPort = "6280";
 var httpClient = new HttpClient();
 
 await Task.Delay(5000); // Wait for job-service to start
@@ -48,7 +47,7 @@
 
 async Task ScheduleJob(string jobName, object jobBody)
 {
-  var reqURL = $"{daprHost}:{schedulerDaprHttpPort}/v1.0-alpha1/jobs/{jobName}";
+  var reqURL = $"{daprHost}:{jobServiceDaprHttpPort}/v1.0-alpha1/jobs/{jobName}";
   var jsonBody = JsonSerializer.Serialize(jobBody);
   var content = new StringContent(jsonBody, Encoding.UTF8, "application/json");
 
@@ -64,8 +63,7 @@ async Task ScheduleJob(string jobName, object jobBody)
 
 async Task GetJobDetails(string jobName)
 {
-  var reqURL = $"{daprHost}:{schedulerDaprHttpPort}/v1.0-alpha1/jobs/{jobName}";
-
+  var reqURL = $"{daprHost}:{jobServiceDaprHttpPort}/v1.0-alpha1/jobs/{jobName}";
   var response = await httpClient.GetAsync(reqURL);
 
   if (!response.IsSuccessStatusCode)
diff --git a/jobs/csharp/sdk/README.md b/jobs/csharp/sdk/README.md
@@ -101,6 +101,18 @@ After 20 seconds, the terminal output should present the `C-3PO` job being proce
 
 <!-- END_STEP -->
 
+3. Stop and clean up application processes.
+
+<!-- STEP
+name: Stop multi-app run
+-->
+
+```bash
+dapr stop -f .
+```
+
+<!-- END_STEP -->
+
 ## Run apps individually
 
 ### Schedule Jobs
diff --git a/jobs/csharp/sdk/job-scheduler/Program.cs b/jobs/csharp/sdk/job-scheduler/Program.cs
@@ -26,8 +26,6 @@
   DueTime = 20
 };
 
-await Task.Delay(50);
-
 try
 {
   // Schedule R2-D2 job
diff --git a/jobs/go/http/job-scheduler/job-scheduler.go b/jobs/go/http/job-scheduler/job-scheduler.go
@@ -35,15 +35,15 @@ func main() {
 		daprHost = "http://localhost"
 	}
 
-	schedulerDaprHttpPort := "6280"
+	jobServiceDaprHttpPort := "6280"
 
 	client := http.Client{
 		Timeout: 15 * time.Second,
 	}
 
 	// Schedule a job using the Dapr Jobs API with short dueTime
 	jobName := "R2-D2"
-	reqURL := daprHost + ":" + schedulerDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
+	reqURL := daprHost + ":" + jobServiceDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
 
 	req, err := http.NewRequest("POST", reqURL, strings.NewReader(r2d2JobBody))
 	if err != nil {
@@ -71,7 +71,7 @@ func main() {
 	// Schedule a job using the Dapr Jobs API with long dueTime
 	jobName = "C-3PO"
 
-	reqURL = daprHost + ":" + schedulerDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
+	reqURL = daprHost + ":" + jobServiceDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
 
 	req, err = http.NewRequest("POST", reqURL, strings.NewReader(c3poJobBody))
 	if err != nil {
@@ -93,7 +93,7 @@ func main() {
 
 	// Gets a job using the Dapr Jobs API
 	jobName = "C-3PO"
-	reqURL = daprHost + ":" + schedulerDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
+	reqURL = daprHost + ":" + jobServiceDaprHttpPort + "/v1.0-alpha1/jobs/" + jobName
 
 	res, err = http.Get(reqURL)
 	if err != nil {
diff --git a/jobs/javascript/http/job-scheduler/index.js b/jobs/javascript/http/job-scheduler/index.js
@@ -13,7 +13,7 @@ const r2d2JobBody = {
   dueTime: "15s",
 };
 const daprHost = process.env.DAPR_HOST || "http://localhost";
-const schedulerDaprHttpPort = "6280";
+const jobServiceDaprHttpPort = "6280";
 
 async function main() {
   const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -45,7 +45,7 @@ async function main() {
 }
 
 async function scheduleJob(jobName, jobBody) {
-  const reqURL = `${daprHost}:${schedulerDaprHttpPort}/v1.0-alpha1/jobs/${jobName}`;
+  const reqURL = `${daprHost}:${jobServiceDaprHttpPort}/v1.0-alpha1/jobs/${jobName}`;
   const response = await fetch(reqURL, {
     method: "POST",
     headers: {
@@ -64,7 +64,7 @@ async function scheduleJob(jobName, jobBody) {
 }
 
 async function getJobDetails(jobName) {
-  const reqURL = `${daprHost}:${schedulerDaprHttpPort}/v1.0-alpha1/jobs/${jobName}`;
+  const reqURL = `${daprHost}:${jobServiceDaprHttpPort}/v1.0-alpha1/jobs/${jobName}`;
   const response = await fetch(reqURL, {
     method: "GET",
   });
diff --git a/jobs/python/http/README.md b/jobs/python/http/README.md
@@ -16,6 +16,11 @@ This quickstart includes two apps:
 - [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
 - [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
 
+## Environment Variables
+
+- `JOB_SERVICE_DAPR_HTTP_PORT`: The Dapr HTTP port of the job-service (default: 6280)
+- `DAPR_HOST`: The Dapr host address (default: http://localhost)
+
 ## Install dependencies
 
 <!-- STEP
diff --git a/jobs/python/http/job-scheduler/app.py b/jobs/python/http/job-scheduler/app.py
@@ -55,18 +55,18 @@ def main():
     time.sleep(5)
     
     dapr_host = os.getenv('DAPR_HOST', 'http://localhost')
-    scheduler_dapr_http_port = os.getenv('SCHEDULER_DAPR_HTTP_PORT', '6280')
+    job_service_dapr_http_port = os.getenv('JOB_SERVICE_DAPR_HTTP_PORT', '6280')
     
     # Schedule R2-D2 job
-    schedule_job(dapr_host, scheduler_dapr_http_port, "R2-D2", R2D2_JOB_BODY)
+    schedule_job(dapr_host, job_service_dapr_http_port, "R2-D2", R2D2_JOB_BODY)
     time.sleep(5)
     
     # Schedule C-3PO job
-    schedule_job(dapr_host, scheduler_dapr_http_port, "C-3PO", C3PO_JOB_BODY)
+    schedule_job(dapr_host, job_service_dapr_http_port, "C-3PO", C3PO_JOB_BODY)
     time.sleep(5)
     
     # Get C-3PO job details
-    get_job_details(dapr_host, scheduler_dapr_http_port, "C-3PO")
+    get_job_details(dapr_host, job_service_dapr_http_port, "C-3PO")
     time.sleep(5)
 
 if __name__ == "__main__":
diff --git a/pub_sub/python/http/order-processor/requirements.txt b/pub_sub/python/http/order-processor/requirements.txt
@@ -1,5 +1,5 @@
 Flask
 uvicorn
-dapr>=1.15.0rc3
+dapr>=1.15.0
 cloudevents
 werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/pub_sub/python/sdk/checkout/requirements.txt b/pub_sub/python/sdk/checkout/requirements.txt
@@ -1 +1 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
diff --git a/pub_sub/python/sdk/order-processor-fastapi/requirements.txt b/pub_sub/python/sdk/order-processor-fastapi/requirements.txt
@@ -1,5 +1,5 @@
 fastapi
-dapr-ext-fastapi>=1.15.0rc3
+dapr-ext-fastapi>=1.15.0
 cloudevents
 uvicorn
 anyio>=4.4.0 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/pub_sub/python/sdk/order-processor/requirements.txt b/pub_sub/python/sdk/order-processor/requirements.txt
@@ -1,5 +1,5 @@
 Flask
-dapr>=1.15.0rc3
+dapr>=1.15.0
 cloudevents
 uvicorn
 typing-extensions
diff --git a/secrets_management/python/sdk/order-processor/requirements.txt b/secrets_management/python/sdk/order-processor/requirements.txt
@@ -1,2 +1,2 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
 typing-extensions
diff --git a/service_invocation/python/http/order-processor/requirements.txt b/service_invocation/python/http/order-processor/requirements.txt
@@ -1,6 +1,6 @@
 Flask
 uvicorn
-dapr>=1.15.0rc3
+dapr>=1.15.0
 typing-extensions
 werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
 
diff --git a/state_management/python/sdk/order-processor/requirements.txt b/state_management/python/sdk/order-processor/requirements.txt
@@ -1,2 +1,2 @@
-dapr>=1.15.0rc3
+dapr>=1.15.0
 typing-extensions
diff --git a/workflows/csharp/sdk/README.md b/workflows/csharp/sdk/README.md
@@ -240,4 +240,4 @@ When you ran `dapr run -f .`:
 8. The `NotifyActivity` workflow activity sends a notification saying that order `571a6e25` has completed.
 9. The workflow terminates as completed and the OrderResult is set to processed.
 
-> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `RequestApprovalActivity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
+> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `RequestApprovalActivity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
diff --git a/workflows/java/sdk/README.md b/workflows/java/sdk/README.md
@@ -122,4 +122,5 @@ When you ran `dapr run -f .`:
 8. The `NotifyActivity` workflow activity sends a notification saying that order `d1bf548b-c854-44af-978e-90c61ed88e3c` has completed.
 9. The workflow terminates as completed and the orderResult is set to processed.
 
-> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `RequestApprovalActivity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
+
+> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `RequestApprovalActivity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
diff --git a/workflows/javascript/sdk/README.md b/workflows/javascript/sdk/README.md
@@ -174,4 +174,4 @@ When you ran `dapr run -f .`
 8. The `notifyActivity` workflow activity sends a notification saying that order `f5087775-779c-4e73-ac77-08edfcb375f4` has completed and processed.
 9. The workflow terminates as completed and processed.
 
-> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `requestApprovalActivity` activity nor wait for an approval event. The dapr.yaml multi-app run file starts a console application and can't accept incoming events easily. The dapr-AppWithDaprServer.yaml and dapr-AppWithExpressServer.yaml files start a service that can accept incoming events. Use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client in the server apps to send an event to the workflow.
+> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `requestApprovalActivity` activity nor wait for an approval event. The dapr.yaml multi-app run file starts a console application and can't accept incoming events easily. The dapr-AppWithDaprServer.yaml and dapr-AppWithExpressServer.yaml files start a service that can accept incoming events. Use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client in the server apps to send an event to the workflow.
diff --git a/workflows/python/sdk/README.md b/workflows/python/sdk/README.md
@@ -124,4 +124,4 @@ When you ran `dapr run -f .`
 8. The `notify_activity` workflow activity sends a notification saying that order `fc8a507e4a2246d2917d3ad4e3111240` has completed.
 9. The workflow terminates as completed and the OrderResult is set to processed.
 
-> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `request_approval_activity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
+> **Note:** This quickstart uses an OrderPayload of one car with a total cost of $5000. Since the total order cost is not over 5000, the workflow will not call the `request_approval_activity` activity nor wait for an approval event. Since the quickstart is a console application, it can't accept incoming events easily. If you want to test this scenario, convert the console app to a service and use the [raise event API](https://docs.dapr.io/reference/api/workflow_api/#raise-event-request) via HTTP/gRPC or via the Dapr Workflow client to send an event to the workflow instance.
diff --git a/workflows/python/sdk/order-processor/requirements.txt b/workflows/python/sdk/order-processor/requirements.txt
@@ -1,2 +1,2 @@
-dapr-ext-workflow>=1.15.0rc1
-dapr>=1.15.0rc3
+dapr-ext-workflow>=1.15.0
+dapr>=1.15.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-dapr>=1.15.0rc3`
	`1`	`+dapr>=1.15.0`
`2`	`2`	`Flask`
`3`	`3`	`uvicorn`
`4`	`4`	`typing-extensions`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-dapr>=1.15.0rc3`
	`1`	`+dapr>=1.15.0`
`2`	`2`	`typing-extensions`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`DueTime = 20`
`27`	`27`	`};`
`28`	`28`
`29`		`-await Task.Delay(50);`
`30`		`-`
`31`	`29`	`try`
`32`	`30`	`{`
`33`	`31`	`// Schedule R2-D2 job`