Merge branch 'v1.15' into cb

daprdocs/content/en/concepts/building-blocks-concept.md

@@ -22,7 +22,7 @@ Dapr provides the following building blocks:
 |----------------|----------|-------------|
 | [**Service-to-service invocation**]({{< ref "service-invocation-overview.md" >}}) | `/v1.0/invoke` | Service invocation enables applications to communicate with each other through well-known endpoints in the form of http or gRPC messages. Dapr provides an endpoint that acts as a combination of a reverse proxy with built-in service discovery, while leveraging built-in distributed tracing and error handling.
 | [**Publish and subscribe**]({{< ref "pubsub-overview.md" >}}) | `/v1.0/publish` `/v1.0/subscribe`|  Pub/Sub is a loosely coupled messaging pattern where senders (or publishers) publish messages to a topic, to which subscribers subscribe. Dapr supports the pub/sub pattern between applications.
-| [**Workflows**]({{< ref "workflow-overview.md" >}}) | `/v1.0-beta1/workflow` | The Workflow API enables you to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. The Workflow API can be combined with other Dapr API building blocks. For example, a workflow can call another service with service invocation or retrieve secrets, providing flexibility and portability. 
+| [**Workflows**]({{< ref "workflow-overview.md" >}}) | `/v1.0/workflow` | The Workflow API enables you to define long running, persistent processes or data flows that span multiple microservices using Dapr workflows or workflow components. The Workflow API can be combined with other Dapr API building blocks. For example, a workflow can call another service with service invocation or retrieve secrets, providing flexibility and portability. 
 | [**State management**]({{< ref "state-management-overview.md" >}}) | `/v1.0/state` | Application state is anything an application wants to preserve beyond a single session. Dapr provides a key/value-based state and query APIs with pluggable state stores for persistence.
 | [**Bindings**]({{< ref "bindings-overview.md" >}}) | `/v1.0/bindings` | A binding provides a bi-directional connection to an external cloud/on-premise service or system. Dapr allows you to invoke the external service through the  Dapr binding API, and it allows your application to be triggered by events sent by the connected service.
 | [**Actors**]({{< ref "actors-overview.md" >}}) | `/v1.0/actors` |  An actor is an isolated, independent unit of compute and state with single-threaded execution. Dapr provides an actor implementation based on the virtual actor pattern which provides a single-threaded programming model and where actors are garbage collected when not in use.

daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-bulk.md

@@ -336,14 +336,13 @@ Status | Description
 `RETRY` | Message to be retried by Dapr
 `DROP` | Warning is logged and message is dropped
 
-Please refer [Expected HTTP Response for Bulk Subscribe]({{< ref pubsub_api.md >}}) for further insights on response.
+Refer to [Expected HTTP Response for Bulk Subscribe]({{< ref pubsub_api.md >}}) for further insights on response.
 
 ### Example
 
-Please refer following code samples for how to use Bulk Subscribe:
-
-{{< tabs "Java" "JavaScript" ".NET" >}}
+The following code examples demonstrate how to use Bulk Subscribe.
 
