Skip to content

Commit

Permalink
Merge branch 'v1.13' into issue_2926
Browse files Browse the repository at this point in the history
  • Loading branch information
hhunter-ms authored Jun 19, 2024
2 parents 5d0219f + 47b2b7e commit 1275665
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion daprdocs/content/en/concepts/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -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](http://expressjs.com/) | Build Express applications with Dapr APIs
| [PHP]({{< ref php >}}) | | You can serve with Apache, Nginx, or Caddyserver.

#### Integrations and extensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:

The code examples below leverage Dapr SDKs to invoke the output bindings endpoint on a running Dapr instance.

{{< tabs Dotnet Java Python Go JavaScript>}}
{{< tabs ".NET" Java Python Go JavaScript>}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Configure your application to receive incoming events. If you're using HTTP, you

Below are code examples that leverage Dapr SDKs to demonstrate an output binding.

{{< tabs Dotnet Java Python Go JavaScript>}}
{{< tabs ".NET" Java Python Go JavaScript>}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
The following example shows how to get a saved configuration item using the Dapr Configuration API.
{{< tabs ".NET" Java Python Go Javascript "HTTP API (BASH)" "HTTP API (Powershell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (BASH)" "HTTP API (Powershell)">}}
{{% codetab %}}
Expand Down Expand Up @@ -252,7 +252,7 @@ Invoke-RestMethod -Uri 'http://localhost:3601/v1.0/configuration/configstore?key
Below are code examples that leverage SDKs to subscribe to keys `[orderId1, orderId2]` using `configstore` store component.
{{< tabs ".NET" "ASP.NET Core" Java Python Go Javascript>}}
{{< tabs ".NET" "ASP.NET Core" Java Python Go JavaScript>}}
{{% codetab %}}
Expand Down Expand Up @@ -521,7 +521,7 @@ After you've subscribed to watch configuration items, you will receive updates f
Following are the code examples showing how you can unsubscribe to configuration updates using unsubscribe API.
{{< tabs ".NET" Java Python Go Javascript "HTTP API (BASH)" "HTTP API (Powershell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (BASH)" "HTTP API (Powershell)">}}
{{% codetab %}}
```csharp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
### Acquire lock
{{< tabs HTTP Dotnet Go >}}
{{< tabs HTTP ".NET" Go >}}
{{% codetab %}}
Expand Down Expand Up @@ -122,7 +122,7 @@ func main() {

### Unlock existing lock

{{< tabs HTTP Dotnet Go >}}
{{< tabs HTTP ".NET" Go >}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ scopes:
You can override this file with another [pubsub component]({{< ref setup-pubsub >}}) by creating a components directory (in this example, `myComponents`) containing the file and using the flag `--resources-path` with the `dapr run` CLI command.

{{< tabs Dotnet Java Python Go Javascript >}}
{{< tabs ".NET" Java Python Go JavaScript >}}

{{% codetab %}}

Expand Down Expand Up @@ -186,7 +186,7 @@ Place `subscription.yaml` in the same directory as your `pubsub.yaml` component.

Below are code examples that leverage Dapr SDKs to subscribe to the topic you defined in `subscription.yaml`.

{{< tabs Dotnet Java Python Go JavaScript>}}
{{< tabs ".NET" Java Python Go JavaScript>}}

{{% codetab %}}

Expand Down Expand Up @@ -422,7 +422,7 @@ Invoke-RestMethod -Method Post -ContentType 'application/json' -Body '{"orderId"

Below are code examples that leverage Dapr SDKs to publish a topic.

{{< tabs Dotnet Java Python Go Javascript>}}
{{< tabs ".NET" Java Python Go JavaScript>}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The bulk publish operation also does not guarantee any ordering of messages.

### Example

{{< tabs Java Javascript Dotnet Python Go "HTTP API (Bash)" "HTTP API (PowerShell)" >}}
{{< tabs Java JavaScript ".NET" Python Go "HTTP API (Bash)" "HTTP API (PowerShell)" >}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ See a [full API reference]({{< ref secrets_api.md >}}).

Now that you've set up the local secret store, call Dapr to get the secrets from your application code. Below are code examples that leverage Dapr SDKs for retrieving a secret.

{{< tabs Dotnet Java Python Go Javascript>}}
{{< tabs ".NET" Java Python Go JavaScript>}}

{{% codetab %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@ namespace EventService
var content = new StringContent(orderJson, Encoding.UTF8, "application/json");

var httpClient = DaprClient.CreateInvokeHttpClient();
await httpClient.PostAsJsonAsync("http://order-processor/orders", content);
var response = await httpClient.PostAsJsonAsync("http://order-processor/orders", content);
var result = await response.Content.ReadAsStringAsync();

Console.WriteLine("Order requested: " + orderId);
Console.WriteLine("Result: " + result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ctx = metadata.AppendToOutgoingContext(ctx, "dapr-app-id", "server")

All languages supported by gRPC allow for adding metadata. Here are a few examples:

{{< tabs Java Dotnet Python JavaScript Ruby "C++">}}
{{< tabs Java ".NET" Python JavaScript Ruby "C++">}}

{{% codetab %}}
```java
Expand Down Expand Up @@ -249,7 +249,7 @@ When using Dapr to proxy streaming RPC calls using gRPC, you must set an additio

For example:

{{< tabs Go Java Dotnet Python JavaScript Ruby "C++">}}
{{< tabs Go Java ".NET" Python JavaScript Ruby "C++">}}

{{% codetab %}}
```go
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Set an `app-id`, as the state keys are prefixed with this value. If you don't se

The following example shows how to save and retrieve a single key/value pair using the Dapr state management API.

{{< tabs Dotnet Java Python Go Javascript "HTTP API (Bash)" "HTTP API (PowerShell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (Bash)" "HTTP API (PowerShell)">}}

{{% codetab %}}

Expand Down Expand Up @@ -356,7 +356,7 @@ Restart your sidecar and try retrieving state again to observe that state persis

Below are code examples that leverage Dapr SDKs for deleting the state.

{{< tabs Dotnet Java Python Go Javascript "HTTP API (Bash)" "HTTP API (PowerShell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (Bash)" "HTTP API (PowerShell)">}}

{{% codetab %}}

Expand Down Expand Up @@ -537,7 +537,7 @@ Try getting state again. Note that no value is returned.

Below are code examples that leverage Dapr SDKs for saving and retrieving multiple states.

{{< tabs Dotnet Java Python Go Javascript "HTTP API (Bash)" "HTTP API (PowerShell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (Bash)" "HTTP API (PowerShell)">}}

{{% codetab %}}

Expand Down Expand Up @@ -788,7 +788,7 @@ State transactions require a state store that supports multi-item transactions.

Below are code examples that leverage Dapr SDKs for performing state transactions.

{{< tabs Dotnet Java Python Go Javascript "HTTP API (Bash)" "HTTP API (PowerShell)">}}
{{< tabs ".NET" Java Python Go JavaScript "HTTP API (Bash)" "HTTP API (PowerShell)">}}

{{% codetab %}}

Expand Down
2 changes: 1 addition & 1 deletion daprdocs/content/en/developing-applications/sdks/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Select your [preferred language below]({{< ref "#sdk-languages" >}}) to learn mo
| [Java]({{< ref java >}}) | Stable || Spring Boot <br /> Quarkus|||
| [Go]({{< ref go >}}) | Stable |||||
| [PHP]({{< ref php >}}) | Stable |||| |
| [Javascript]({{< ref js >}}) | Stable|| |||
| [JavaScript]({{< ref js >}}) | Stable|| |||
| [C++](https://github.com/dapr/cpp-sdk) | In development || | |
| [Rust](https://github.com/dapr/rust-sdk) | In development || || |

Expand Down
Binary file modified daprdocs/static/presentations/dapr-slidedeck.pptx.zip
Binary file not shown.

0 comments on commit 1275665

Please sign in to comment.