Merge branch 'v1.14' into rabbitmq/single-active-consumer

.github/iac/swa/readme.md

@@ -34,16 +34,17 @@ This assumes you have an existing [user-assigned managed identity](https://learn
 
 2) Deploy using the Azure Dev CLI
 
-The first time, and any updates to this environment
-
-```bash
-azd up
-```
-
-For subsequent environments/sites, create a side-by-side environment like this:
+Start by creating a create a side-by-side azd environment:
 
 ```bash
 azd env new
+```
+
+For example, you can name the new environment something like: `dapr-docs-v1-15`.
+
+Now, deploy the Dapr docs SWA in the new azd environment using the following command:
+
+```bash
 azd up
 ```
 

daprdocs/content/en/developing-applications/building-blocks/state-management/howto-outbox.md

@@ -34,7 +34,7 @@ The outbox feature can be used with using any [transactional state store]({{< re
 Message brokers that work with the competing consumer pattern (for example, [Apache Kafka]({{< ref setup-apache-kafka>}})) are encouraged to reduce the chances of duplicate events.
 {{% /alert %}}
 
-## Usage
+## Enable the outbox pattern
 
 To enable the outbox feature, add the following required and optional fields on a state store component:
 
@@ -68,6 +68,8 @@ spec:
 | outboxPubsub        | No          | `outboxPublishPubsub`           | Sets the pub/sub component used by Dapr to coordinate the state and pub/sub transactions. If not set, the pub/sub component configured with `outboxPublishPubsub` is used. This is useful if you want to separate the pub/sub component used to send the notification state changes from the one used to coordinate the transaction
 | outboxDiscardWhenMissingState  | No         | `false`           | By setting `outboxDiscardWhenMissingState` to `true`, Dapr discards the transaction if it cannot find the state in the database and does not retry. This setting can be useful if the state store data has been deleted for any reason before Dapr was able to deliver the message and you would like Dapr to drop the items from the pub/sub and stop retrying to fetch the state
 
+## Additional configurations
+
 ### Combining outbox and non-outbox messages on the same state store
 
 If you want to use the same state store for sending both outbox and non-outbox messages, simply define two state store components that connect to the same state store, where one has the outbox feature and the other does not.
@@ -106,6 +108,157 @@ spec:
     value: "newOrder"
 ```
 
+### Shape the outbox pattern message
+
+You can override the outbox pattern message published to the pub/sub broker by setting a different message. This is done via a projected transaction payload, which is ignored, but used as the outbox pattern message published to the user topic.
+
+{{< tabs "Go SDK" HTTP >}}
+
+{{% codetab %}}
+
+<!--go-->
+
+In the following Go SDK example of a state transaction, the value of `"2"` is saved to the database, but the value of `"3"` is published to the end-user topic.
+
+```go
+ops := make([]*dapr.StateOperation, 0)
+
+op1 := &dapr.StateOperation{
+    Type: dapr.StateOperationTypeUpsert,
+    Item: &dapr.SetStateItem{
+        Key:   "key1",
+        Value: []byte("2"),
+    },
+}
+op2 := &dapr.StateOperation{
+    Type: dapr.StateOperationTypeUpsert,
+    Item: &dapr.SetStateItem{
+        Key:   "key1",
+				Value: []byte("3"),
+         // Override the data payload saved to the database 
+				Metadata: map[string]string{
+					"outbox.projection": "true",
+        },
+    },
+}
+ops = append(ops, op1, op2)
+meta := map[string]string{}
+err := testClient.ExecuteStateTransaction(ctx, store, meta, ops)
+```
+
+By setting the metadata item `"outbox.projection"` to `"true"`, the first transaction value published to the broker is ignored, while the second value is published to the configured pub/sub topic. 
+
+{{% /codetab %}}
+
+{{% codetab %}}
+
+<!--http-->
+
+You can pass the message override using the following HTTP request:
+
+```bash
+curl -X POST http://localhost:3500/v1.0/state/starwars/transaction \
+  -H "Content-Type: application/json" \
+  -d '{
+        "operations": [
+          {
+            "operation": "upsert",
+            "request": {
+              "key": "key1",
+              "value": "2"
+            }
+          },
+          {
+            "operation": "upsert",
+            "request": {
+              "key": "key1"
+              "value: "3"
+              "metadata": {
+                 "outboxProjection": "true"
+              }
+            }
+          }
+        ],
+      }'
+```
+
+By setting the metadata item `"outboxProjection"`  to `"true"`, the first transaction value published to the broker is ignored, while the second value is published to the configured pub/sub topic. 
+
+{{% /codetab %}}
+
+{{< /tabs >}}
+
+### Override Dapr-generated CloudEvent fields
+
+You can also override the [Dapr-generated CloudEvent fields]({{< ref "pubsub-cloudevents.md#dapr-generated-cloudevents-example" >}}) on the published outbox event with custom CloudEvent metadata.
+
+{{< tabs "Go SDK" HTTP >}}
+
+{{% codetab %}}
+
+<!--go-->
+
+```go
+ops := make([]*dapr.StateOperation, 0)
+
+op1 := &dapr.StateOperation{
+    Type: dapr.StateOperationTypeUpsert,
+    Item: &dapr.SetStateItem{
+        Key:   "key1",
+        Value: []byte("2"),
+        // Override the data payload saved to the database 
+        Metadata: map[string]string{
+            "id": "unique-business-process-id",
+            "source": "CustomersApp",
+            "type": "CustomerCreated",
+            "subject": "123",
+            "my-custom-ce-field": "abc",
+        },
+    },
+}
+ops = append(ops, op1, op2)
+meta := map[string]string{}
+err := testClient.ExecuteStateTransaction(ctx, store, meta, ops)
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+
+<!--http-->
+
+```bash
+curl -X POST http://localhost:3500/v1.0/state/starwars/transaction \
+  -H "Content-Type: application/json" \
+  -d '{
+        "operations": [
+          {
+            "operation": "upsert",
+            "request": {
+              "key": "key1",
+              "value": "2"
+            }
+          },
+        ],
+        "metadata": {
+          "id": "unique-business-process-id",
+          "source": "CustomersApp",
+          "type": "CustomerCreated",
+          "subject": "123",
+          "my-custom-ce-field": "abc",
+        }
+      }'
+```
+
+{{% /codetab %}}
+
+{{< /tabs >}}
+
+
+{{% alert title="Note" color="primary" %}}
+The `data` CloudEvent field is reserved for Dapr's use only, and is non-customizable.
+
+{{% /alert %}}
+
 ## Demo
 
 Watch [this video for an overview of the outbox pattern](https://youtu.be/rTovKpG0rhY?t=1338):