Merge pull request #25 from wcs1only/release-1.0

Update for 1.0.0-rc.3

Author: wcs1only

dapr/proto/common/v1/common.proto

@@ -89,7 +89,7 @@ message StateItem {
 
  // The entity tag which represents the specific version of data.
  // The exact ETag format is defined by the corresponding data store.
- string etag = 3;
+ Etag etag = 3;
 
  // The metadata which will be passed to state store component.
  map<string,string> metadata = 4;
@@ -98,6 +98,12 @@ message StateItem {
  StateOptions options = 5;
 }
 
+// Etag represents a state item version
+message Etag {
+ // value sets the etag value
+ string value = 1;
+}
+
 // StateOptions configures concurrency and consistency for state operations
 message StateOptions {
  // Enum describing the supported concurrency for state.

dapr/proto/runtime/v1/dapr.proto

@@ -32,7 +32,10 @@ service Dapr {
 
  // Deletes the state for a specific key.
  rpc DeleteState(DeleteStateRequest) returns (google.protobuf.Empty) {}
- 
+
+ // Deletes a bulk of state items for a list of keys
+ rpc DeleteBulkState(DeleteBulkStateRequest) returns (google.protobuf.Empty) {}
+
  // Executes transactions for a specified store
  rpc ExecuteStateTransaction(ExecuteStateTransactionRequest) returns (google.protobuf.Empty) {}
 
@@ -68,6 +71,12 @@ service Dapr {
 
  // InvokeActor calls a method on an actor.
  rpc InvokeActor (InvokeActorRequest) returns (InvokeActorResponse) {}
+
+ // Gets metadata of the sidecar
+ rpc GetMetadata (google.protobuf.Empty) returns (GetMetadataResponse) {}
+
+ // Sets value in extended metadata of the sidecar
+ rpc SetMetadata (SetMetadataRequest) returns (google.protobuf.Empty) {}
 }
 
 // InvokeServiceRequest represents the request message for Service invocation.
@@ -158,7 +167,7 @@ message DeleteStateRequest {
 
  // The entity tag which represents the specific version of data.
  // The exact ETag format is defined by the corresponding data store.
- string etag = 3;
+ common.v1.Etag etag = 3;
 
  // State operation options which includes concurrency/
  // consistency/retry_policy.
@@ -168,6 +177,15 @@ message DeleteStateRequest {
  map<string,string> metadata = 5;
 }
 
+// DeleteBulkStateRequest is the message to delete a list of key-value states from specific state store.
+message DeleteBulkStateRequest {
+ // The name of state store.
+ string store_name = 1;
+
+ // The array of the state key values.
+ repeated common.v1.StateItem states = 2;
+}
+
 // SaveStateRequest is the message to save multiple states into state store.
 message SaveStateRequest {
  // The name of state store.
@@ -256,11 +274,16 @@ message GetBulkSecretRequest {
  map<string,string> metadata = 2;
 }
 
-// GetBulkSecretResponse is the response message to convey the requested secret.
+// SecretResponse is a map of decrypted string/string values
+message SecretResponse {
+ map<string, string> secrets = 1;
+}
+
+// GetBulkSecretResponse is the response message to convey the requested secrets.
 message GetBulkSecretResponse {
  // data hold the secret values. Some secret store, such as kubernetes secret
  // store, can save multiple secrets for single secret key.
- map<string, string> data = 1;
+ map<string, SecretResponse> data = 1;
 }
 
 // TransactionalStateOperation is the message to execute a specified operation with a key-value pair.
@@ -357,3 +380,27 @@ message InvokeActorRequest {
 message InvokeActorResponse {
  bytes data = 1;
 }
+
+// GetMetadataResponse is a message that is returned on GetMetadata rpc call
+message GetMetadataResponse {
+ string id = 1;
+ repeated ActiveActorsCount active_actors_count = 2;
+ repeated RegisteredComponents registered_components = 3;
+ map<string,string> extended_metadata = 4;
+}
+
+message ActiveActorsCount {
+ string type = 1;
+ int32 count = 2;
+}
+
+message RegisteredComponents {
+ string name = 1;
+ string type = 2;
+ string version = 3;
+}
+
+message SetMetadataRequest {
+ string key = 1;
+ string value = 2;
+}

examples/echo_app/README.md

@@ -10,22 +10,58 @@ This echo app example shows how to use service invocation using gRPC API. You ca
 1. Make sure that you reopen in container on VSCode
 2. Open new bash terminal
 3. Build echo_app
+
 ```
 cd examples/echo_app
+```
+
+<!-- STEP
+name: Build example
+-->
+
+```bash
 make
 ```
 
+<!-- END_STEP -->
+
 ### Run callee app
 
 1. Open new bash terminal
 2. Run callee app
-```
+
+<!-- STEP
+name: Run callee
+expected_stdout_lines:
+ - '== APP == OnInvoke() is called'
+ - '== APP == Got the message: hello dapr'
+background: true
+sleep: 5 
+-->
+
+```bash
 dapr run --app-id callee --app-protocol grpc --app-port 6000 ./echo_app callee 6000
 ```
+
+<!-- END_STEP -->
+
 3. Run caller app
-```
+
+<!-- STEP
+name: Run caller
+expected_stdout_lines:
+ - "== APP == Call echo method to callee"
+ - "== APP == Received [ack : hello dapr] from callee"
+background: true
+sleep: 5 
+-->
+
+```bash
 dapr run --app-id echo_app --app-protocol grpc --app-port 6100 ./echo_app caller 6100 callee
 ```
+
+<!-- END_STEP -->
+
 4. Check the logs
 From callee app:
 ```
@@ -45,6 +81,23 @@ From caller app:
 ...
 ```
 
+## Cleanup
+
+<!-- STEP
+expected_stdout_lines: 
+ - '✅ app stopped successfully: echo_app'
+ - '✅ app stopped successfully: callee'
+expected_stderr_lines:
+name: Shutdown dapr
+-->
+
+```bash
+dapr stop --app-id echo_app
+dapr stop --app-id callee
+```
+
+<!-- END_STEP -->
+
 ## gRPC Debug
 
 Set the below environment variable to debug gRPC server and client.