Merge pull request #3450 from hhunter-ms/upmerge_05-24

Upmerge 5/24

.github/workflows/website-root.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           fetch-depth: 0
@@ -23,22 +23,19 @@ jobs:
         run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
       - name: Build And Deploy
         id: builddeploy
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
+        uses: Azure/static-web-apps-deploy@v1
         env:
           HUGO_ENV: production
           HUGO_VERSION: "0.100.2"
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           skip_deploy_on_missing_secrets: true
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           action: "upload"
-          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          app_location: "/daprdocs"
-          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_build_command: "git config --global --add safe.directory /github/workspace && hugo"
-          app_location: "/daprdocs" # App source code path
+          output_location: "public"
-          api_location: "api" # Api source code path - optional
+          skip_api_build: true
-          output_location: "public" # Built app content directory - optional
-          app_build_command: "hugo"
-          ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
@@ -47,8 +44,7 @@ jobs:
     steps:
       - name: Close Pull Request
         id: closepullrequest
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
+        uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          skip_deploy_on_missing_secrets: true
           action: "close"

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

@@ -477,9 +477,15 @@ Some pub/sub brokers support sending and receiving multiple messages in a single
 
 For components that do not have bulk publish or subscribe support, Dapr runtime uses the regular publish and subscribe APIs to send and receive messages one by one. This is still more efficient than directly using the regular publish or subscribe APIs, because applications can still send/receive multiple messages in a single request to/from Dapr.
 
-## Watch the demo
+## Demos
 
-Watch [this video for an demo on bulk pub/sub](https://youtu.be/BxiKpEmchgQ?t=1170):
+Watch the following demos and presentations about bulk pub/sub.
+
+### [KubeCon Europe 2023 presentation](https://youtu.be/WMBAo-UNg6o)
+
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/WMBAo-UNg6o" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+### [Dapr Community Call #77 presentation](https://youtu.be/BxiKpEmchgQ?t=1170)
 
 <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/BxiKpEmchgQ?start=1170" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 

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

@@ -11,22 +11,26 @@ To enable message routing and provide additional context with each message, Dapr
 Dapr uses CloudEvents to provide additional context to the event payload, enabling features like:
 
 - Tracing
-- Deduplication by message Id
 - Content-type for proper deserialization of event data
+- Verification of sender application
 
 ## CloudEvents example
 
-Dapr implements the following CloudEvents fields when creating a message topic.
+A publish operation to Dapr results in a cloud event envelope containing the following fields:
 
 - `id`
 - `source`
 - `specversion`
 - `type`
 - `traceparent`
+- `traceid`
+- `tracestate`
+- `topic`
+- `pubsubname`
 - `time`
 - `datacontenttype` (optional)
 
-The following example demonstrates an `orders` topic message sent by Dapr that includes a W3C `traceid` unique to the message, the `data` and the fields for the CloudEvent where the data content is serialized as JSON.
+The following example demonstrates a cloud event generated by Dapr for a publish operation to the `orders` topic that includes a W3C `traceid` unique to the message, the `data` and the fields for the CloudEvent where the data content is serialized as JSON.
 
 ```json
 {
@@ -65,6 +69,19 @@ As another example of a v1.0 CloudEvent, the following shows data as XML content
 ## Publish your own CloudEvent
 
 If you want to use your own CloudEvent, make sure to specify the [`datacontenttype`]({{< ref "pubsub-overview.md#setting-message-content-types" >}}) as `application/cloudevents+json`.
+If the CloudEvent that was authored by the app does not contain the [minimum required fields](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#required-attributes) in the CloudEvent specification, the message is rejected. Dapr adds the following fields to the CloudEvent if they are missing:
+
+- `time`
+- `traceid`
+- `traceparent`
+- `tracestate`
+- `topic`
+- `pubsubname`
+- `source`
+- `type`
+- `specversion`
+
+You can add additional fields to a custom CloudEvent that are not part of the official CloudEvent specification. Dapr will pass these fields as-is.
 
 ### Example
 
@@ -102,6 +119,10 @@ Invoke-RestMethod -Method Post -ContentType 'application/cloudevents+json' -Body
 
 {{< /tabs >}}
 
+## Event deduplication
+
+When using cloud events created by Dapr, the envelope contains an `id` field which can be used by the app to perform message deduplication. Dapr does not handle deduplication automatically. Dapr supports using message brokers that natively enable message deduplication.
+
 ## Next steps
 
 - Learn why you might [not want to use CloudEvents]({{< ref pubsub-raw.md >}})

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

@@ -180,12 +180,12 @@ The `order-processor` service writes, reads, and deletes an `orderId` key/value
 const client = new DaprClient()
 
 // Save state into a state store
-await client.state.save(DAPR_STATE_STORE_NAME, state)
+await client.state.save(DAPR_STATE_STORE_NAME, order)
 console.log("Saving Order: ", order)
 
 // Get state from a state store
 const savedOrder = await client.state.get(DAPR_STATE_STORE_NAME, order.orderId)
-console.log("Getting Order: ", savedOrd)
+console.log("Getting Order: ", savedOrder)
 
 // Delete state from the state store
 await client.state.delete(DAPR_STATE_STORE_NAME, order.orderId)

daprdocs/content/en/operations/support/support-release-policy.md

@@ -34,6 +34,8 @@ The table below shows the versions of Dapr releases that have been tested togeth
 
 | Release date | Runtime     | CLI  | SDKs  | Dashboard  | Status |
 |--------------------|:--------:|:--------|---------|---------|---------|
+| May 15th 2023 | 1.10.7</br>  | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported (current) |
+| May 12th 2023 | 1.10.6</br>  | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported (current) |
 | April 13 2023 |1.10.5</br>  | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported (current) |
 | March 16 2023 | 1.10.4</br>  | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported |
 | March 14 2023 | 1.10.3</br>  | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported |
@@ -92,17 +94,17 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
 |                          |                 1.6.2 |                    1.7.5 |
 |                          |                 1.7.5 |                    1.8.6 |
 |                          |                 1.8.6 |                    1.9.6 |
-|                          |                 1.9.6 |                   1.10.5 |
+|                          |                 1.9.6 |                   1.10.7 |
 | 1.6.0 to 1.6.2           |                   N/A |                    1.7.5 |
 |                          |                 1.7.5 |                    1.8.6 |
 |                          |                 1.8.6 |                    1.9.6 |
-|                          |                 1.9.6 |                   1.10.5 |
+|                          |                 1.9.6 |                   1.10.7 |
 | 1.7.0 to 1.7.5           |                   N/A |                    1.8.6 |
 |                          |                 1.8.6 |                    1.9.6 |
-|                          |                 1.9.6 |                   1.10.5 |
+|                          |                 1.9.6 |                   1.10.7 |
 | 1.8.0 to 1.8.6           |                   N/A |                    1.9.6 |
 | 1.9.0                    |                   N/A |                    1.9.6 |
-| 1.10.0                   |                   N/A |                   1.10.5 |
+| 1.10.0                   |                   N/A |                   1.10.7 |
 
 ## Breaking changes and deprecations
 

daprdocs/layouts/shortcodes/dapr-latest-version.html

@@ -1 +1 @@
-{{- if .Get "short" }}1.10{{ else if .Get "long" }}1.10.5{{ else if .Get "cli" }}1.10.0{{ else }}1.10.5{{ end -}}
+{{- if .Get "short" }}1.10{{ else if .Get "long" }}1.10.7{{ else if .Get "cli" }}1.10.0{{ else }}1.10.7{{ end -}}