From 0c73cdf9b49f33f13db22e829a838fe7ee829769 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Tue, 29 Jun 2021 15:12:41 -0700 Subject: [PATCH 01/11] Add Go SDK submodule and docs --- .gitmodules | 3 +++ daprdocs/config.toml | 8 ++++++++ sdkdocs/go | 1 + 3 files changed, 12 insertions(+) create mode 160000 sdkdocs/go diff --git a/.gitmodules b/.gitmodules index 3d8a47fd8..7a3fdb882 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ path = translations/docs-zh url = https://github.com/dapr/docs-zh.git branch = v1.0_content +[submodule "sdkdocs/go"] + path = sdkdocs/go + url = git@github.com:dapr/go-sdk.git diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 711f151c5..f3d77ee81 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -71,6 +71,14 @@ id = "UA-149338238-3" source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-contributing" target = "content/contributing/" lang = "en" + [[module.mounts]] + source = "../sdkdocs/go/daprdocs/content/en/go-sdk-docs" + target = "content/developing-applications/sdks/go" + lang = "en" + [[module.mounts]] + source = "../sdkdocs/go/daprdocs/content/en/go-sdk-contributing" + target = "content/contributing/" + lang = "en" [[module.mounts]] source = "../translations/docs-zh/content/zh-hans" diff --git a/sdkdocs/go b/sdkdocs/go new file mode 160000 index 000000000..df8589712 --- /dev/null +++ b/sdkdocs/go @@ -0,0 +1 @@ +Subproject commit df8589712fb18d577e8979df27bb880a6b692ebf From b21bdf5dc082b3b44788b80e31cd5017eb366cda Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Thu, 1 Jul 2021 12:58:08 -0700 Subject: [PATCH 02/11] Update go-sdk to latest commit on main --- sdkdocs/go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdkdocs/go b/sdkdocs/go index df8589712..a9c6bcb4f 160000 --- a/sdkdocs/go +++ b/sdkdocs/go @@ -1 +1 @@ -Subproject commit df8589712fb18d577e8979df27bb880a6b692ebf +Subproject commit a9c6bcb4f44d38403854387b7ab8713fd6e992e9 From beab3efd4bdef780e279fea4927f6b182dc26eb2 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Thu, 1 Jul 2021 13:39:56 -0700 Subject: [PATCH 03/11] Use https for git submodule url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7a3fdb882..c2f4ff29d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,4 +16,4 @@ branch = v1.0_content [submodule "sdkdocs/go"] path = sdkdocs/go - url = git@github.com:dapr/go-sdk.git + url = https://github.com/dapr/go-sdk.git From 08c28e3e9face18bc3c04d211c7b35b1cb848463 Mon Sep 17 00:00:00 2001 From: Wood-Xia Date: Sat, 10 Jul 2021 16:07:07 +0800 Subject: [PATCH 04/11] Update get-started-component.md Add one note if someone start this chapter without stop the sidecar with same app-id. --- .../content/en/getting-started/get-started-component.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md index 7c6e221c8..caca8b9a2 100644 --- a/daprdocs/content/en/getting-started/get-started-component.md +++ b/daprdocs/content/en/getting-started/get-started-component.md @@ -65,6 +65,12 @@ Run the following command to launch a Dapr sidecar that will listen on port 3500 dapr run --app-id myapp --dapr-http-port 3500 --components-path ./my-components ``` +*note*: +If you follow [previous step]({{}}) completely without stop the running sidecar, and run above command in new terminal, then you will get error message like below: +```bash +dapr with ID myapp is already running +``` +You could fix this problem by "Control-C" to stop the running sidecar in previous terminal. ## Step 4: Get a secret In a separate terminal run: From b4ce90078ed3a91dd9424dde9091e356640d91e4 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Tue, 6 Jul 2021 15:07:26 -0700 Subject: [PATCH 05/11] Remove http formatting for readability --- daprdocs/content/en/reference/api/actors_api.md | 2 +- daprdocs/content/en/reference/api/metadata_api.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/reference/api/actors_api.md b/daprdocs/content/en/reference/api/actors_api.md index 03b8080d2..05e6ccf94 100644 --- a/daprdocs/content/en/reference/api/actors_api.md +++ b/daprdocs/content/en/reference/api/actors_api.md @@ -381,7 +381,7 @@ Deletes a timer for an actor. #### HTTP Request -```http +``` DELETE http://localhost:/v1.0/actors///timers/ ``` diff --git a/daprdocs/content/en/reference/api/metadata_api.md b/daprdocs/content/en/reference/api/metadata_api.md index f731e5aba..96f09fdfb 100644 --- a/daprdocs/content/en/reference/api/metadata_api.md +++ b/daprdocs/content/en/reference/api/metadata_api.md @@ -103,7 +103,7 @@ Adds a custom attribute to the Dapr sidecar information stored by the Metadata E ### HTTP Request -```http +``` PUT http://localhost:/v1.0/metadata/attributeName ``` From a3e1039a7891d7c236e4c7d9505cec4897d6021f Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Thu, 8 Jul 2021 10:06:40 -0700 Subject: [PATCH 06/11] Clarify shared access policy (#1621) --- .../supported-pubsub/setup-azure-servicebus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md index ec4b867d3..9632a470f 100644 --- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md +++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md @@ -66,7 +66,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | Field | Required | Details | Example | |--------------------|:--------:|---------|---------| -| connectionString | Y | Connection-string for the Service Bus | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`" +| connectionString | Y | Shared access policy connection-string for the Service Bus | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`" | timeoutInSec | N | Timeout for sending messages and management operations. Default: `60` |`30` | handlerTimeoutInSec| N | Timeout for invoking app handler. # Optional. Default: `60` | `30` | disableEntityManagement | N | When set to true, topics and subscriptions do not get created automatically. Default: `"false"` | `"true"`, `"false"` From 3cf342d27393decf53116c9b9d512d29fbd32e9c Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Mon, 12 Jul 2021 09:53:33 -0700 Subject: [PATCH 07/11] Update go-sdk submodule --- sdkdocs/go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdkdocs/go b/sdkdocs/go index a9c6bcb4f..189b10cc8 160000 --- a/sdkdocs/go +++ b/sdkdocs/go @@ -1 +1 @@ -Subproject commit a9c6bcb4f44d38403854387b7ab8713fd6e992e9 +Subproject commit 189b10cc8fd44f81c9397b8256a149fb19636f27 From d4b90e2b8732e3049a19e6c0cf52fb246db92ec7 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Tue, 13 Jul 2021 11:20:12 -0700 Subject: [PATCH 08/11] Update to latest commit for Go SDK repo --- sdkdocs/go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdkdocs/go b/sdkdocs/go index 189b10cc8..fc67f725e 160000 --- a/sdkdocs/go +++ b/sdkdocs/go @@ -1 +1 @@ -Subproject commit 189b10cc8fd44f81c9397b8256a149fb19636f27 +Subproject commit fc67f725e0b5bb14ce903940fe889a76b59fceef From f7df25e601ff937ed162f4f12dba180daccae2e6 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Tue, 13 Jul 2021 11:30:35 -0700 Subject: [PATCH 09/11] Link to correct Go SDK page in dapr docs --- daprdocs/content/en/_index.md | 2 +- daprdocs/content/en/developing-applications/sdks/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index 0db703ac4..da87a5014 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -101,7 +101,7 @@ Welcome to the Dapr documentation site!
- + Go logo
diff --git a/daprdocs/content/en/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md index 2ad84d08b..88848a8c7 100644 --- a/daprdocs/content/en/developing-applications/sdks/_index.md +++ b/daprdocs/content/en/developing-applications/sdks/_index.md @@ -34,7 +34,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho | [.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 | ✔ | ✔ | | +| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | | | [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ | | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | | | [Rust](https://github.com/dapr/rust-sdk) | In development | ✔ | | | From 4e2af84914444065d7e7fba984b1ebdc68499c85 Mon Sep 17 00:00:00 2001 From: Lorenzo Montanari Date: Wed, 14 Jul 2021 12:12:12 +0200 Subject: [PATCH 10/11] Removed a duplicated line in Kubernetes section --- .../debugging/debug-k8s/debug-dapr-services.md | 1 - 1 file changed, 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md b/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md index bc430b939..17f71eab5 100644 --- a/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md +++ b/daprdocs/content/en/developing-applications/debugging/debug-k8s/debug-dapr-services.md @@ -30,7 +30,6 @@ cd dapr make release GOOS=linux GOARCH=amd64 DEBUG=1 ``` ->On Windows download [MingGW](https://sourceforge.net/projects/mingw/files/MinGW/Extension/make/mingw32-make-3.80-3/) and use `ming32-make.exe` instead of `make`. >On Windows download [MingGW](https://sourceforge.net/projects/mingw/files/MinGW/Extension/make/mingw32-make-3.80-3/) and use `ming32-make.exe` instead of `make`. In the above command, 'DEBUG' is specified to '1' to disable compiler optimization. 'GOOS=linux' and 'GOARCH=amd64' are also necessary since the binaries will be packaged into Linux-based Docker image in the next step. From 8f5e0b513573e71325f3b405b22ede42b5308407 Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Wed, 14 Jul 2021 11:55:21 -0700 Subject: [PATCH 11/11] changing language --- .../content/en/getting-started/get-started-component.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md index caca8b9a2..6781bac40 100644 --- a/daprdocs/content/en/getting-started/get-started-component.md +++ b/daprdocs/content/en/getting-started/get-started-component.md @@ -65,12 +65,8 @@ Run the following command to launch a Dapr sidecar that will listen on port 3500 dapr run --app-id myapp --dapr-http-port 3500 --components-path ./my-components ``` -*note*: -If you follow [previous step]({{}}) completely without stop the running sidecar, and run above command in new terminal, then you will get error message like below: -```bash -dapr with ID myapp is already running -``` -You could fix this problem by "Control-C" to stop the running sidecar in previous terminal. +> If you encounter a error message stating the app ID is already in use, it may be that the sidecar you ran in the previous step is still running. Make sure you stop the sidecar before running the above command (e.g. using "Control-C"). + ## Step 4: Get a secret In a separate terminal run: