1- /*
1+ /*
22Copyright 2021 The Dapr Authors
33Licensed under the Apache License, Version 2.0 (the "License");
44you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import "google/protobuf/any.proto";
1919import "google/protobuf/empty.proto" ;
2020import "google/protobuf/timestamp.proto" ;
2121import "dapr/proto/common/v1/common.proto" ;
22- import "dapr/proto/dapr /v1/appcallback.proto" ;
22+ import "dapr/proto/runtime /v1/appcallback.proto" ;
2323
2424option csharp_namespace = "Dapr.Client.Autogen.Grpc.v1" ;
2525option java_outer_classname = "DaprProtos" ;
@@ -61,7 +61,7 @@ service Dapr {
6161
6262 // SubscribeTopicEventsAlpha1 subscribes to a PubSub topic and receives topic
6363 // events from it.
64- rpc SubscribeTopicEventsAlpha1 (stream SubscribeTopicEventsRequestAlpha1 ) returns (stream TopicEventRequest ) {}
64+ rpc SubscribeTopicEventsAlpha1 (stream SubscribeTopicEventsRequestAlpha1 ) returns (stream SubscribeTopicEventsResponseAlpha1 ) {}
6565
6666 // Invokes binding data to specific output bindings
6767 rpc InvokeBinding (InvokeBindingRequest ) returns (InvokeBindingResponse ) {}
@@ -428,17 +428,17 @@ message BulkPublishResponseFailedEntry {
428428// SubscribeTopicEventsRequestAlpha1 is a message containing the details for
429429// subscribing to a topic via streaming.
430430// The first message must always be the initial request. All subsequent
431- // messages must be event responses.
431+ // messages must be event processed responses.
432432message SubscribeTopicEventsRequestAlpha1 {
433433 oneof subscribe_topic_events_request_type {
434- SubscribeTopicEventsInitialRequestAlpha1 initial_request = 1 ;
435- SubscribeTopicEventsResponseAlpha1 event_response = 2 ;
434+ SubscribeTopicEventsRequestInitialAlpha1 initial_request = 1 ;
435+ SubscribeTopicEventsRequestProcessedAlpha1 event_processed = 2 ;
436436 }
437437}
438438
439- // SubscribeTopicEventsInitialRequestAlpha1 is the initial message containing the
440- // details for subscribing to a topic via streaming.
441- message SubscribeTopicEventsInitialRequestAlpha1 {
439+ // SubscribeTopicEventsRequestInitialAlpha1 is the initial message containing
440+ // the details for subscribing to a topic via streaming.
441+ message SubscribeTopicEventsRequestInitialAlpha1 {
442442 // The name of the pubsub component
443443 string pubsub_name = 1 ;
444444
@@ -456,16 +456,31 @@ message SubscribeTopicEventsInitialRequestAlpha1 {
456456 optional string dead_letter_topic = 4 ;
457457}
458458
459- // SubscribeTopicEventsResponseAlpha1 is a message containing the result of a
459+ // SubscribeTopicEventsRequestProcessedAlpha1 is the message containing the
460460// subscription to a topic.
461- message SubscribeTopicEventsResponseAlpha1 {
461+ message SubscribeTopicEventsRequestProcessedAlpha1 {
462462 // id is the unique identifier for the subscription request.
463463 string id = 1 ;
464464
465465 // status is the result of the subscription request.
466466 TopicEventResponse status = 2 ;
467467}
468468
469+
470+ // SubscribeTopicEventsResponseAlpha1 is a message returned from daprd
471+ // when subscribing to a topic via streaming.
472+ message SubscribeTopicEventsResponseAlpha1 {
473+ oneof subscribe_topic_events_response_type {
474+ SubscribeTopicEventsResponseInitialAlpha1 initial_response = 1 ;
475+ TopicEventRequest event_message = 2 ;
476+ }
477+ }
478+
479+ // SubscribeTopicEventsResponseInitialAlpha1 is the initial response from daprd
480+ // when subscribing to a topic.
481+ message SubscribeTopicEventsResponseInitialAlpha1 {}
482+
483+
469484// InvokeBindingRequest is the message to send data to output bindings
470485message InvokeBindingRequest {
471486 // The name of the output binding to invoke.
@@ -478,6 +493,7 @@ message InvokeBindingRequest {
478493 //
479494 // Common metadata property:
480495 // - ttlInSeconds : the time to live in seconds for the message.
496+ //
481497 // If set in the binding definition will cause all messages to
482498 // have a default time to live. The message ttl overrides any value
483499 // in the binding definition.
@@ -824,11 +840,11 @@ message TryLockRequest {
824840 //
825841 // The reason why we don't make it automatically generated is:
826842 // 1. If it is automatically generated,there must be a 'my_lock_owner_id' field in the response.
827- // This name is so weird that we think it is inappropriate to put it into the api spec
843+ // This name is so weird that we think it is inappropriate to put it into the api spec
828844 // 2. If we change the field 'my_lock_owner_id' in the response to 'lock_owner',which means the current lock owner of this lock,
829- // we find that in some lock services users can't get the current lock owner.Actually users don't need it at all.
845+ // we find that in some lock services users can't get the current lock owner.Actually users don't need it at all.
830846 // 3. When reentrant lock is needed,the existing lock_owner is required to identify client and check "whether this client can reenter this lock".
831- // So this field in the request shouldn't be removed.
847+ // So this field in the request shouldn't be removed.
832848 string lock_owner = 3 [json_name = "lockOwner" ];
833849
834850 // Required. The time before expiry.The time unit is second.
@@ -865,7 +881,7 @@ message SubtleGetKeyRequest {
865881 // JSON (JSON Web Key) as string
866882 JSON = 1 ;
867883 }
868-
884+
869885 // Name of the component
870886 string component_name = 1 [json_name ="componentName" ];
871887 // Name (or name/version) of the key to use in the key vault
@@ -1047,7 +1063,7 @@ message EncryptRequestOptions {
10471063 // If true, the encrypted document does not contain a key reference.
10481064 // In that case, calls to the Decrypt method must provide a key reference (name or name/version).
10491065 // Defaults to false.
1050- bool omit_decryption_key_name = 11 [json_name ="omitDecryptionKeyName" ];
1066+ bool omit_decryption_key_name = 11 [json_name ="omitDecryptionKeyName" ];
10511067 // Key reference to embed in the encrypted document (name or name/version).
10521068 // This is helpful if the reference of the key used to decrypt the document is different from the one used to encrypt it.
10531069 // If unset, uses the reference of the key used to encrypt the document (this is the default behavior).
@@ -1196,14 +1212,14 @@ message Job {
11961212 // "0 15 3 * * *" - every day at 03:15
11971213 //
11981214 // Period string expressions:
1199- // Entry | Description | Equivalent To
1200- // ----- | ----------- | -------------
1201- // @every <duration> | Run every <duration> (e.g. '@every 1h30m') | N/A
1202- // @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 0 1 1 *
1203- // @monthly | Run once a month, midnight, first of month | 0 0 0 1 * *
1204- // @weekly | Run once a week, midnight on Sunday | 0 0 0 * * 0
1205- // @daily (or @midnight) | Run once a day, midnight | 0 0 0 * * *
1206- // @hourly | Run once an hour, beginning of hour | 0 0 * * * *
1215+ // Entry | Description | Equivalent To
1216+ // ----- | ----------- | -------------
1217+ // @every ` <duration>` | Run every ` <duration>` (e.g. '@every 1h30m') | N/A
1218+ // @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 0 1 1 *
1219+ // @monthly | Run once a month, midnight, first of month | 0 0 0 1 * *
1220+ // @weekly | Run once a week, midnight on Sunday | 0 0 0 * * 0
1221+ // @daily (or @midnight) | Run once a day, midnight | 0 0 0 * * *
1222+ // @hourly | Run once an hour, beginning of hour | 0 0 * * * *
12071223 optional string schedule = 2 [json_name = "schedule" ];
12081224
12091225 // repeats is the optional number of times in which the job should be
@@ -1258,4 +1274,4 @@ message DeleteJobRequest {
12581274// DeleteJobResponse is the message response to delete the job by name.
12591275message DeleteJobResponse {
12601276 // Empty
1261- }
1277+ }
0 commit comments