From 4976d33b01e6eda378aa4f18fa373a623848d27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Bj=C3=B6rkstr=C3=B6m?= Date: Fri, 19 Feb 2021 15:22:57 +0200 Subject: [PATCH 01/10] Update output for Getting a secret Indicate that the response is JSON and not plain text. --- daprdocs/content/en/getting-started/get-started-component.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md index ef9d3038a..73c13bdfd 100644 --- a/daprdocs/content/en/getting-started/get-started-component.md +++ b/daprdocs/content/en/getting-started/get-started-component.md @@ -86,8 +86,8 @@ Invoke-RestMethod -Uri 'http://localhost:3500/v1.0/secrets/my-secret-store/my-se You should see output with the secret you stored in the JSON file. -``` -"I'm Batman" +```json +{"my-secret":"I'm Batman"} ``` Next step: Explore Dapr quickstarts >> From d5efe6487b64cf1ca8356bbc16e06cb89bede081 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 24 Feb 2021 11:08:52 -0800 Subject: [PATCH 02/10] Add dotnet sdk --- .gitmodules | 3 +++ daprdocs/config.toml | 6 ++++++ sdkdocs/dotnet | 1 + 3 files changed, 10 insertions(+) create mode 160000 sdkdocs/dotnet diff --git a/.gitmodules b/.gitmodules index 21fb9751c..be99ad3b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "sdkdocs/php"] path = sdkdocs/php url = https://github.com/dapr/php-sdk.git +[submodule "sdkdocs/dotnet"] + path = sdkdocs/dotnet + url = https://github.com/dapr/dotnet-sdk.git diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 814c7177b..3dccca2e7 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -46,6 +46,12 @@ id = "UA-149338238-3" [[module.mounts]] source = "../sdkdocs/php/daprdocs/content/en/php-sdk-docs" target = "content/developing-applications/sdks/php" + [[module.mounts]] + source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-docs" + target = "content/developing-applications/sdks/dotnet" + [[module.mounts]] + source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-contributing" + target = "content/contributing/" # Markdown Engine - Allow inline html [markup] diff --git a/sdkdocs/dotnet b/sdkdocs/dotnet new file mode 160000 index 000000000..008a4f35d --- /dev/null +++ b/sdkdocs/dotnet @@ -0,0 +1 @@ +Subproject commit 008a4f35dd953669891a8414cd8c3f96bcf9b9dd From 4cff5ca0fbe66ac9d74171d113ada1f151e8fe9a Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 24 Feb 2021 11:09:03 -0800 Subject: [PATCH 03/10] Update references --- daprdocs/content/en/_index.md | 4 ++-- .../en/developing-applications/sdks/_index.md | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index 670b9c74e..0db703ac4 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -77,7 +77,7 @@ Welcome to the Dapr documentation site!
Language SDKs

Create Dapr applications in your preferred language using the Dapr SDKs.