+{{< tabs "Java" "JavaScript" ".NET" "Python" >}}
 {{% codetab %}}
 
 ```java
@@ -471,7 +470,50 @@ public class BulkMessageController : ControllerBase
 
 {{% /codetab %}}
 
+{{% codetab %}}
+Currently, you can only bulk subscribe in Python using an HTTP client. 
+
+```python
+import json
+from flask import Flask, request, jsonify
+
+app = Flask(__name__)
+
+@app.route('/dapr/subscribe', methods=['GET'])
+def subscribe():
+    # Define the bulk subscribe configuration
+    subscriptions = [{
+        "pubsubname": "pubsub",
+        "topic": "TOPIC_A",
+        "route": "/checkout",
+        "bulkSubscribe": {
+            "enabled": True,
+            "maxMessagesCount": 3,
+            "maxAwaitDurationMs": 40
+        }
+    }]
+    print('Dapr pub/sub is subscribed to: ' + json.dumps(subscriptions))
+    return jsonify(subscriptions)
+
+
+# Define the endpoint to handle incoming messages
+@app.route('/checkout', methods=['POST'])
+def checkout():
+    messages = request.json
+    print(messages)
+    for message in messages:
+        print(f"Received message: {message}")
+    return json.dumps({'success': True}), 200, {'ContentType': 'application/json'}
+
+if __name__ == '__main__':
+    app.run(port=5000)
+
+```
+
+{{% /codetab %}}
+
 {{< /tabs >}}
+
 ## How components handle publishing and subscribing to bulk messages
 
 For event publish/subscribe, two kinds of network transfers are involved.

daprdocs/content/en/developing-applications/building-blocks/workflow/howto-author-workflow.md

@@ -821,7 +821,7 @@ func main() {
 	ctx := context.Background()
 
 	// Start workflow test
-	respStart, err := daprClient.StartWorkflowBeta1(ctx, &client.StartWorkflowRequest{
+	respStart, err := daprClient.StartWorkflow(ctx, &client.StartWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 		WorkflowName:      "TestWorkflow",
@@ -835,7 +835,7 @@ func main() {
 	fmt.Printf("workflow started with id: %v\n", respStart.InstanceID)
 
 	// Pause workflow test
-	err = daprClient.PauseWorkflowBeta1(ctx, &client.PauseWorkflowRequest{
+	err = daprClient.PauseWorkflow(ctx, &client.PauseWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -844,7 +844,7 @@ func main() {
 		log.Fatalf("failed to pause workflow: %v", err)
 	}
 
-	respGet, err := daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err := daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -859,7 +859,7 @@ func main() {
 	fmt.Printf("workflow paused\n")
 
 	// Resume workflow test
-	err = daprClient.ResumeWorkflowBeta1(ctx, &client.ResumeWorkflowRequest{
+	err = daprClient.ResumeWorkflow(ctx, &client.ResumeWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -868,7 +868,7 @@ func main() {
 		log.Fatalf("failed to resume workflow: %v", err)
 	}
 
-	respGet, err = daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err = daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -886,7 +886,7 @@ func main() {
 
 	// Raise Event Test
 
-	err = daprClient.RaiseEventWorkflowBeta1(ctx, &client.RaiseEventWorkflowRequest{
+	err = daprClient.RaiseEventWorkflow(ctx, &client.RaiseEventWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 		EventName:         "testEvent",
@@ -904,7 +904,7 @@ func main() {
 
 	fmt.Printf("stage: %d\n", stage)
 
-	respGet, err = daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err = daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -915,15 +915,15 @@ func main() {
 	fmt.Printf("workflow status: %v\n", respGet.RuntimeStatus)
 
 	// Purge workflow test
-	err = daprClient.PurgeWorkflowBeta1(ctx, &client.PurgeWorkflowRequest{
+	err = daprClient.PurgeWorkflow(ctx, &client.PurgeWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
 	if err != nil {
 		log.Fatalf("failed to purge workflow: %v", err)
 	}
 
-	respGet, err = daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err = daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -936,7 +936,7 @@ func main() {
 	fmt.Printf("stage: %d\n", stage)
 
 	// Terminate workflow test
-	respStart, err = daprClient.StartWorkflowBeta1(ctx, &client.StartWorkflowRequest{
+	respStart, err = daprClient.StartWorkflow(ctx, &client.StartWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 		WorkflowName:      "TestWorkflow",
@@ -950,15 +950,15 @@ func main() {
 
 	fmt.Printf("workflow started with id: %s\n", respStart.InstanceID)
 
-	err = daprClient.TerminateWorkflowBeta1(ctx, &client.TerminateWorkflowRequest{
+	err = daprClient.TerminateWorkflow(ctx, &client.TerminateWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
 	if err != nil {
 		log.Fatalf("failed to terminate workflow: %v", err)
 	}
 
-	respGet, err = daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err = daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
@@ -971,12 +971,12 @@ func main() {
 
 	fmt.Println("workflow terminated")
 
-	err = daprClient.PurgeWorkflowBeta1(ctx, &client.PurgeWorkflowRequest{
+	err = daprClient.PurgeWorkflow(ctx, &client.PurgeWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})
 
-	respGet, err = daprClient.GetWorkflowBeta1(ctx, &client.GetWorkflowRequest{
+	respGet, err = daprClient.GetWorkflow(ctx, &client.GetWorkflowRequest{
 		InstanceID:        "a7a4168d-3a1c-41da-8a4f-e7f6d9c718d9",
 		WorkflowComponent: workflowComponent,
 	})

daprdocs/content/en/developing-applications/building-blocks/workflow/howto-manage-workflow.md

@@ -324,7 +324,7 @@ Manage your workflow using HTTP calls. The example below plugs in the properties
 To start your workflow with an ID `12345678`, run:
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/dapr/OrderProcessingWorkflow/start?instanceID=12345678
+POST http://localhost:3500/v1.0/workflows/dapr/OrderProcessingWorkflow/start?instanceID=12345678
 ```
 
 Note that workflow instance IDs can only contain alphanumeric characters, underscores, and dashes.
