chore(proto): update protos and point Workflow to beta APIs (#531)

* proto updation and beta endpoint for wf http Signed-off-by: Deepanshu Agarwal <[email protected]> * lint Signed-off-by: Deepanshu Agarwal <[email protected]> --------- Signed-off-by: Deepanshu Agarwal <[email protected]>
dapr · Oct 13, 2023 · e3987b7 · e3987b7
1 parent 55f1673
commit e3987b7
Show file tree

Hide file tree

Showing 23 changed files with 1,613 additions and 107 deletions.
diff --git a/scripts/fetch-proto.sh b/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.11.0"
+BRANCH_NAME="v1.12.0"
 
 # Path to store output
 PATH_ROOT=$(pwd)

diff --git a/src/implementation/Client/HTTPClient/workflow.ts b/src/implementation/Client/HTTPClient/workflow.ts
@@ -42,7 +42,7 @@ export default class HTTPClientWorkflow implements IClientWorkflow {
 
     try {
       const result = await this.client.executeWithApiVersion(
-        "v1.0-alpha1",
+        "v1.0-beta1",
         `/workflows/${workflowComponent}/${instanceID}`,
         { method: "GET" },
       );
@@ -97,7 +97,7 @@ export default class HTTPClientWorkflow implements IClientWorkflow {
 
     try {
       await this.client.executeWithApiVersion(
-        "v1.0-alpha1",
+        "v1.0-beta1",
         `/workflows/${workflowComponent}/${workflowName}/start?${queryParams}`,
         {
           method: "POST",
@@ -139,7 +139,7 @@ export default class HTTPClientWorkflow implements IClientWorkflow {
 
     try {
       await this.client.executeWithApiVersion(
-        "v1.0-alpha1",
+        "v1.0-beta1",
         `/workflows/${workflowComponent}/${instanceId}/raiseEvent/${eventName}`,
         {
           method: "POST",
@@ -181,11 +181,9 @@ export default class HTTPClientWorkflow implements IClientWorkflow {
     workflowComponent = workflowComponent ?? HTTPClientWorkflow.DEFAULT_WORKFLOW_COMPONENT;
 
     try {
-      await this.client.executeWithApiVersion(
-        "v1.0-alpha1",
-        `/workflows/${workflowComponent}/${instanceId}/${method}`,
-        { method: "POST" },
-      );
+      await this.client.executeWithApiVersion("v1.0-beta1", `/workflows/${workflowComponent}/${instanceId}/${method}`, {
+        method: "POST",
+      });
     } catch (e: any) {
       this.logger.error(`Error invoking ${method} on workflow instance: ${e.message}`);
       throw e;

diff --git a/src/proto/dapr/proto/common/v1/common_pb.js b/src/proto/dapr/proto/common/v1/common_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_any_pb = require('google-protobuf/google/protobuf/any_pb.js');
 goog.object.extend(proto, google_protobuf_any_pb);
@@ -1278,7 +1284,8 @@ proto.dapr.proto.common.v1.StateItem.prototype.getMetadataMap = function(opt_noL
  */
 proto.dapr.proto.common.v1.StateItem.prototype.clearMetadataMap = function() {
   this.getMetadataMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -1816,7 +1823,8 @@ proto.dapr.proto.common.v1.ConfigurationItem.prototype.getMetadataMap = function
  */
 proto.dapr.proto.common.v1.ConfigurationItem.prototype.clearMetadataMap = function() {
   this.getMetadataMap().clear();
-  return this;};
+  return this;
+};
 
 
 goog.object.extend(exports, proto.dapr.proto.common.v1);
diff --git a/src/proto/dapr/proto/internals/v1/apiversion_pb.js b/src/proto/dapr/proto/internals/v1/apiversion_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 goog.exportSymbol('proto.dapr.proto.internals.v1.APIVersion', null, global);
 /**

diff --git a/src/proto/dapr/proto/internals/v1/service_invocation_pb.js b/src/proto/dapr/proto/internals/v1/service_invocation_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var dapr_proto_common_v1_common_pb = require('../../../../dapr/proto/common/v1/common_pb.js');
 goog.object.extend(proto, dapr_proto_common_v1_common_pb);
@@ -501,7 +507,8 @@ proto.dapr.proto.internals.v1.InternalInvokeRequest.prototype.getMetadataMap = f
  */
 proto.dapr.proto.internals.v1.InternalInvokeRequest.prototype.clearMetadataMap = function() {
   this.getMetadataMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -784,7 +791,8 @@ proto.dapr.proto.internals.v1.InternalInvokeResponse.prototype.getHeadersMap = f
  */
 proto.dapr.proto.internals.v1.InternalInvokeResponse.prototype.clearHeadersMap = function() {
   this.getHeadersMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -806,7 +814,8 @@ proto.dapr.proto.internals.v1.InternalInvokeResponse.prototype.getTrailersMap =
  */
 proto.dapr.proto.internals.v1.InternalInvokeResponse.prototype.clearTrailersMap = function() {
   this.getTrailersMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**

diff --git a/src/proto/dapr/proto/internals/v1/status_pb.js b/src/proto/dapr/proto/internals/v1/status_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_any_pb = require('google-protobuf/google/protobuf/any_pb.js');
 goog.object.extend(proto, google_protobuf_any_pb);

diff --git a/src/proto/dapr/proto/operator/v1/operator_pb.js b/src/proto/dapr/proto/operator/v1/operator_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
 goog.object.extend(proto, google_protobuf_empty_pb);

diff --git a/src/proto/dapr/proto/placement/v1/placement.proto b/src/proto/dapr/proto/placement/v1/placement.proto
@@ -19,6 +19,7 @@ option go_package = "github.com/dapr/dapr/pkg/proto/placement/v1;placement";
 
 // Placement service is used to report Dapr runtime host status.
 service Placement {
+  // Reports Dapr actor status and retrieves actor placement table.
   rpc ReportDaprStatus(stream Host) returns (stream PlacementOrder) {}
 }
 
@@ -45,4 +46,7 @@ message Host {
   int64 load = 3;
   repeated string entities = 4;
   string id = 5;
+  string pod = 6;
+  // Version of the Actor APIs supported by the Dapr runtime
+  uint32 api_level = 7;
 }
diff --git a/src/proto/dapr/proto/placement/v1/placement_grpc_pb.js b/src/proto/dapr/proto/placement/v1/placement_grpc_pb.js
@@ -42,7 +42,8 @@ function deserialize_dapr_proto_placement_v1_PlacementOrder(buffer_arg) {
 
 // Placement service is used to report Dapr runtime host status.
 var PlacementService = exports.PlacementService = {
-  reportDaprStatus: {
+  // Reports Dapr actor status and retrieves actor placement table.
+reportDaprStatus: {
     path: '/dapr.proto.placement.v1.Placement/ReportDaprStatus',
     requestStream: true,
     responseStream: true,

diff --git a/src/proto/dapr/proto/placement/v1/placement_pb.d.ts b/src/proto/dapr/proto/placement/v1/placement_pb.d.ts
@@ -105,6 +105,10 @@ export class Host extends jspb.Message {
     addEntities(value: string, index?: number): string;
     getId(): string;
     setId(value: string): Host;
+    getPod(): string;
+    setPod(value: string): Host;
+    getApiLevel(): number;
+    setApiLevel(value: number): Host;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): Host.AsObject;
@@ -123,5 +127,7 @@ export namespace Host {
         load: number,
         entitiesList: Array<string>,
         id: string,
+        pod: string,
+        apiLevel: number,
     }
 }
diff --git a/src/proto/dapr/proto/placement/v1/placement_pb.js b/src/proto/dapr/proto/placement/v1/placement_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = (function() { return this || window || global || self || Function('return this')(); }).call(null);
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 goog.exportSymbol('proto.dapr.proto.placement.v1.Host', null, global);
 goog.exportSymbol('proto.dapr.proto.placement.v1.PlacementOrder', null, global);
@@ -426,7 +432,8 @@ proto.dapr.proto.placement.v1.PlacementTables.prototype.getEntriesMap = function
  */
 proto.dapr.proto.placement.v1.PlacementTables.prototype.clearEntriesMap = function() {
   this.getEntriesMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -621,7 +628,8 @@ proto.dapr.proto.placement.v1.PlacementTable.prototype.getHostsMap = function(op
  */
 proto.dapr.proto.placement.v1.PlacementTable.prototype.clearHostsMap = function() {
   this.getHostsMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -680,7 +688,8 @@ proto.dapr.proto.placement.v1.PlacementTable.prototype.getLoadMapMap = function(
  */
 proto.dapr.proto.placement.v1.PlacementTable.prototype.clearLoadMapMap = function() {
   this.getLoadMapMap().clear();
-  return this;};
+  return this;
+};
 
 
 /**
@@ -744,7 +753,9 @@ proto.dapr.proto.placement.v1.Host.toObject = function(includeInstance, msg) {
     port: jspb.Message.getFieldWithDefault(msg, 2, 0),
     load: jspb.Message.getFieldWithDefault(msg, 3, 0),
     entitiesList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f,
-    id: jspb.Message.getFieldWithDefault(msg, 5, "")
+    id: jspb.Message.getFieldWithDefault(msg, 5, ""),
+    pod: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    apiLevel: jspb.Message.getFieldWithDefault(msg, 7, 0)
   };
 
   if (includeInstance) {
@@ -801,6 +812,14 @@ proto.dapr.proto.placement.v1.Host.deserializeBinaryFromReader = function(msg, r
       var value = /** @type {string} */ (reader.readString());
       msg.setId(value);
       break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setPod(value);
+      break;
+    case 7:
+      var value = /** @type {number} */ (reader.readUint32());
+      msg.setApiLevel(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -865,6 +884,20 @@ proto.dapr.proto.placement.v1.Host.serializeBinaryToWriter = function(message, w
       f
     );
   }
+  f = message.getPod();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+  f = message.getApiLevel();
+  if (f !== 0) {
+    writer.writeUint32(
+      7,
+      f
+    );
+  }
 };
 
 
@@ -977,4 +1010,40 @@ proto.dapr.proto.placement.v1.Host.prototype.setId = function(value) {
 };
 
 
+/**
+ * optional string pod = 6;
+ * @return {string}
+ */
+proto.dapr.proto.placement.v1.Host.prototype.getPod = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.dapr.proto.placement.v1.Host} returns this
+ */
+proto.dapr.proto.placement.v1.Host.prototype.setPod = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+/**
+ * optional uint32 api_level = 7;
+ * @return {number}
+ */
+proto.dapr.proto.placement.v1.Host.prototype.getApiLevel = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.dapr.proto.placement.v1.Host} returns this
+ */
+proto.dapr.proto.placement.v1.Host.prototype.setApiLevel = function(value) {
+  return jspb.Message.setProto3IntField(this, 7, value);
+};
+
+
 goog.object.extend(exports, proto.dapr.proto.placement.v1);