Update protos for 1.11 (#490)

Signed-off-by: ItalyPaleAle <[email protected]>

Author: ItalyPaleAle

scripts/fetch-proto.sh

@@ -3,7 +3,7 @@ OS=$(echo `uname`|tr '[:upper:]' '[:lower:]')
 ARCH=$(uname -m)
 ORG_NAME="dapr"
 REPO_NAME="dapr"
-BRANCH_NAME="v1.10.2"
+BRANCH_NAME="release-1.11"
 
 # Path to store output
 PATH_ROOT=$(pwd)
@@ -141,6 +141,7 @@ echo ""
 echo "Downloading latest Google Protobuf gRPC files"
 downloadFile "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/src/google/protobuf/any.proto" "$PATH_ROOT/src/proto/google/protobuf/any.proto"
 downloadFile "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/src/google/protobuf/empty.proto" "$PATH_ROOT/src/proto/google/protobuf/empty.proto"
+downloadFile "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/src/google/protobuf/timestamp.proto" "$PATH_ROOT/src/proto/google/protobuf/timestamp.proto"
 
 echo ""
 echo "Compiling gRPC files"
@@ -156,6 +157,7 @@ generateGrpc "$PATH_ROOT/src/proto" "dapr/proto/sentry/v1/sentry.proto"
 
 generateGrpc "$PATH_ROOT/src/proto" "google/protobuf/any.proto"
 generateGrpc "$PATH_ROOT/src/proto" "google/protobuf/empty.proto"
+generateGrpc "$PATH_ROOT/src/proto" "google/protobuf/timestamp.proto"
 
 
 echo ""

src/implementation/Client/DaprClient.ts

@@ -104,7 +104,7 @@ export default class DaprClient {
         this.proxy = new GRPCClientProxy(client);
         this.configuration = new GRPCClientConfiguration(client);
         this.lock = new GRPCClientLock(client);
-        this.actor = new GRPCClientActor(client); // we use a abstractor here since we interface through a builder with the Actor Runtime
+        this.actor = new GRPCClientActor(client); // we use an abstractor here since we interface through a builder with the Actor Runtime
         break;
       }
       case CommunicationProtocolEnum.HTTP:
@@ -123,7 +123,7 @@ export default class DaprClient {
         this.configuration = new HTTPClientConfiguration(client);
         this.proxy = new HTTPClientProxy(client);
         this.lock = new HTTPClientLock(client);
-        this.actor = new HTTPClientActor(client); // we use a abstractor here since we interface through a builder with the Actor Runtime
+        this.actor = new HTTPClientActor(client); // we use an abstractor here since we interface through a builder with the Actor Runtime
         break;
       }
     }

src/implementation/Client/GRPCClient/lock.ts