- + .NET logo
@@ -109,7 +109,7 @@ Welcome to the Dapr documentation site!
- + PHP logo
diff --git a/daprdocs/content/en/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md index 1e86e16d5..f3ab7da55 100644 --- a/daprdocs/content/en/developing-applications/sdks/_index.md +++ b/daprdocs/content/en/developing-applications/sdks/_index.md @@ -18,7 +18,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho - Interact with external resources through input and output [bindings]({{< ref bindings >}}) - Get [secrets]({{< ref secrets >}}) from secret stores - Interact with [virtual actors]({{< ref actors >}}) -- **Service extensions**: The Dapr service extensions allow you to create services that can: +- **Server extensions**: The Dapr service extensions allow you to create services that can: - Be [invoked]({{< ref service-invocation >}}) by other services - [Subscribe]({{< ref pubsub >}}) to topics - **Actor SDK**: The Dapr Actor SDK allows you to build virtual actors with: @@ -29,13 +29,13 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho ## SDK languages -| Language | Status | Client SDK | Service Extensions | Actor SDK | -|----------|:-----:|:----------:|:-----------:|:---------:| -| [.NET](https://github.com/dapr/dotnet-sdk) | Stable | ✔ | ✔
ASP.NET Core | ✔ | -| [Python]({{< ref python >}}) | Stable | ✔ | ✔
[gRPC]({{< ref python-grpc.md >}}) | ✔
[FastAPI]({{< ref python-fastapi.md >}})
[Flask]({{< ref python-flask.md >}}) | -| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | ✔
Spring Boot | ✔ | +| Language | Status | Client SDK | Server extensions | Actor SDK | +|----------|:------|:----------:|:-----------:|:---------:| +| [.NET]({{< ref dotnet >}}) | Stable | ✔ | [ASP.NET Core]({{< ref dotnet-aspnet >}}) | ✔ | +| [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})
[Flask]({{< ref python-flask.md >}}) | +| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ | | [Go](https://github.com/dapr/go-sdk) | Stable | ✔ | ✔ | | -| [PHP](https://github.com/dapr/php-sdk) | Stable | ✔ | ✔ | ✔ | +| [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ | | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | | | [Rust]() | In development | ✔ | | | | [Javascript]() | In development| ✔ | | From 4ac4670d978665cda5796743740104bb53cc79c8 Mon Sep 17 00:00:00 2001 From: Peter <45140408+pelithne@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:02:30 +0100 Subject: [PATCH 04/10] Update security-concept.md Minor wording fix, as described in https://github.com/dapr/docs/issues/1264 --- daprdocs/content/en/concepts/security-concept.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/concepts/security-concept.md b/daprdocs/content/en/concepts/security-concept.md index 66a2bd304..c130d0fe4 100644 --- a/daprdocs/content/en/concepts/security-concept.md +++ b/daprdocs/content/en/concepts/security-concept.md @@ -50,7 +50,7 @@ The diagram below shows how the Sentry system service issues certificates for ap ### mTLS in Kubernetes -The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service as stored as a Kubernetes secret +The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service and stored as a Kubernetes secret From d698cd212fe1aada4294ccc91787ad44ab0ff21c Mon Sep 17 00:00:00 2001 From: darron froese Date: Thu, 25 Feb 2021 18:28:59 -0700 Subject: [PATCH 05/10] Update setup-nats-streaming.md (#1258) Missing a single - --- .../setup-pubsub/supported-pubsub/setup-nats-streaming.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md b/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md index 004051d77..e8fb5d5a5 100644 --- a/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md +++ b/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md @@ -78,7 +78,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr You can run a NATS server locally using Docker: ```bash -docker run -d -name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming +docker run -d --name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming ``` You can then interact with the server using the client port: `localhost:4222`. From ba0c8eddb8453eb4c923f5121e6296132912508d Mon Sep 17 00:00:00 2001 From: Sahan Serasinghe Date: Fri, 26 Feb 2021 12:29:46 +1030 Subject: [PATCH 06/10] Update get-started-api.md (#1268) Improved grammar to get the message clearly across to the reader. Co-authored-by: Mark Fussell --- daprdocs/content/en/getting-started/get-started-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/get-started-api.md b/daprdocs/content/en/getting-started/get-started-api.md index a574ae797..b795de4f0 100644 --- a/daprdocs/content/en/getting-started/get-started-api.md +++ b/daprdocs/content/en/getting-started/get-started-api.md @@ -19,7 +19,7 @@ Run the following command to launch a Dapr sidecar that will listen on port 3500 dapr run --app-id myapp --dapr-http-port 3500 ``` -With this command, no custom component folder was defined so the Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to the local Redis Docker container as a state store and message broker. +With this command, no custom component folder was defined, so Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to use the local Redis Docker container as a state store and message broker. ## Step 2: Save state From 78e2b60c82fdc1cbd97cd6552ebe86d4895c2451 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Fri, 26 Feb 2021 18:33:13 -0800 Subject: [PATCH 07/10] Fix mysql name in helm and Docker. --- .../setup-state-store/supported-state-stores/setup-mysql.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md index f49cfb36d..434a7bf8f 100644 --- a/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md +++ b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md @@ -64,7 +64,7 @@ Run an instance of MySQL. You can run a local instance of MySQL in Docker CE wit This example does not describe a production configuration because it sets the password in plain text and the user name is left as the MySQL default of "root". ```bash -docker run --name dapr_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest +docker run --name dapr-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest ``` {{% /codetab %}} @@ -78,7 +78,7 @@ We can use [Helm](https://helm.sh/) to quickly create a MySQL instance in our Ku ```bash helm repo add bitnami https://charts.bitnami.com/bitnami - helm install dapr_mysql bitnami/mysql + helm install dapr-mysql bitnami/mysql ``` 1. Run `kubectl get pods` to see the MySQL containers now running in your cluster. From 5b52a108c1a54895e8e1c4f506d24970833fa148 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Mon, 1 Mar 2021 13:43:58 -0800 Subject: [PATCH 08/10] Update dotnet docs --- sdkdocs/dotnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdkdocs/dotnet b/sdkdocs/dotnet index 008a4f35d..5f5326b83 160000 --- a/sdkdocs/dotnet +++ b/sdkdocs/dotnet @@ -1 +1 @@ -Subproject commit 008a4f35dd953669891a8414cd8c3f96bcf9b9dd +Subproject commit 5f5326b83fa52fe1965f60f2161eb18b2940cc10 From a148688fd896f7ef6469b6630ed5dd1b814838bb Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Tue, 2 Mar 2021 17:00:46 -0800 Subject: [PATCH 09/10] Fixing helm chart readme link --- .../en/operations/hosting/kubernetes/kubernetes-production.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md index d9e70815f..4b7e012f2 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md @@ -21,7 +21,7 @@ Use the following resource settings might serve as a starting point. Requirement | Placement | Limit: 1, Request: 250m | Limit: 150Mi, Request: 75Mi | Dashboard | Limit: 200m, Request: 50m | Limit: 200Mi, Request: 20Mi -When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options. +When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README.md) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options. ### Optional components From 5067042e9b732dd1d49410037fd00a31a0550457 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 3 Mar 2021 22:24:27 +0100 Subject: [PATCH 10/10] At "list" permission for non-default namespace List permission is necessary to perform bulk secret read. If not present Dapr sidecar will crash and restart on a new different gprc port. --- daprdocs/content/en/operations/components/component-secrets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/components/component-secrets.md b/daprdocs/content/en/operations/components/component-secrets.md index f535ac5ee..f494b89bd 100644 --- a/daprdocs/content/en/operations/components/component-secrets.md +++ b/daprdocs/content/en/operations/components/component-secrets.md @@ -121,7 +121,7 @@ metadata: rules: - apiGroups: [""] resources: ["secrets"] - verbs: ["get"] + verbs: ["get", "list"] --- kind: RoleBinding