Update to 1.0.0-rc.3 protos (#37)

* Update to 1.0.0-rc.3 protos

* Add new calls to client

Author: tcnghia

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;
+}

src/client.rs

@@ -176,6 +176,25 @@ impl<T: DaprInterface> Client<T> {
             .await
     }
 
+    /// Delete an array of state objects.
+    ///
+    /// # Arguments
+    ///
+    /// * `store_name` - The name of state store.
+    /// * `states` - The array of the state key values.
+    pub async fn delete_bulk_state<I, K>(&mut self, store_name: K, states: I) -> Result<(), Error>
+    where
+        I: IntoIterator<Item = (K, Vec<u8>)>,
+        K: Into<String>,
+    {
+        self.0
+            .delete_bulk_state(DeleteBulkStateRequest {
+                store_name: store_name.into(),
+                states: states.into_iter().map(|pair| pair.into()).collect(),
+            })
+            .await
+    }
+
     /// Delete the state for a specific key.
     ///
     /// # Arguments
@@ -205,6 +224,31 @@ impl<T: DaprInterface> Client<T> {
             })
             .await
     }
+
+    /// Set sidecar Metadata
+    ///
+    /// # Arguments
+    ///
+    /// * `key` - The metadata key
+    /// * `value` - The metadata value
+    pub async fn set_metadata<S>(&mut self, key: S, value: S) -> Result<(), Error>
+    where
+        S: Into<String>,
+    {
+        self.0
+            .set_metadata(SetMetadataRequest {
+                key: key.into(),
+                value: value.into(),
+                ..Default::default()
+            })
+            .await
+    }
+
+    /// Set sidecar Metadata
+    ///
+    pub async fn get_metadata(&mut self) -> Result<GetMetadataResponse, Error> {
+        self.0.get_metadata().await
+    }
 }
 
 #[async_trait]
@@ -223,6 +267,9 @@ pub trait DaprInterface: Sized {
     async fn get_state(&mut self, request: GetStateRequest) -> Result<GetStateResponse, Error>;
     async fn save_state(&mut self, request: SaveStateRequest) -> Result<(), Error>;
     async fn delete_state(&mut self, request: DeleteStateRequest) -> Result<(), Error>;
+    async fn delete_bulk_state(&mut self, request: DeleteBulkStateRequest) -> Result<(), Error>;
+    async fn set_metadata(&mut self, request: SetMetadataRequest) -> Result<(), Error>;
+    async fn get_metadata(&mut self) -> Result<GetMetadataResponse, Error>;
 }
 
 #[async_trait]
@@ -273,6 +320,21 @@ impl DaprInterface for dapr_v1::dapr_client::DaprClient<TonicChannel> {
     async fn delete_state(&mut self, request: DeleteStateRequest) -> Result<(), Error> {
         Ok(self.delete_state(Request::new(request)).await?.into_inner())
     }
+
+    async fn delete_bulk_state(&mut self, request: DeleteBulkStateRequest) -> Result<(), Error> {
+        Ok(self
+            .delete_bulk_state(Request::new(request))
+            .await?
+            .into_inner())
+    }
+
+    async fn set_metadata(&mut self, request: SetMetadataRequest) -> Result<(), Error> {
+        Ok(self.set_metadata(Request::new(request)).await?.into_inner())
+    }
+
+    async fn get_metadata(&mut self) -> Result<GetMetadataResponse, Error> {
+        Ok(self.get_metadata(Request::new(())).await?.into_inner())
+    }
 }
 
 /// A request from invoking a service
@@ -302,12 +364,21 @@ pub type SaveStateRequest = dapr_v1::SaveStateRequest;
 /// A request for deleting state
 pub type DeleteStateRequest = dapr_v1::DeleteStateRequest;
 
+/// A request for deleting bulk state
+pub type DeleteBulkStateRequest = dapr_v1::DeleteBulkStateRequest;
+
 /// A request for getting secret
 pub type GetSecretRequest = dapr_v1::GetSecretRequest;
 
 /// A response from getting secret
 pub type GetSecretResponse = dapr_v1::GetSecretResponse;
 
+/// A response from getting metadata
+pub type GetMetadataResponse = dapr_v1::GetMetadataResponse;
+
+/// A request for setting metadata
+pub type SetMetadataRequest = dapr_v1::SetMetadataRequest;
+
 /// A tonic based gRPC client
 pub type TonicClient = dapr_v1::dapr_client::DaprClient<TonicChannel>;