@@ -39,7 +39,7 @@ export default class GRPCClientLock implements IClientLock {
       .setStoreName(storeName)
       .setResourceId(resourceId)
       .setLockOwner(lockOwner)
-      .setExpiryinseconds(expiryInSeconds);
+      .setExpiryInSeconds(expiryInSeconds);
 
     const client = await this.client.getClient();
     return new Promise((resolve, reject) => {

src/proto/dapr/proto/common/v1/common.proto

@@ -77,7 +77,7 @@ message InvokeRequest {
   HTTPExtension http_extension = 4;
 }
 
-// InvokeResponse is the response message inclduing data and its content type
+// InvokeResponse is the response message including data and its content type
 // from app callback.
 // This message is used in InvokeService of Dapr gRPC Service and OnInvoke
 // of AppCallback gRPC service.
@@ -99,7 +99,7 @@ message StreamPayload {
   bytes data = 1;
 
   // Sequence number. This is a counter that starts from 0 and increments by 1 on each chunk sent.
-  uint32 seq = 2;
+  uint64 seq = 2;
 }
 
 // StateItem represents state key, value, and additional options to save state.

src/proto/dapr/proto/common/v1/common_pb.js

@@ -890,7 +890,7 @@ proto.dapr.proto.common.v1.StreamPayload.deserializeBinaryFromReader = function(
       msg.setData(value);
       break;
     case 2:
-      var value = /** @type {number} */ (reader.readUint32());
+      var value = /** @type {number} */ (reader.readUint64());
       msg.setSeq(value);
       break;
     default:
@@ -931,7 +931,7 @@ proto.dapr.proto.common.v1.StreamPayload.serializeBinaryToWriter = function(mess
   }
   f = message.getSeq();
   if (f !== 0) {
-    writer.writeUint32(
+    writer.writeUint64(
       2,
       f
     );
@@ -982,7 +982,7 @@ proto.dapr.proto.common.v1.StreamPayload.prototype.setData = function(value) {
 
 
 /**
- * optional uint32 seq = 2;
+ * optional uint64 seq = 2;
  * @return {number}
  */
 proto.dapr.proto.common.v1.StreamPayload.prototype.getSeq = function() {

src/proto/dapr/proto/operator/v1/operator.proto

@@ -34,6 +34,10 @@ service Operator {
   rpc ListResiliency (ListResiliencyRequest) returns (ListResiliencyResponse) {}
   // Returns a list of pub/sub subscriptions, ListSubscriptionsRequest to expose pod info
   rpc ListSubscriptionsV2 (ListSubscriptionsRequest) returns (ListSubscriptionsResponse) {}
+  // Returns a list of http endpoints
+  rpc ListHTTPEndpoints (ListHTTPEndpointsRequest) returns (ListHTTPEndpointsResponse) {}
+  // Sends events to Dapr sidecars upon http endpoint changes.
+  rpc HTTPEndpointUpdate (HTTPEndpointUpdateRequest) returns (stream HTTPEndpointUpdateEvent) {}
 }
 
 // ListComponentsRequest is the request to get components for a sidecar in namespace.
@@ -100,3 +104,34 @@ message ListSubscriptionsRequest {
   string podName = 1;
   string namespace = 2;
 }
+
+// GetHTTPEndpointRequest is the request to get an http endpoint configuration.
+message GetHTTPEndpointRequest {
+  string name = 1;
+  string namespace = 2;
+}
+
+// GetHTTPEndpointResponse includes the requested http endpoint configuration.
+message GetHTTPEndpointResponse {
+  bytes http_endpoint = 1;
+}
+
+// ListHTTPEndpointsResponse includes the list of available http endpoint configurations.
+message ListHTTPEndpointsResponse {
+  repeated bytes http_endpoints = 1;
+}
+
+message ListHTTPEndpointsRequest {
+  string namespace = 1;
+}
+
+// HTTPEndpointsUpdateRequest is the request to get updates about new http endpoints for a given namespace.
+message HTTPEndpointUpdateRequest {
+  string namespace = 1;
+  string pod_name = 2;
+}
+
+// HTTPEndpointsUpdateEvent includes the updated http endpoint event.
+message HTTPEndpointUpdateEvent {
+  bytes http_endpoints = 1;
+}

src/proto/dapr/proto/operator/v1/operator_grpc_pb.d.ts

@@ -16,6 +16,8 @@ interface IOperatorService extends grpc.ServiceDefinition<grpc.UntypedServiceImp
     getResiliency: IOperatorService_IGetResiliency;
     listResiliency: IOperatorService_IListResiliency;
     listSubscriptionsV2: IOperatorService_IListSubscriptionsV2;
+    listHTTPEndpoints: IOperatorService_IListHTTPEndpoints;
+    hTTPEndpointUpdate: IOperatorService_IHTTPEndpointUpdate;
 }
 
 interface IOperatorService_IComponentUpdate extends grpc.MethodDefinition<dapr_proto_operator_v1_operator_pb.ComponentUpdateRequest, dapr_proto_operator_v1_operator_pb.ComponentUpdateEvent> {
@@ -81,6 +83,24 @@ interface IOperatorService_IListSubscriptionsV2 extends grpc.MethodDefinition<da
     responseSerialize: grpc.serialize<dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse>;
     responseDeserialize: grpc.deserialize<dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse>;
 }
+interface IOperatorService_IListHTTPEndpoints extends grpc.MethodDefinition<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse> {
+    path: "/dapr.proto.operator.v1.Operator/ListHTTPEndpoints";
+    requestStream: false;
+    responseStream: false;
+    requestSerialize: grpc.serialize<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest>;
+    requestDeserialize: grpc.deserialize<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest>;
+    responseSerialize: grpc.serialize<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse>;
+    responseDeserialize: grpc.deserialize<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse>;
+}
+interface IOperatorService_IHTTPEndpointUpdate extends grpc.MethodDefinition<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent> {
+    path: "/dapr.proto.operator.v1.Operator/HTTPEndpointUpdate";
+    requestStream: false;
+    responseStream: true;
+    requestSerialize: grpc.serialize<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest>;
+    requestDeserialize: grpc.deserialize<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest>;
+    responseSerialize: grpc.serialize<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
+    responseDeserialize: grpc.deserialize<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
+}
 
 export const OperatorService: IOperatorService;
 
@@ -92,6 +112,8 @@ export interface IOperatorServer extends grpc.UntypedServiceImplementation {
     getResiliency: grpc.handleUnaryCall<dapr_proto_operator_v1_operator_pb.GetResiliencyRequest, dapr_proto_operator_v1_operator_pb.GetResiliencyResponse>;
     listResiliency: grpc.handleUnaryCall<dapr_proto_operator_v1_operator_pb.ListResiliencyRequest, dapr_proto_operator_v1_operator_pb.ListResiliencyResponse>;
     listSubscriptionsV2: grpc.handleUnaryCall<dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse>;
+    listHTTPEndpoints: grpc.handleUnaryCall<dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse>;
+    hTTPEndpointUpdate: grpc.handleServerStreamingCall<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
 }
 
 export interface IOperatorClient {
@@ -115,6 +137,11 @@ export interface IOperatorClient {
     listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
     listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
     listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
+    listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    hTTPEndpointUpdate(request: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
+    hTTPEndpointUpdate(request: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
 }
 
 export class OperatorClient extends grpc.Client implements IOperatorClient {
@@ -139,4 +166,9 @@ export class OperatorClient extends grpc.Client implements IOperatorClient {
     public listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
     public listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
     public listSubscriptionsV2(request: dapr_proto_operator_v1_operator_pb.ListSubscriptionsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListSubscriptionsResponse) => void): grpc.ClientUnaryCall;
+    public listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    public listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    public listHTTPEndpoints(request: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse) => void): grpc.ClientUnaryCall;
+    public hTTPEndpointUpdate(request: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
+    public hTTPEndpointUpdate(request: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent>;
 }

src/proto/dapr/proto/operator/v1/operator_grpc_pb.js

@@ -84,6 +84,28 @@ function deserialize_dapr_proto_operator_v1_GetResiliencyResponse(buffer_arg) {
   return dapr_proto_operator_v1_operator_pb.GetResiliencyResponse.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_dapr_proto_operator_v1_HTTPEndpointUpdateEvent(arg) {
+  if (!(arg instanceof dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent)) {
+    throw new Error('Expected argument of type dapr.proto.operator.v1.HTTPEndpointUpdateEvent');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_dapr_proto_operator_v1_HTTPEndpointUpdateEvent(buffer_arg) {
+  return dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_dapr_proto_operator_v1_HTTPEndpointUpdateRequest(arg) {
+  if (!(arg instanceof dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest)) {
+    throw new Error('Expected argument of type dapr.proto.operator.v1.HTTPEndpointUpdateRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_dapr_proto_operator_v1_HTTPEndpointUpdateRequest(buffer_arg) {
+  return dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_dapr_proto_operator_v1_ListComponentResponse(arg) {
   if (!(arg instanceof dapr_proto_operator_v1_operator_pb.ListComponentResponse)) {
     throw new Error('Expected argument of type dapr.proto.operator.v1.ListComponentResponse');
@@ -106,6 +128,28 @@ function deserialize_dapr_proto_operator_v1_ListComponentsRequest(buffer_arg) {
   return dapr_proto_operator_v1_operator_pb.ListComponentsRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_dapr_proto_operator_v1_ListHTTPEndpointsRequest(arg) {
+  if (!(arg instanceof dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest)) {
+    throw new Error('Expected argument of type dapr.proto.operator.v1.ListHTTPEndpointsRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_dapr_proto_operator_v1_ListHTTPEndpointsRequest(buffer_arg) {
+  return dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_dapr_proto_operator_v1_ListHTTPEndpointsResponse(arg) {
+  if (!(arg instanceof dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse)) {
+    throw new Error('Expected argument of type dapr.proto.operator.v1.ListHTTPEndpointsResponse');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_dapr_proto_operator_v1_ListHTTPEndpointsResponse(buffer_arg) {
+  return dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_dapr_proto_operator_v1_ListResiliencyRequest(arg) {
   if (!(arg instanceof dapr_proto_operator_v1_operator_pb.ListResiliencyRequest)) {
     throw new Error('Expected argument of type dapr.proto.operator.v1.ListResiliencyRequest');
@@ -247,6 +291,30 @@ listSubscriptionsV2: {
     responseSerialize: serialize_dapr_proto_operator_v1_ListSubscriptionsResponse,
     responseDeserialize: deserialize_dapr_proto_operator_v1_ListSubscriptionsResponse,
   },
+  // Returns a list of http endpoints
+listHTTPEndpoints: {
+    path: '/dapr.proto.operator.v1.Operator/ListHTTPEndpoints',
+    requestStream: false,
+    responseStream: false,
+    requestType: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsRequest,
+    responseType: dapr_proto_operator_v1_operator_pb.ListHTTPEndpointsResponse,
+    requestSerialize: serialize_dapr_proto_operator_v1_ListHTTPEndpointsRequest,
+    requestDeserialize: deserialize_dapr_proto_operator_v1_ListHTTPEndpointsRequest,
+    responseSerialize: serialize_dapr_proto_operator_v1_ListHTTPEndpointsResponse,
+    responseDeserialize: deserialize_dapr_proto_operator_v1_ListHTTPEndpointsResponse,
+  },
+  // Sends events to Dapr sidecars upon http endpoint changes.
+hTTPEndpointUpdate: {
+    path: '/dapr.proto.operator.v1.Operator/HTTPEndpointUpdate',
+    requestStream: false,
+    responseStream: true,
+    requestType: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateRequest,
+    responseType: dapr_proto_operator_v1_operator_pb.HTTPEndpointUpdateEvent,
+    requestSerialize: serialize_dapr_proto_operator_v1_HTTPEndpointUpdateRequest,
+    requestDeserialize: deserialize_dapr_proto_operator_v1_HTTPEndpointUpdateRequest,
+    responseSerialize: serialize_dapr_proto_operator_v1_HTTPEndpointUpdateEvent,
+    responseDeserialize: deserialize_dapr_proto_operator_v1_HTTPEndpointUpdateEvent,
+  },
 };
 
 exports.OperatorClient = grpc.makeGenericClientConstructor(OperatorService);