Merge branch 'master' into additional-secrets-testing

dapr · Sep 13, 2024 · d355f04 · d355f04
2 parents 167c522 + 74f6b01
commit d355f04
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 31 deletions.
diff --git a/.devcontainer/localinit.sh b/.devcontainer/localinit.sh
@@ -6,4 +6,4 @@ az extension add --name containerapp --yes
 nvm install v18.12.1
 
 # initialize Dapr
-dapr init --runtime-version=1.10.0-rc.2
+dapr init --runtime-version=1.14.0
diff --git a/.github/workflows/itests.yml b/.github/workflows/itests.yml
@@ -42,9 +42,9 @@ jobs:
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
-      DAPR_CLI_VER: 1.13.0
-      DAPR_RUNTIME_VER: 1.13.2
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.12/install/install.sh
+      DAPR_CLI_VER: 1.14.0
+      DAPR_RUNTIME_VER: 1.14.0
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh
       DAPR_CLI_REF: ''
     steps:
       - name: Set up Dapr CLI

diff --git a/daprdocs/content/en/dotnet-sdk-docs/_index.md b/daprdocs/content/en/dotnet-sdk-docs/_index.md
@@ -18,7 +18,7 @@ Dapr offers a variety of packages to help with the development of .NET applicati
 
 - [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed
 - Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}})
-- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
+- [.NET 6+](https://dotnet.microsoft.com/download) installed
 
 ## Installation
 

diff --git a/daprdocs/content/en/dotnet-sdk-docs/dotnet-actors/dotnet-actors-howto.md b/daprdocs/content/en/dotnet-sdk-docs/dotnet-actors/dotnet-actors-howto.md
@@ -45,7 +45,7 @@ This project contains the implementation of the actor client which calls MyActor
 
 - [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed.
 - Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}}).
-- [.NET Core 3.1 or .NET 6+](https://dotnet.microsoft.com/download) installed. Dapr .NET SDK uses [ASP.NET Core](https://docs.microsoft.com/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-6.0).
+- [.NET 6+](https://dotnet.microsoft.com/download) installed. Dapr .NET SDK uses [ASP.NET Core](https://docs.microsoft.com/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-6.0).
 
 ## Step 0: Prepare
 

diff --git a/examples/Actor/README.md b/examples/Actor/README.md
@@ -4,7 +4,7 @@ The Actor example shows how to create a virtual actor (`DemoActor`) and invoke i
 
 ## Prerequisites
 
-- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
+- [.NET 6+](https://dotnet.microsoft.com/download) installed
 - [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
 - [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
 - [Dapr .NET SDK](https://github.com/dapr/dotnet-sdk/)
@@ -102,7 +102,7 @@ docker push <your-docker-registry>/demo-actor:latest
 ### Deploy the Actor service to Kubernetes
 #### Prerequisites
 - A Kubernetes cluster with `kubectl` configured to access it.
-- Dapr v1.13+ installed on the Kubernetes cluster. Follow the instructions [here](https://docs.dapr.io/getting-started/install-dapr-kubernetes/).
+- Dapr v1.14+ installed on the Kubernetes cluster. Follow the instructions [here](https://docs.dapr.io/getting-started/install-dapr-kubernetes/).
 - A Docker registry where you pushed the `DemoActor` image.
 
 #### Deploy the Actor service

diff --git a/examples/Client/PublishSubscribe/BulkPublishEventExample/README.md b/examples/Client/PublishSubscribe/BulkPublishEventExample/README.md
@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
+- [.NET 6+](https://dotnet.microsoft.com/download) installed
 - [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
 - [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
 - [Dapr .NET SDK](https://docs.dapr.io/developing-applications/sdks/dotnet/)

diff --git a/examples/Client/PublishSubscribe/PublishEventExample/README.md b/examples/Client/PublishSubscribe/PublishEventExample/README.md
@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
+- [.NET 6+](https://dotnet.microsoft.com/download) installed
 - [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
 - [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
 - [Dapr .NET SDK](https://docs.dapr.io/developing-applications/sdks/dotnet/)

diff --git a/samples/Client/README.md b/samples/Client/README.md
@@ -8,7 +8,7 @@ The following examples will show you how to:
 
 ## Prerequisites
 
-* [.Net Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download)
+* [.NET 6+](https://dotnet.microsoft.com/download)
 * [Dapr CLI](https://github.com/dapr/cli)
 * [Dapr DotNet SDK](https://github.com/dapr/dotnet-sdk)
 

diff --git a/src/Dapr.Client/Protos/dapr/proto/common/v1/common.proto b/src/Dapr.Client/Protos/dapr/proto/common/v1/common.proto
@@ -157,4 +157,4 @@ message ConfigurationItem {
 
   // the metadata which will be passed to/from configuration store component.
   map<string,string> metadata = 3;
-}
+}
diff --git a/src/Dapr.Client/Protos/dapr/proto/dapr/v1/appcallback.proto b/src/Dapr.Client/Protos/dapr/proto/dapr/v1/appcallback.proto
@@ -15,6 +15,7 @@ syntax = "proto3";
 
 package dapr.proto.runtime.v1;
 
+import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
 import "dapr/proto/common/v1/common.proto";
 import "google/protobuf/struct.proto";
@@ -59,8 +60,37 @@ service AppCallbackHealthCheck {
 service AppCallbackAlpha {
     // Subscribes bulk events from Pubsub
   rpc OnBulkTopicEventAlpha1(TopicEventBulkRequest) returns (TopicEventBulkResponse) {}
+
+  // Sends job back to the app's endpoint at trigger time.
+  rpc OnJobEventAlpha1 (JobEventRequest) returns (JobEventResponse);
+}
+
+message JobEventRequest {
+  // Job name.
+  string name = 1;
+
+  // Job data to be sent back to app.
+  google.protobuf.Any data = 2;
+
+  // Required. method is a method name which will be invoked by caller.
+  string method = 3;
+
+  // The type of data content.
+  //
+  // This field is required if data delivers http request body
+  // Otherwise, this is optional.
+  string content_type = 4;
+
+  // HTTP specific fields if request conveys http-compatible request.
+  //
+  // This field is required for http-compatible request. Otherwise,
+  // this field is optional.
+  common.v1.HTTPExtension http_extension = 5;
 }
 
+// JobEventResponse is the response from the app when a job is triggered.
+message JobEventResponse {}
+
 // TopicEventRequest message is compatible with CloudEvent spec v1.0
 // https://github.com/cloudevents/spec/blob/v1.0/spec.md
 message TopicEventRequest {
@@ -310,4 +340,4 @@ message ListInputBindingsResponse {
 
 // HealthCheckResponse is the message with the response to the health check.
 // This message is currently empty as used as placeholder.
-message HealthCheckResponse {}
+message HealthCheckResponse {}