From a2ba9ab5af041e4f34bf0f34fdd6344a8fb93be2 Mon Sep 17 00:00:00 2001 From: salaboy Date: Tue, 9 Jul 2024 09:25:50 +0100 Subject: [PATCH 01/10] upgrade pre-req to JDK 17 Signed-off-by: salaboy --- .../en/getting-started/quickstarts/bindings-quickstart.md | 2 +- .../quickstarts/configuration-quickstart.md | 2 +- .../en/getting-started/quickstarts/pubsub-quickstart.md | 2 +- .../resiliency/resiliency-serviceinvo-quickstart.md | 2 +- .../quickstarts/resiliency/resiliency-state-quickstart.md | 2 +- .../en/getting-started/quickstarts/secrets-quickstart.md | 2 +- .../quickstarts/serviceinvocation-quickstart.md | 4 ++-- .../quickstarts/statemanagement-quickstart.md | 4 ++-- .../en/getting-started/quickstarts/workflow-quickstart.md | 8 ++++---- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md index 4e40a5159..4597228b7 100644 --- a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md @@ -651,7 +651,7 @@ In the YAML file: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md index a9c563ba1..368a1bd5c 100644 --- a/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md @@ -389,7 +389,7 @@ try For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md index 82d588442..3b232f995 100644 --- a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md @@ -512,7 +512,7 @@ Console.WriteLine("Published data: " + order); For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md index 92f926107..9e5fe6983 100644 --- a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md @@ -693,7 +693,7 @@ dapr run --app-port 7001 --app-id order-processor --app-protocol http --dapr-htt For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md index 8a35d2442..b47ed6237 100644 --- a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md @@ -533,7 +533,7 @@ INFO[0036] Recovered processing operation component[statestore] output. For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md index de12598d2..9d1187e97 100644 --- a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md @@ -356,7 +356,7 @@ Order-processor output: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md index 0164e35fd..ada18093d 100644 --- a/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md @@ -458,7 +458,7 @@ var response = await client.PostAsync($"{baseURL}/orders", content); For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. @@ -1156,7 +1156,7 @@ Dapr invokes an application on any Dapr instance. In the code, the sidecar progr For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md index a0448f0d3..95357c4eb 100644 --- a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md @@ -419,7 +419,7 @@ In the YAML file: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. @@ -1050,7 +1050,7 @@ In the YAML file: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. diff --git a/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md index 8e1adb0c5..8f5a887f9 100644 --- a/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md @@ -746,10 +746,10 @@ The `order-processor` console app starts and manages the lifecycle of an order p For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): - - [Microsoft JDK 11](https://docs.microsoft.com/java/openjdk/download#openjdk-11) - - [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11) - - [OpenJDK 11](https://jdk.java.net/11/) +- Java JDK 17 (or greater): + - [Microsoft JDK 17](https://docs.microsoft.com/java/openjdk/download#openjdk-17) + - [Oracle JDK 17](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK17) + - [OpenJDK 17](https://jdk.java.net/17/) - [Apache Maven](https://maven.apache.org/install.html) version 3.x. - [Docker Desktop](https://www.docker.com/products/docker-desktop) From a6dca4c74379817ac3fecedc3ddf37413436fd5a Mon Sep 17 00:00:00 2001 From: salaboy Date: Tue, 9 Jul 2024 09:42:35 +0100 Subject: [PATCH 02/10] adding pubsub Signed-off-by: salaboy --- .../content/en/getting-started/quickstarts/pubsub-quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md index 3b232f995..abb1293fa 100644 --- a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md @@ -1321,7 +1321,7 @@ In the YAML file: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- Java JDK 11 (or greater): +- Java JDK 17 (or greater): - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - OpenJDK - [Apache Maven](https://maven.apache.org/install.html), version 3.x. From 6ba580a0d3068d15b5fed9dbd9e2dcb5a8d14bdd Mon Sep 17 00:00:00 2001 From: Jakub Bartkowiak Date: Tue, 23 Jul 2024 10:54:09 +0200 Subject: [PATCH 03/10] Update install-dapr-cli.md Add a note that Docker Desktop's advanced options section is not visible when WSL integration is enabled. Signed-off-by: Jakub Bartkowiak --- daprdocs/content/en/getting-started/install-dapr-cli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/install-dapr-cli.md b/daprdocs/content/en/getting-started/install-dapr-cli.md index 21f179689..7ab5149ce 100644 --- a/daprdocs/content/en/getting-started/install-dapr-cli.md +++ b/daprdocs/content/en/getting-started/install-dapr-cli.md @@ -16,7 +16,7 @@ You'll use the Dapr CLI as the main tool for various Dapr-related tasks. You can The Dapr CLI works with both [self-hosted]({{< ref self-hosted >}}) and [Kubernetes]({{< ref Kubernetes >}}) environments. {{% alert title="Before you begin" color="primary" %}} -In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. +In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. This option is not available if your are using WSL integration on Windows. {{% /alert %}} From 04d786afbab2b1bc4ea4f407ad7cecf9117e24bf Mon Sep 17 00:00:00 2001 From: Jakub Bartkowiak Date: Tue, 23 Jul 2024 15:12:15 +0200 Subject: [PATCH 04/10] Update daprdocs/content/en/getting-started/install-dapr-cli.md Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Signed-off-by: Jakub Bartkowiak --- daprdocs/content/en/getting-started/install-dapr-cli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/install-dapr-cli.md b/daprdocs/content/en/getting-started/install-dapr-cli.md index 7ab5149ce..da8dee54e 100644 --- a/daprdocs/content/en/getting-started/install-dapr-cli.md +++ b/daprdocs/content/en/getting-started/install-dapr-cli.md @@ -16,7 +16,7 @@ You'll use the Dapr CLI as the main tool for various Dapr-related tasks. You can The Dapr CLI works with both [self-hosted]({{< ref self-hosted >}}) and [Kubernetes]({{< ref Kubernetes >}}) environments. {{% alert title="Before you begin" color="primary" %}} -In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. This option is not available if your are using WSL integration on Windows. +In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. This option is not available if you are using WSL integration on Windows. {{% /alert %}} From 298a2ce4d88de319bc6fa44c8ecd8bd4cbdb0bf7 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 30 Jul 2024 13:56:50 -0400 Subject: [PATCH 05/10] link to specific language in quickstarts repo Signed-off-by: Hannah Hunter --- .../quickstarts/actors-quickstart.md | 2 +- .../quickstarts/bindings-quickstart.md | 10 +++++----- .../quickstarts/configuration-quickstart.md | 14 ++++++------- .../quickstarts/cryptography-quickstart.md | 4 ++-- .../quickstarts/jobs-quickstart.md | 2 +- .../quickstarts/pubsub-quickstart.md | 20 +++++++++---------- .../resiliency-serviceinvo-quickstart.md | 10 +++++----- .../resiliency/resiliency-state-quickstart.md | 10 +++++----- .../quickstarts/secrets-quickstart.md | 10 +++++----- .../serviceinvocation-quickstart.md | 10 +++++----- .../quickstarts/statemanagement-quickstart.md | 20 +++++++++---------- .../quickstarts/workflow-quickstart.md | 10 +++++----- 12 files changed, 61 insertions(+), 61 deletions(-) diff --git a/daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md index ab1d89d00..a412cc014 100644 --- a/daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/actors-quickstart.md @@ -37,7 +37,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/actors). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/actors/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md index 4e40a5159..9c234528a 100644 --- a/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md @@ -33,7 +33,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -244,7 +244,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -450,7 +450,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -661,7 +661,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -872,7 +872,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/bindings/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md index a9c563ba1..0b37d528a 100644 --- a/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md @@ -35,7 +35,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -151,14 +151,14 @@ if unsubscribed == True: For this example, you will need: - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). -- [Python 3.7+ installed](https://www.python.org/downloads/). - +- [Latest Node.js installed](https://nodejs.org/download/). + - [Docker Desktop](https://www.docker.com/products/docker-desktop) ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -279,7 +279,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -399,7 +399,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -514,7 +514,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/configuration/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/cryptography-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/cryptography-quickstart.md index 8959672d0..76ace1305 100644 --- a/daprdocs/content/en/getting-started/quickstarts/cryptography-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/cryptography-quickstart.md @@ -43,7 +43,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/cryptography) +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/cryptography/javascript/sdk) ```bash git clone https://github.com/dapr/quickstarts.git @@ -245,7 +245,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/cryptography) +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/cryptography/go/sdk) ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/jobs-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/jobs-quickstart.md index 963105186..8b52eedb1 100644 --- a/daprdocs/content/en/getting-started/quickstarts/jobs-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/jobs-quickstart.md @@ -43,7 +43,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/jobs). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/jobs/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md index 82d588442..c8fae336f 100644 --- a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md @@ -39,7 +39,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -217,7 +217,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -365,7 +365,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -522,7 +522,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -683,7 +683,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -843,7 +843,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1017,7 +1017,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1175,7 +1175,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1331,7 +1331,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1493,7 +1493,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/pub_sub/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md index 92f926107..b2628e6bd 100644 --- a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md @@ -32,7 +32,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/python/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -238,7 +238,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/javascript/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -468,7 +468,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/csharp/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -703,7 +703,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/java/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -933,7 +933,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/go/http). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md index 674cb5dae..470807093 100644 --- a/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md @@ -32,7 +32,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/resiliency). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -203,7 +203,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/resiliency). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -372,7 +372,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/resiliency). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -544,7 +544,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/resiliency). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -712,7 +712,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/resiliency). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md index de12598d2..12afadacc 100644 --- a/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md @@ -32,7 +32,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -141,7 +141,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management). +Clone the [sample provided in the Quickstarts repo](hhttps://github.com/dapr/quickstarts/tree/master/secrets_management/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -254,7 +254,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -366,7 +366,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -471,7 +471,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/secrets_management/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md index 0164e35fd..67d08db2a 100644 --- a/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md @@ -36,7 +36,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/python/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -182,7 +182,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/javascript/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -322,7 +322,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/csharp/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -468,7 +468,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/java/http). ```bash git clone https://github.com/dapr/quickstarts.git @@ -606,7 +606,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/service_invocation/go/http). ```bash diff --git a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md index a0448f0d3..8e2a7d592 100644 --- a/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md @@ -34,7 +34,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -163,7 +163,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -295,7 +295,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -429,7 +429,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -562,7 +562,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](hhttps://github.com/dapr/quickstarts/tree/master/state_management/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -702,7 +702,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -818,7 +818,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -940,7 +940,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1060,7 +1060,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1179,7 +1179,7 @@ For this example, you will need: ### Step 1: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/state_management/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git diff --git a/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md index f99d0ebd1..0129fabba 100644 --- a/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md @@ -48,7 +48,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows/python/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -290,7 +290,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows/javascript/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -509,7 +509,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows/csharp/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -761,7 +761,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows/java/sdk). ```bash git clone https://github.com/dapr/quickstarts.git @@ -1100,7 +1100,7 @@ For this example, you will need: ### Step 2: Set up the environment -Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows). +Clone the [sample provided in the Quickstarts repo](https://github.com/dapr/quickstarts/tree/master/workflows/go/sdk). ```bash git clone https://github.com/dapr/quickstarts.git From a633c9c3edc7b0075d6181dd53b187ff5dd9c820 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Wed, 31 Jul 2024 10:14:20 -0400 Subject: [PATCH 06/10] fix broken links Signed-off-by: Hannah Hunter --- .../building-blocks/jobs/jobs-overview.md | 2 +- .../en/operations/observability/metrics/metrics-overview.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/jobs/jobs-overview.md b/daprdocs/content/en/developing-applications/building-blocks/jobs/jobs-overview.md index b4d5214eb..24ebf808b 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/jobs/jobs-overview.md +++ b/daprdocs/content/en/developing-applications/building-blocks/jobs/jobs-overview.md @@ -32,7 +32,7 @@ The jobs API is a job scheduler, not the executor which runs the job. The design All job details and user-associated data for scheduled jobs are stored in an embedded Etcd database in the Scheduler service. You can use jobs to: -- **Delay your [pub/sub messaging]({<< ref pubsub-overview.md >>}).** You can publish a message in a future specific time (for example: a week from today, or a specific UTC date/time). +- **Delay your [pub/sub messaging]({{< ref pubsub-overview.md >}}).** You can publish a message in a future specific time (for example: a week from today, or a specific UTC date/time). - **Schedule [service invocation]({{< ref service-invocation-overview.md >}}) method calls between applications.** ## Scenarios diff --git a/daprdocs/content/en/operations/observability/metrics/metrics-overview.md b/daprdocs/content/en/operations/observability/metrics/metrics-overview.md index cc7e606d3..5f07bb325 100644 --- a/daprdocs/content/en/operations/observability/metrics/metrics-overview.md +++ b/daprdocs/content/en/operations/observability/metrics/metrics-overview.md @@ -74,7 +74,7 @@ spec: When invoking Dapr using HTTP, metrics are created for each requested method by default. This can result in a high number of metrics, known as high cardinality, which can impact memory usage and CPU. -Path matching allows you to manage and control the cardinality of HTTP metrics in Dapr. This is an aggregation of metrics, so rather than having a metric for each event, you can reduce the number of metrics events and report an overall number. For details on how to set the cardinality in configuration see ({{< ref "configuration-overview.md#metrics" >}}) +Path matching allows you to manage and control the cardinality of HTTP metrics in Dapr. This is an aggregation of metrics, so rather than having a metric for each event, you can reduce the number of metrics events and report an overall number. [Learn more about how to set the cardinality in configuration]({{< ref "configuration-overview.md#metrics" >}}). This configuration is opt-in and is enabled via the Dapr configuration `spec.metrics.http.pathMatching`. When defined, it enables path matching, which standardizes specified paths for both metrics paths. This reduces the number of unique metrics paths, making metrics more manageable and reducing resource consumption in a controlled way. From 8d7ff41381bd8dbb5a26e6b2ae52f52d1cbd1794 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Wed, 31 Jul 2024 10:25:12 -0400 Subject: [PATCH 07/10] remove GA features from preview table Signed-off-by: Hannah Hunter --- .../content/en/operations/support/support-preview-features.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-preview-features.md b/daprdocs/content/en/operations/support/support-preview-features.md index 61701dec8..943b35d0e 100644 --- a/daprdocs/content/en/operations/support/support-preview-features.md +++ b/daprdocs/content/en/operations/support/support-preview-features.md @@ -19,9 +19,7 @@ For CLI there is no explicit opt-in, just the version that this was first made a | **Multi-App Run for Kubernetes** | Configure multiple Dapr applications from a single configuration file and run from a single command on Kubernetes | `dapr run -k -f` | [Multi-App Run]({{< ref multi-app-dapr-run.md >}}) | v1.12 | | **Workflows** | Author workflows as code to automate and orchestrate tasks within your application, like messaging, state management, and failure handling | N/A | [Workflows concept]({{< ref "components-concept#workflows" >}})| v1.10 | | **Cryptography** | Encrypt or decrypt data without having to manage secrets keys | N/A | [Cryptography concept]({{< ref "components-concept#cryptography" >}})| v1.11 | -| **Service invocation for non-Dapr endpoints** | Allow the invocation of non-Dapr endpoints by Dapr using the [Service invocation API]({{< ref service_invocation_api.md >}}). Read ["How-To: Invoke Non-Dapr Endpoints using HTTP"]({{< ref howto-invoke-non-dapr-endpoints.md >}}) for more information. | N/A | [Service invocation API]({{< ref service_invocation_api.md >}}) | v1.11 | | **Actor State TTL** | Allow actors to save records to state stores with Time To Live (TTL) set to automatically clean up old data. In its current implementation, actor state with TTL may not be reflected correctly by clients, read [Actor State Transactions]({{< ref actors_api.md >}}) for more information. | `ActorStateTTL` | [Actor State Transactions]({{< ref actors_api.md >}}) | v1.11 | -| **Transactional Outbox** | Allows state operations for inserts and updates to be published to a configured pub/sub topic using a single transaction across the state store and the pub/sub | N/A | [Transactional Outbox Feature]({{< ref howto-outbox.md >}}) | v1.12 | | **Component Hot Reloading** | Allows for Dapr-loaded components to be "hot reloaded". A component spec is reloaded when it is created/updated/deleted in Kubernetes or on file when running in self-hosted mode. Ignores changes to actor state stores and workflow backends. | `HotReload`| [Hot Reloading]({{< ref components-concept.md >}}) | v1.13 | | **Subscription Hot Reloading** | Allows for declarative subscriptions to be "hot reloaded". A subscription is reloaded either when it is created/updated/deleted in Kubernetes, or on file in self-hosted mode. In-flight messages are unaffected when reloading. | `HotReload`| [Hot Reloading]({{< ref "subscription-methods.md#declarative-subscriptions" >}}) | v1.14 | | **Job actor reminders** | Whilst the [Scheduler service]({{< ref "concepts/dapr-services/scheduler.md" >}}) is deployed by default, job actor reminders (used for scheduling actor reminders) are enabled through a preview feature and needs a feature flag. | `SchedulerReminders`| [Job actor reminders]({{< ref "jobs-overview.md#actor-reminders" >}}) | v1.14 | From 1d8fd27588dede5a309ea525b587be6d7715ac63 Mon Sep 17 00:00:00 2001 From: Arhell Date: Thu, 1 Aug 2024 00:42:13 +0300 Subject: [PATCH 08/10] update concepts folder link Signed-off-by: Arhell --- daprdocs/content/en/concepts/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/concepts/overview.md b/daprdocs/content/en/concepts/overview.md index 63c173890..db19e3929 100644 --- a/daprdocs/content/en/concepts/overview.md +++ b/daprdocs/content/en/concepts/overview.md @@ -138,7 +138,7 @@ Dapr can be used from any developer framework. Here are some that have been inte | [.NET]({{< ref dotnet >}}) | [ASP.NET Core](https://github.com/dapr/dotnet-sdk/tree/master/examples/AspNetCore) | Brings stateful routing controllers that respond to pub/sub events from other services. Can also take advantage of [ASP.NET Core gRPC Services](https://docs.microsoft.com/aspnet/core/grpc/). | [Java]({{< ref java >}}) | [Spring Boot](https://spring.io/) | Build Spring boot applications with Dapr APIs | [Python]({{< ref python >}}) | [Flask]({{< ref python-flask.md >}}) | Build Flask applications with Dapr APIs -| [JavaScript](https://github.com/dapr/js-sdk) | [Express](http://expressjs.com/) | Build Express applications with Dapr APIs +| [JavaScript](https://github.com/dapr/js-sdk) | [Express](https://expressjs.com/) | Build Express applications with Dapr APIs | [PHP]({{< ref php >}}) | | You can serve with Apache, Nginx, or Caddyserver. #### Integrations and extensions From a97270747400fa6a17e9df0f133320b0712313ce Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Thu, 1 Aug 2024 12:08:32 -0400 Subject: [PATCH 09/10] remove claim that workflow can use trace context Signed-off-by: Hannah Hunter --- .../building-blocks/workflow/workflow-architecture.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-architecture.md b/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-architecture.md index da44ff6dc..06269e0ad 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-architecture.md +++ b/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-architecture.md @@ -51,7 +51,9 @@ If you're familiar with Dapr actors, you may notice a few differences in terms o The `durabletask-go` core used by the workflow engine writes distributed traces using Open Telemetry SDKs. These traces are captured automatically by the Dapr sidecar and exported to the configured Open Telemetry provider, such as Zipkin. -Each workflow instance managed by the engine is represented as one or more spans. There is a single parent span representing the full workflow execution and child spans for the various tasks, including spans for activity task execution and durable timers. Workflow activity code also has access to the trace context, allowing distributed trace context to flow to external services that are invoked by the workflow. +Each workflow instance managed by the engine is represented as one or more spans. There is a single parent span representing the full workflow execution and child spans for the various tasks, including spans for activity task execution and durable timers. + +> Workflow activity code currently **does not** have access to the trace context. ## Internal workflow actors From d0eff4ec48cff2464da3c68828334f0044e3f232 Mon Sep 17 00:00:00 2001 From: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Date: Fri, 2 Aug 2024 10:30:28 -0400 Subject: [PATCH 10/10] Updates to the maintainer contributing guide (#4291) * update steps for creating new docs site Signed-off-by: Hannah Hunter * Update daprdocs/content/en/contributing/docs-contrib/maintainer-guide.md Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> --------- Signed-off-by: Hannah Hunter Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Co-authored-by: Yaron Schneider --- .../docs-contrib/maintainer-guide.md | 165 ++++++++++-------- 1 file changed, 95 insertions(+), 70 deletions(-) diff --git a/daprdocs/content/en/contributing/docs-contrib/maintainer-guide.md b/daprdocs/content/en/contributing/docs-contrib/maintainer-guide.md index 15891b3e0..bc8a0233c 100644 --- a/daprdocs/content/en/contributing/docs-contrib/maintainer-guide.md +++ b/daprdocs/content/en/contributing/docs-contrib/maintainer-guide.md @@ -83,6 +83,7 @@ After upmerge, prepare the docs branches for the release. In two separate PRs, y - Archive the latest release. - Bring the preview/release branch as the current, live version of the docs. +- Create a new preview branch. #### Latest release @@ -193,79 +194,24 @@ These steps will prepare the upcoming release branch for promotion to latest rel | [v1.2](https://github.com/dapr/docs/tree/v1.2) (pre-release) | https://v1-2.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.2+ go here. | ``` -1. In VS Code, search for any `v1.0` references and replace them with `v1.1` as applicable. +1. Update the `dapr-latest-version.html` shortcode partial to the new minor/patch version (in this example, `1.1.0` and `1.1`). 1. Commit the staged changes and push to your branch (`release_v1.1`). 1. Open a PR from `release/v1.1` to `v1.1`. 1. Have a docs maintainer or approver review. Wait to merge the PR until release. -### Create new website for future release +#### Future preview branch -Next, create a new website for the future Dapr release, which you point to from the latest website. To do this, you'll need to: +##### Create preview branch -- Deploy an Azure Static Web App. -- Configure DNS via request from CNCF. +1. In GitHub UI, select the branch drop-down menu and select **View all branches**. +1. Click **New branch**. +1. In **New branch name**, enter the preview branch version number. In this example, it would be `v1.2`. +1. Select **v1.1** as the source. +1. Click **Create new branch**. -These steps require authentication. +##### Configure preview branch -#### Deploy Azure Static Web App - -Deploy a new Azure Static Web App for the future Dapr release. For this example, we use v1.2 as the future release. - -{{% alert title="Important" color="primary" %}} -You need Microsoft employee access to create a new Azure Static Web App. -{{% /alert %}} - -1. Use Azure PIM to [elevate into the Owner role](https://eng.ms/docs/cloud-ai-platform/devdiv/devdiv-azure-service-dmitryr/azure-devex-philon/dapr/dapr/assets/azure) for the Dapr Prod subscription. -1. Navigate to the [docs-website](https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/38875a89-0178-4f27-a141-dc6fc01f183d/resourceGroups/docs-website/overview) resource group. -1. Select **+ Create** and search for **Static Web App**. Select **Create**. -1. Enter in the following information: - - Subscription: `Dapr Prod` - - Resource Group: `docs-website` - - Name: `daprdocs-v1-2` - - Hosting Plan: `Free` - - Region: `West US 2` - - Source: `Other` -1. Select **Review + create**, and then deploy the static web app. -1. Wait for deployment, and navigate to the new static web app resource. -1. Select **Manage deployment token** and copy the value. -1. Navigate to the docs repo **Secrets management** page under **Settings** and create a new secret named `AZURE_STATIC_WEB_APPS_V1_2`, and provide the value of the deployment token. - -#### Configure DNS - -{{% alert title="Important" color="primary" %}} - This section can only be completed on a Secure Admin Workstation (SAW). If you do not have a SAW device, ask a team member with one to assist. - -{{% /alert %}} - -1. Ensure you are a member of the `DMAdaprweb` security group in IDWeb. -1. Navigate to [https://prod.msftdomains.com/dns/form?environment=0](https://prod.msftdomains.com/dns/form?environment=0) on a SAW -1. Enter the following details in the left-hand pane: - - Team Owning Alias: `DMAdaprweb` - - Business Justification/Notes: `Configuring DNS for new Dapr docs website` - - Environment: `Internet/Public-facing` - - Zone: `dapr.io` - - Action: `Add` - - Incident ID: Leave blank - -1. Back in the new static web app you just deployed, navigate to the **Custom domains** blade and select **+ Add** -1. Enter `v1-2.docs.dapr.io` under **Domain name**. Click **Next**. -1. Keep **Hostname record type** as `CNAME`, and copy the value of **Value**. -1. Back in the domain portal, enter the following information in the main pane: - - Name: `v1-2.docs` - - Type: `CNAME` - - Data: Value you just copied from the static web app - -1. Click **Submit** in the top right corner. -1. Wait for two emails: - - One saying your request was received. - - One saying the request was completed. -1. Back in the Azure Portal, click **Add**. You may need to click a couple times to account for DNS delay. -1. A TLS certificate is now generated for you and the DNS record is saved. This may take 2-3 minutes. -1. Navigate to `https://v1-2.docs.dapr.io` and verify a blank website loads correctly. - -### Configure future website branch - -1. Open VS Code to the Dapr docs repo. +1. In a terminal window, navigate to the `docs` repo. 1. Switch to the upcoming release branch (`v1.1`) and synchronize changes: ```bash @@ -339,15 +285,94 @@ You need Microsoft employee access to create a new Azure Static Web App. url = "https://v1-0.docs.dapr.io" ``` -1. Commit the staged changes and push to the v1.2 branch. -1. Navigate to the [docs Actions page](https://github.com/dapr/docs/actions) and make sure the build & release successfully completed. -1. Navigate to the new `https://v1-2.docs.dapr.io` website and verify that the new version is displayed. +1. Commit the staged changes and push to a new PR against the v1.2 branch. +1. Hold on merging the PR until after release and the other `v1.0` and `v1.1` PRs have been merged. + +### Create new website for future release + +Next, create a new website for the future Dapr release. To do this, you'll need to: + +- Deploy an Azure Static Web App. +- Configure DNS via request from CNCF. + +#### Prerequisites +- Docs maintainer status in the `dapr/docs` repo. +- Access to the active Dapr Azure Subscription with Contributor or Owner access to create resources. +- [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd?tabs=winget-windows%2Cbrew-mac%2Cscript-linux&pivots=os-windows) installed on your machine. +- Your own fork of the [`dapr/docs` repo](https://github.com/dapr/docs) cloned to your machine. + +#### Deploy Azure Static Web App + +Deploy a new Azure Static Web App for the future Dapr release. For this example, we use v1.1 as the future release. + +1. In a terminal window, navigate to the `iac/swa` folder in the `dapr/docs` directory. + + ```bash + cd .github/iac/swa + ``` + +1. Log into Azure Developer CLI (`azd`) using the Dapr Azure subscription. + + ```bash + azd login + ``` + +1. In the browser prompt, verify you're logging in as Dapr and complete the login. + +1. In a new terminal, replace the following values with the website values you prefer. + + ```bash + export AZURE_RESOURCE_GROUP=rg-dapr-docs-test + export IDENTITY_RESOURCE_GROUP=rg-my-identities + export AZURE_STATICWEBSITE_NAME=daprdocs-latest + ``` + +1. Create a new [`azd` environment](https://learn.microsoft.com/azure/developer/azure-developer-cli/faq#what-is-an-environment-name). + + ```bash + azd env new + ``` + +1. When prompted, enter a new environment name. For this example, you'd name the environment something like: `dapr-docs-v1-1`. + +1. Once the environment is created, deploy the Dapr docs SWA into the new environment using the following command: + + ```bash + azd up + ``` + +1. When prompted, select an Azure subscription and location. Match these to the Dapr Azure subscription. + +#### Configure the SWA in the Azure portal + +Head over to the Dapr subscription in the [Azure portal](https://portal.azure.com) and verify that your new Dapr docs site has been deployed. + +Optionally, grant the correct minimal permissions for inbound publishing and outbound access to dependencies using the **Static Web App** > **Access control (IAM)** blade in the portal. + +#### Configure DNS + +1. In the Azure portal, from the new SWA you just created, naviage to **Custom domains** from the left side menu. +1. Copy the "CNAME" value of the web app. +1. Using your own account, [submit a CNCF ticket](https://jira.linuxfoundation.org/secure/Dashboard.jspa) to create a new domain name mapped to the CNAME value you copied. For this example, to create a new domain for Dapr v1.1, you'd request to map to `v1-1.docs.dapr.io`. + + Request resolution may take some time. + +1. Once the new domain has been confirmed, return to the static web app in the portal. +1. Navigate to the **Custom domains** blade and select **+ Add**. +1. Select **Custom domain on other DNS**. +1. Enter `v1-1.docs.dapr.io` under **Domain name**. Click **Next**. +1. Keep **Hostname record type** as `CNAME`, and copy the value of **Value**. +1. Click **Add**. +1. Navigate to `https://v1-1.docs.dapr.io` and verify a blank website loads correctly. + +You can repeat these steps for any preview versions. ### On the new Dapr release date 1. Wait for all code/containers/Helm charts to be published. -1. Merge the the PR from `release_v1.0` to `v1.0`. Delete the release/v1.0 branch. -1. Merge the the PR from `release_v1.1` to `v1.1`. Delete the release/v1.1 branch. +1. Merge the PR from `release_v1.0` to `v1.0`. Delete the release/v1.0 branch. +1. Merge the PR from `release_v1.1` to `v1.1`. Delete the release/v1.1 branch. +1. Merge the PR from `release_v1.2` to `v1.2`. Delete the release/v1.2 branch. Congrats on the new docs release! 🚀 🎉 🎈