From a0bb95682d1af52b7dcde8bbd5fe69209b370f1f Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 7 May 2024 16:05:25 -0400 Subject: [PATCH 1/9] add matches example Signed-off-by: Hannah Hunter --- daprdocs/content/en/reference/api/pubsub_api.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md index 03068cc3b..1b11c7d6f 100644 --- a/daprdocs/content/en/reference/api/pubsub_api.md +++ b/daprdocs/content/en/reference/api/pubsub_api.md @@ -177,7 +177,14 @@ Example: { "pubsubname": "pubsub", "topic": "newOrder", - "route": "/orders", + "route": { + "rules": [ + { + "match": "event.type == order", + "path": "/orders" + } + ] + }, "metadata": { "rawPayload": "true" } From d7d470f4ac010c642b861dbed9617cbb5ab81902 Mon Sep 17 00:00:00 2001 From: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Date: Tue, 28 May 2024 11:56:52 -0400 Subject: [PATCH 2/9] Update daprdocs/content/en/reference/api/pubsub_api.md Co-authored-by: Mark Fussell Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> --- daprdocs/content/en/reference/api/pubsub_api.md | 1 + 1 file changed, 1 insertion(+) diff --git a/daprdocs/content/en/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md index 1b11c7d6f..02d43deaf 100644 --- a/daprdocs/content/en/reference/api/pubsub_api.md +++ b/daprdocs/content/en/reference/api/pubsub_api.md @@ -184,6 +184,7 @@ Example: "path": "/orders" } ] + default: /otherorders }, "metadata": { "rawPayload": "true" From 69e6c10aa8dce890a03ff8bfebd6ea9acea7676c Mon Sep 17 00:00:00 2001 From: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Date: Tue, 28 May 2024 11:57:04 -0400 Subject: [PATCH 3/9] Update daprdocs/content/en/reference/api/pubsub_api.md Co-authored-by: Mark Fussell Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> --- daprdocs/content/en/reference/api/pubsub_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md index 02d43deaf..9141ce9d4 100644 --- a/daprdocs/content/en/reference/api/pubsub_api.md +++ b/daprdocs/content/en/reference/api/pubsub_api.md @@ -177,7 +177,7 @@ Example: { "pubsubname": "pubsub", "topic": "newOrder", - "route": { + "routes": { "rules": [ { "match": "event.type == order", From b42185a61d287bdac7a48106a0573d9f619ed185 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 28 May 2024 12:15:42 -0400 Subject: [PATCH 4/9] mark review Signed-off-by: Hannah Hunter --- .../building-blocks/pubsub/howto-route-messages.md | 2 +- daprdocs/content/en/reference/api/pubsub_api.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index 0db19095e..d97c51b5e 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -40,7 +40,7 @@ scopes: In the programmatic approach, the `routes` structure is returned instead of `route`. The JSON structure matches the declarative YAML: -{{< tabs Python Node "C#" Go PHP>}} +{{< tabs Python JavaScript ".NET" Go PHP>}} {{% codetab %}} ```python diff --git a/daprdocs/content/en/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md index 1b11c7d6f..627ca7780 100644 --- a/daprdocs/content/en/reference/api/pubsub_api.md +++ b/daprdocs/content/en/reference/api/pubsub_api.md @@ -204,7 +204,7 @@ Parameter | Description ### Provide route(s) for Dapr to deliver topic events -In order to deliver topic events, a `POST` call will be made to user code with the route specified in the subscription response. +In order to deliver topic events, a `POST` call will be made to user code with the route specified in the subscription response. Under `routes`, you can provide [rules that match a certain condition to a specific path when a message topic is received.]({{< ref "howto-route-messages.md" >}}) You can also provide a default route for any rules that do not have a specific match. The following example illustrates this point, considering a subscription for topic `newOrder` with route `orders` on port 3000: `POST http://localhost:3000/orders` From 0cb737c5d4a8c11d89551c82633b65530035d4f4 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 28 May 2024 12:46:56 -0400 Subject: [PATCH 5/9] make tables more clear with checkmarks Signed-off-by: Hannah Hunter --- .../building-blocks/pubsub/pubsub-scopes.md | 30 +++++++++---------- .../setup-pubsub/pubsub-namespaces.md | 12 ++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md index 300724247..8c718a370 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md @@ -69,17 +69,17 @@ The table below shows which applications are allowed to publish into the topics: | | topic1 | topic2 | topic3 | |------|--------|--------|--------| -| app1 | X | | | -| app2 | | X | X | +| app1 | ✅ | | | +| app2 | | ✅ | ✅ | | app3 | | | | The table below shows which applications are allowed to subscribe to the topics: | | topic1 | topic2 | topic3 | |------|--------|--------|--------| -| app1 | X | X | X | +| app1 | ✅ | ✅ | ✅ | | app2 | | | | -| app3 | X | | | +| app3 | ✅ | | | > Note: If an application is not listed (e.g. app1 in subscriptionScopes) it is allowed to subscribe to all topics. Because `allowedTopics` is not used and app1 does not have any subscription scopes, it can also use additional topics not listed above. @@ -143,17 +143,17 @@ The table below shows which application is allowed to publish into the topics: | | A | B | C | |------|---|---|---| -| app1 | X | | | -| app2 | X | X | | -| app3 | X | X | | +| app1 | ✅ | | | +| app2 | ✅ | ✅ | | +| app3 | ✅ | ✅ | | The table below shows which application is allowed to subscribe to the topics: | | A | B | C | |------|---|---|---| | app1 | | | | -| app2 | X | | | -| app3 | X | X | | +| app2 | ✅ | | | +| app3 | ✅ | ✅ | | ## Example 4: Mark topics as protected @@ -187,17 +187,17 @@ The table below shows which application is allowed to publish into the topics: | | A | B | C | |------|---|---|---| -| app1 | X | X | | -| app2 | | X | | -| app3 | | | X | +| app1 | ✅ | ✅ | | +| app2 | | ✅ | | +| app3 | | | ✅ | The table below shows which application is allowed to subscribe to the topics: | | A | B | C | |------|---|---|---| -| app1 | X | X | | -| app2 | | X | | -| app3 | | | X | +| app1 | ✅ | ✅ | | +| app2 | | ✅ | | +| app3 | | | ✅ | ## Demo diff --git a/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md b/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md index 612d84bce..eff5f17cb 100644 --- a/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md +++ b/daprdocs/content/en/operations/components/setup-pubsub/pubsub-namespaces.md @@ -23,12 +23,12 @@ The table below shows which resources are deployed to which namespaces: | Resource | namespace-a | namespace-b | |------------------------ |-------------|-------------| -| Redis master | X | | -| Redis replicas | X | | -| Dapr's PubSub component | X | X | -| Node subscriber | X | | -| Python subscriber | X | | -| React UI publisher | | X | +| Redis master | ✅ | ❌ | +| Redis replicas | ✅ | ❌ | +| Dapr's PubSub component | ✅ | ✅ | +| Node subscriber | ✅ | ❌ | +| Python subscriber | ✅ | ❌ | +| React UI publisher | ❌ | ✅ | {{% alert title="Note" color="primary" %}} All pub/sub components support limiting pub/sub topics to specific applications using [namespace or component scopes]({{< ref pubsub-scopes.md >}}). From fa30bdfc7aec734098f670b6930c56254834d859 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 28 May 2024 13:56:35 -0400 Subject: [PATCH 6/9] update link Signed-off-by: Hannah Hunter --- daprdocs/content/en/contributing/presentations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/contributing/presentations.md b/daprdocs/content/en/contributing/presentations.md index f675510f2..034cdc4a0 100644 --- a/daprdocs/content/en/contributing/presentations.md +++ b/daprdocs/content/en/contributing/presentations.md @@ -13,7 +13,7 @@ We welcome community members giving presentations on Dapr and spreading the word {{% alert color="primary" %}} If you're using the PowerPoint template with MacOS, please install the Space Grotesk font to ensure the text is rendered properly: ```sh -brew install --cask homebrew/cask-fonts/font-space-grotesk +brew install --cask font-space-grotesk ``` {{% /alert %}} From 33387d73d4bb33356523428a87b2b5c83485329d Mon Sep 17 00:00:00 2001 From: Elena Kolevska Date: Wed, 29 May 2024 18:32:36 +0100 Subject: [PATCH 7/9] Updates to Dapr 1.13.4 Signed-off-by: Elena Kolevska --- .../content/en/operations/support/support-release-policy.md | 2 ++ daprdocs/content/en/reference/cli/dapr-init.md | 2 +- daprdocs/layouts/shortcodes/dapr-latest-version.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 46543b49f..1ad4e2b15 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -45,6 +45,7 @@ The table below shows the versions of Dapr releases that have been tested togeth | Release date | Runtime | CLI | SDKs | Dashboard | Status | Release notes | |--------------------|:--------:|:--------|---------|---------|---------|------------| +| May 29th 2024 | 1.13.4
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.4) | | May 21st 2024 | 1.13.3
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.3 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.3) | | April 3rd 2024 | 1.13.2
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.2) | | March 26th 2024 | 1.13.1
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.1) | @@ -138,6 +139,7 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h | 1.12.0 | N/A | 1.12.4 | | 1.13.0 | N/A | 1.13.2 | | 1.13.0 | N/A | 1.13.3 | +| 1.13.0 | N/A | 1.13.4 | ## Upgrade on Hosting platforms diff --git a/daprdocs/content/en/reference/cli/dapr-init.md b/daprdocs/content/en/reference/cli/dapr-init.md index 9e517cfa9..88c407059 100644 --- a/daprdocs/content/en/reference/cli/dapr-init.md +++ b/daprdocs/content/en/reference/cli/dapr-init.md @@ -74,7 +74,7 @@ dapr init -s You can also specify a specific runtime version. Be default, the latest version is used. ```bash -dapr init --runtime-version 1.13.3 +dapr init --runtime-version 1.13.4 ``` **Install with image variant** diff --git a/daprdocs/layouts/shortcodes/dapr-latest-version.html b/daprdocs/layouts/shortcodes/dapr-latest-version.html index 792017310..6aa8e1f81 100644 --- a/daprdocs/layouts/shortcodes/dapr-latest-version.html +++ b/daprdocs/layouts/shortcodes/dapr-latest-version.html @@ -1 +1 @@ -{{- if .Get "short" }}1.13{{ else if .Get "long" }}1.13.3{{ else if .Get "cli" }}1.13.3{{ else }}1.13.3{{ end -}} \ No newline at end of file +{{- if .Get "short" }}1.13{{ else if .Get "long" }}1.13.4{{ else if .Get "cli" }}1.13.4{{ else }}1.13.4{{ end -}} \ No newline at end of file From 27d995b807080d9736ba14e782bd222a9d4fe759 Mon Sep 17 00:00:00 2001 From: Elena Kolevska Date: Wed, 29 May 2024 18:37:27 +0100 Subject: [PATCH 8/9] Update daprdocs/content/en/reference/cli/dapr-init.md Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Signed-off-by: Elena Kolevska --- daprdocs/content/en/reference/cli/dapr-init.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/cli/dapr-init.md b/daprdocs/content/en/reference/cli/dapr-init.md index 88c407059..a02a04b65 100644 --- a/daprdocs/content/en/reference/cli/dapr-init.md +++ b/daprdocs/content/en/reference/cli/dapr-init.md @@ -71,7 +71,7 @@ dapr init -s **Specify a runtime version** -You can also specify a specific runtime version. Be default, the latest version is used. +You can also specify a specific runtime version. By default, the latest version is used. ```bash dapr init --runtime-version 1.13.4 From 622fb20a8f2cd669131bb4dc5bb5214a98d58813 Mon Sep 17 00:00:00 2001 From: Mark Fussell Date: Wed, 29 May 2024 22:08:18 +0100 Subject: [PATCH 9/9] Update daprdocs/content/en/reference/api/pubsub_api.md Signed-off-by: Mark Fussell --- daprdocs/content/en/reference/api/pubsub_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md index 9c24e076c..10ff51a49 100644 --- a/daprdocs/content/en/reference/api/pubsub_api.md +++ b/daprdocs/content/en/reference/api/pubsub_api.md @@ -184,7 +184,7 @@ Example: "path": "/orders" } ] - default: /otherorders + "default" : "/otherorders" }, "metadata": { "rawPayload": "true"