@daocloud-proto/skoala 0.7.2-2 → 0.7.2-20

package/api/hosted/v1alpha1/nacos.pb.ts

@@ -19,6 +19,12 @@ export enum NacosConfigFileType {
   properties = "properties",
 }
 
+export enum NodeType {
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+  FOLLOWER = "FOLLOWER",
+  LEADER = "LEADER",
+}
+
 export enum NacosStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   Running = "Running",
@@ -27,12 +33,6 @@ export enum NacosStatus {
   Scaling = "Scaling",
 }
 
-export enum NacosConditionType {
-  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
-  FOLLOWER = "FOLLOWER",
-  LEADER = "LEADER",
-}
-
 export enum NacosConditionStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   UNKNOWN = "UNKNOWN",
@@ -46,6 +46,13 @@ export enum NacosConfigType {
   cluster = "cluster",
 }
 
+export enum NacosConfigHistoryBriefOpType {
+  OP_TYPE_UNSPECIFIED = "OP_TYPE_UNSPECIFIED",
+  CREATE = "CREATE",
+  UPDATE = "UPDATE",
+  DELETE = "DELETE",
+}
+
 export enum CreateNacosConfigReqPolicy {
   POLICY_TYPE_UNSPECIFIED = "POLICY_TYPE_UNSPECIFIED",
   ABORT = "ABORT",
@@ -103,7 +110,7 @@ export type NacosDatabase = {
 }
 
 export type NacosCondition = {
-  type?: NacosConditionType
+  type?: NodeType
   status?: NacosConditionStatus
   reason?: string
   message?: string
@@ -208,6 +215,7 @@ export type NacosServiceBrief = {
   triggerFlag?: boolean
   nacosNamespace?: string
   insight?: SkoalaApiGeneralV1alpha1Insight.InsightBrief
+  governed?: boolean
 }
 
 export type NacosInstanceCluster = {
@@ -605,7 +613,7 @@ export type NacosConfigHistoryBrief = {
   lastId?: number
   lastModifyTime?: string
   md5?: string
-  opType?: string
+  opType?: NacosConfigHistoryBriefOpType
   srcIp?: string
   srcUser?: string
   tenant?: string
@@ -786,6 +794,8 @@ export type NacosNode = {
   metadata?: string
   abilities?: string
   failAccessCnt?: number
+  type?: NodeType
+  modifyTime?: string
 }
 
 export type CheckNacosConfigReq = {

package/api/hosted/v1alpha1/plugins.pb.ts

@@ -4,6 +4,7 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
 import * as SkoalaApiGeneralV1alpha1Resource from "../../general/v1alpha1/resource.pb"
 import * as SkoalaApiGeneralV1alpha1Service from "../../general/v1alpha1/service.pb"
 
@@ -79,7 +80,7 @@ export type UpdatePluginReq = {
 
 export type UpdateSentinelPluginReq = {
   enabled?: boolean
-  image?: string
+  chart?: SkoalaApiGeneralV1alpha1Common.Chart
   replicas?: number
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   type?: SkoalaApiGeneralV1alpha1Service.ServiceType

package/api/hosted/v1alpha1/sentinel.pb.ts

@@ -7,8 +7,20 @@
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
 
 export enum Grade {
-  FLOW_GRADE_THREAD = "FLOW_GRADE_THREAD",
-  FLOW_GRADE_QPS = "FLOW_GRADE_QPS",
+  THREAD = "THREAD",
+  QPS = "QPS",
+}
+
+export enum Strategy {
+  Director = "Director",
+  ASSOCIATION = "ASSOCIATION",
+  LINKER = "LINKER",
+}
+
+export enum ControlBehavior {
+  FAST_FAILED = "FAST_FAILED",
+  WARM_UP = "WARM_UP",
+  WAITING_IN_QUEUE = "WAITING_IN_QUEUE",
 }
 
 export enum DegradeRuleGrade {
@@ -22,7 +34,7 @@ export enum AuthorityRuleStrategy {
   AUTHORITY_BLACK = "AUTHORITY_BLACK",
 }
 
-export type GetAppInstanceReq = {
+export type GetInsGovernReq = {
   workspaceId?: string
   clusterName?: string
   namespaceName?: string
@@ -31,14 +43,24 @@ export type GetAppInstanceReq = {
   instanceIp?: string
 }
 
-export type GetAppInstanceRes = {
+export type GetInsGovernRes = {
   name?: string
   healthy?: boolean
-  port?: number
+  heartbeatPort?: number
   version?: string
   lastHeartbeat?: string
 }
 
+export type DeleteInsGovernReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  serviceName?: string
+  instanceIp?: string
+  heartbeatPort?: number
+}
+
 export type FlowRule = {
   id?: number
   app?: string
@@ -46,11 +68,11 @@ export type FlowRule = {
   port?: number
   limitApp?: string
   resource?: string
-  grade?: number
+  grade?: Grade
   count?: number
-  strategy?: number
+  strategy?: Strategy
   refResource?: string
-  controlBehavior?: number
+  controlBehavior?: ControlBehavior
   warmUpPeriodSec?: number
   maxQueueingTimeMs?: number
   clusterMode?: boolean

package/api/skoala/v1alpha1/skoala.pb.ts

@@ -237,8 +237,11 @@ export class Nacos {
   }
 }
 export class Sentinel {
-  static GetAppInstance(req: SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceReq, SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinel/${req["sentinelName"]}/appinstance?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName"])}`, {...initReq, method: "GET"})
+  static GetInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/governs?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.DeleteInsGovernReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.DeleteInsGovernReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/governs`, {...initReq, method: "DELETE"})
   }
   static CreateFlowRule(req: SkoalaApiHostedV1alpha1Sentinel.CreateFlowRuleReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.CreateFlowRuleReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/flow-rules`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.7.2-2",
+  "version": "0.7.2-20",
   "description": "",
   "main": "index.js",
   "scripts": {