@@ -334,15 +334,15 @@ Note that workflow instance IDs can only contain alphanumeric characters, unders
 To terminate your workflow with an ID `12345678`, run:
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/dapr/12345678/terminate
+POST http://localhost:3500/v1.0/workflows/dapr/12345678/terminate
 ```
 
 ### Raise an event
 
 For workflow components that support subscribing to external events, such as the Dapr Workflow engine, you can use the following "raise event" API to deliver a named event to a specific workflow instance.
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/<workflowComponentName>/<instanceID>/raiseEvent/<eventName>
+POST http://localhost:3500/v1.0/workflows/<workflowComponentName>/<instanceID>/raiseEvent/<eventName>
 ```
 
 > An `eventName` can be any function. 
@@ -352,13 +352,13 @@ POST http://localhost:3500/v1.0-beta1/workflows/<workflowComponentName>/<instanc
 To plan for down-time, wait for inputs, and more, you can pause and then resume a workflow. To pause a workflow with an ID `12345678` until triggered to resume, run:
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/dapr/12345678/pause
+POST http://localhost:3500/v1.0/workflows/dapr/12345678/pause
 ```
 
 To resume a workflow with an ID `12345678`, run:
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/dapr/12345678/resume
+POST http://localhost:3500/v1.0/workflows/dapr/12345678/resume
 ```
 
 ### Purge a workflow 
@@ -368,15 +368,15 @@ The purge API can be used to permanently delete workflow metadata from the under
 Only workflow instances in the COMPLETED, FAILED, or TERMINATED state can be purged. If the workflow is in any other state, calling purge returns an error.
 
 ```http
-POST http://localhost:3500/v1.0-beta1/workflows/dapr/12345678/purge
+POST http://localhost:3500/v1.0/workflows/dapr/12345678/purge
 ```
 
 ### Get information about a workflow
 
 To fetch workflow information (outputs and inputs) with an ID `12345678`, run:
 
 ```http
-GET http://localhost:3500/v1.0-beta1/workflows/dapr/12345678
+GET http://localhost:3500/v1.0/workflows/dapr/12345678
 ```
 
 Learn more about these HTTP calls in the [workflow API reference guide]({{< ref workflow_api.md >}}).

daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-patterns.md

@@ -647,7 +647,7 @@ The Dapr workflow HTTP API supports the asynchronous request-reply pattern out-o
 The following `curl` commands illustrate how the workflow APIs support this pattern.
 
 ```bash
-curl -X POST http://localhost:3500/v1.0-beta1/workflows/dapr/OrderProcessingWorkflow/start?instanceID=12345678 -d '{"Name":"Paperclips","Quantity":1,"TotalCost":9.95}'
+curl -X POST http://localhost:3500/v1.0/workflows/dapr/OrderProcessingWorkflow/start?instanceID=12345678 -d '{"Name":"Paperclips","Quantity":1,"TotalCost":9.95}'
 ```
 
 The previous command will result in the following response JSON:
@@ -659,7 +659,7 @@ The previous command will result in the following response JSON:
 The HTTP client can then construct the status query URL using the workflow instance ID and poll it repeatedly until it sees the "COMPLETE", "FAILURE", or "TERMINATED" status in the payload.
 
 ```bash
-curl http://localhost:3500/v1.0-beta1/workflows/dapr/12345678
+curl http://localhost:3500/v1.0/workflows/dapr/12345678
 ```
 
 The following is an example of what an in-progress workflow status might look like.
@@ -1365,7 +1365,7 @@ func raiseEvent() {
   if err != nil {
     log.Fatalf("failed to initialize the client")
   }
-  err = daprClient.RaiseEventWorkflowBeta1(context.Background(), &client.RaiseEventWorkflowRequest{
+  err = daprClient.RaiseEventWorkflow(context.Background(), &client.RaiseEventWorkflowRequest{
     InstanceID: "instance_id",
     WorkflowComponent: "dapr",
     EventName: "approval_received",

daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md

@@ -18,7 +18,7 @@ Currently, you can experience this actors quickstart using the .NET SDK.
 As a quick overview of the .NET actors quickstart:
 
 1. Using a `SmartDevice.Service` microservice, you host:
-   - Two `SmartDectectorActor` smoke alarm objects
+   - Two `SmokeDetectorActor` smoke alarm objects
    - A `ControllerActor` object that commands and controls the smart devices  
 1. Using a `SmartDevice.Client` console app, the client app interacts with each actor, or the controller, to perform actions in aggregate. 
 1. The `SmartDevice.Interfaces` contains the shared interfaces and data types used by both the service and client apps.
@@ -119,7 +119,7 @@ If you have Zipkin configured for Dapr locally on your machine, you can view the
 
 When you ran the client app, a few things happened:
 
-1. Two `SmartDetectorActor` actors were [created in the client application](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/client/Program.cs) and initialized with object state with:
+1. Two `SmokeDetectorActor` actors were [created in the client application](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/client/Program.cs) and initialized with object state with:
    - `ActorProxy.Create<ISmartDevice>(actorId, actorType)` 
    - `proxySmartDevice.SetDataAsync(data)`  
 
@@ -177,7 +177,7 @@ When you ran the client app, a few things happened:
    Console.WriteLine($"Device 2 state: {storedDeviceData2}");
    ```
 
-1. The [`DetectSmokeAsync` method of `SmartDetectorActor 1` is called](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs#L70).
+1. The [`DetectSmokeAsync` method of `SmokeDetectorActor 1` is called](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs#L70).
 
    ```csharp
     public async Task DetectSmokeAsync()
@@ -216,7 +216,7 @@ When you ran the client app, a few things happened:
     await proxySmartDevice1.DetectSmokeAsync();   
     ```
 
-1. The [`SoundAlarm` methods](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs#L78) of `SmartDetectorActor 1` and `2` are called.
+1. The [`SoundAlarm` methods](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs#L78) of `SmokeDetectorActor 1` and `2` are called.
 
    ```csharp
    storedDeviceData1 = await proxySmartDevice1.GetDataAsync();
@@ -234,9 +234,9 @@ When you ran the client app, a few things happened:
 
 For full context of the sample, take a look at the following code:
 
-- [`SmartDetectorActor.cs`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs): Implements the smart device actors
+- [`SmokeDetectorActor.cs`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/SmokeDetectorActor.cs): Implements the smart device actors
 - [`ControllerActor.cs`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/service/ControllerActor.cs): Implements the controller actor that manages all devices
-- [`ISmartDevice`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/interfaces/ISmartDevice.cs): The method definitions and shared data types for each `SmartDetectorActor`
+- [`ISmartDevice`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/interfaces/ISmartDevice.cs): The method definitions and shared data types for each `SmokeDetectorActor`
 - [`IController`](https://github.com/dapr/quickstarts/blob/master/actors/csharp/sdk/interfaces/IController.cs): The method definitions and shared data types for the `ControllerActor`
 
 {{% /codetab %}}

daprdocs/content/en/operations/configuration/api-allowlist.md

@@ -127,7 +127,7 @@ See this list of values corresponding to the different Dapr APIs:
 | [Configuration]({{< ref configuration_api.md >}}) | `configuration` (`v1.0` and `v1.0-alpha1`) | `configuration` (`v1` and `v1alpha1`) |
 | [Distributed Lock]({{< ref distributed_lock_api.md >}}) | `lock` (`v1.0-alpha1`)<br/>`unlock` (`v1.0-alpha1`) | `lock` (`v1alpha1`)<br/>`unlock` (`v1alpha1`) |
 | [Cryptography]({{< ref cryptography_api.md >}}) | `crypto` (`v1.0-alpha1`) | `crypto` (`v1alpha1`) |
-| [Workflow]({{< ref workflow_api.md >}}) | `workflows` (`v1.0-alpha1`) |`workflows` (`v1alpha1`) |
+| [Workflow]({{< ref workflow_api.md >}}) | `workflows` (`v1.0`) |`workflows` (`v1`) |
 | [Health]({{< ref health_api.md >}}) | `healthz`  (`v1.0`) | n/a |
 | Shutdown | `shutdown` (`v1.0`) | `shutdown` (`v1`) |