@daocloud-proto/skoala 0.13.0-4 → 0.14.0-10

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

@@ -105,10 +105,15 @@ export type RegistryServiceInfo = {
   meshId?: string
   meshName?: string
   meshNamespaceName?: string
+  meshType?: string
+  meshStatus?: string
+  meshDeployType?: string
   nacosNamespaceId?: string
   nacosGroupName?: string
   kubernetesClusterName?: string
   kubernetesNamespaceName?: string
+  kubernetesPorts?: string[]
+  kubernetesLabels?: string[]
   registryType?: RegistryServiceInfoRegistryType
 }
 

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

@@ -101,6 +101,12 @@ export type AdvancedAPIConfig = {
   requestHeadersPolicy?: HeaderPolicy
   responseHeadersPolicy?: HeaderPolicy
   jwtPolicy?: JWTPolicy
+  authPolicy?: AuthPolicy
+}
+
+export type AuthPolicy = {
+  context?: {[key: string]: string}
+  disabled?: boolean
 }
 
 export type JWTPolicy = {

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

@@ -845,4 +845,22 @@ export type GetNacosGrafanaReq = {
 export type GetNacosGrafanaRes = {
   url?: string
   zhUrl?: string
+}
+
+export type NacosDashBoardReq = {
+  workspaceId?: string
+  isHosted?: boolean
+}
+
+export type NacosDashBoardRessvcCount = {
+  count?: number
+  name?: string
+}
+
+export type NacosDashBoardRes = {
+  total?: number
+  health?: number
+  serviceCount?: number
+  configCount?: number
+  serviceRanking?: NacosDashBoardRessvcCount[]
 }

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

@@ -23,6 +23,17 @@ export enum ControlBehavior {
   WAITING_IN_QUEUE = "WAITING_IN_QUEUE",
 }
 
+export enum MachineType {
+  EMBEDDED = "EMBEDDED",
+  ALONE = "ALONE",
+}
+
+export enum ListClusterFlowClientStatus {
+  OFF = "OFF",
+  PENDING = "PENDING",
+  CONNECTED = "CONNECTED",
+}
+
 export enum DegradeRuleGrade {
   SLOW_REQUEST_RATIO = "SLOW_REQUEST_RATIO",
   ERROR_RATIO = "ERROR_RATIO",
@@ -103,6 +114,73 @@ export type ListResourceRes = {
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 
+export type ListClusterFlowServer = {
+  serverId?: string
+  port?: number
+  machineType?: MachineType
+  clientCount?: number
+  currentQps?: number
+  maxQps?: number
+}
+
+export type ListClusterFlowClient = {
+  clientId?: string
+  connectStatus?: ListClusterFlowClientStatus
+}
+
+export type ListClusterFlow = {
+  server?: ListClusterFlowServer
+  client?: ListClusterFlowClient
+}
+
+export type ListClusterFlowReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  appName?: string
+}
+
+export type DeleteClusterFlowReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  appName?: string
+  serverId?: string
+}
+
+export type ListClusterFlowRes = {
+  items?: ListClusterFlow[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListTokenServerReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  appName?: string
+}
+
+export type ListTokenServerRes = {
+  items?: string[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type TokenServerReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  appName?: string
+  machineType?: MachineType
+  machineId?: string
+  port?: number
+  maxQps?: number
+  clients?: string[]
+}
+
 export type FlowRule = {
   id?: string
   app?: string

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

@@ -45,6 +45,18 @@ export type VirtualhostConfig = {
   corsPolicy?: CorsPolicy
   tlsPolicy?: VirtualhostTLSPolicy
   jwtProviders?: JwtProvider[]
+  authPolicy?: AuthorizationPolicy
+}
+
+export type AuthorizationPolicy = {
+  disabled?: boolean
+  context?: {[key: string]: string}
+  authServer?: string
+  failOpen?: boolean
+  responseTimeout?: string
+  maxRequestBytes?: number
+  allowPartialMessage?: boolean
+  packAsBytes?: boolean
 }
 
 export type JwtProvider = {
@@ -101,6 +113,7 @@ export type VirtualhostInfo = {
   secretNamespaceName?: string
   healthCheckUrl?: string
   enableJWT?: boolean
+  enableAuth?: boolean
   namespaceName?: string
   apiCount?: number
   updatedAt?: string
@@ -130,6 +143,7 @@ export type GetVirtualhostRes = {
   corsPolicy?: CorsPolicy
   tlsPolicy?: VirtualhostTLSPolicy
   jwtProviders?: JwtProvider[]
+  authorizationPolicy?: AuthorizationPolicy
 }
 
 export type UpdateVirtualhostReq = {
@@ -208,10 +222,4 @@ export type LocalRateLimitPolicy = {
 export type TimeUnit = {
   time?: number
   unit?: TimeUnitUnit
-}
-
-export type Authorization = {
-}
-
-export type AuthPolicy = {
 }

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

@@ -250,6 +250,9 @@ export class Nacos {
   static CheckConfig(req: SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/configs/${req["dataId"]}/check?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "dataId"])}`, {...initReq, method: "GET"})
   }
+  static GetNacosDashBoard(req: SkoalaApiHostedV1alpha1Nacos.NacosDashBoardReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.NacosDashBoardRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.NacosDashBoardReq, SkoalaApiHostedV1alpha1Nacos.NacosDashBoardRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacos_dashboard?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }
 export class Sentinel {
   static GetInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes> {
@@ -261,6 +264,18 @@ export class Sentinel {
   static ListResource(req: SkoalaApiHostedV1alpha1Sentinel.ListResourceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.ListResourceRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListResourceReq, SkoalaApiHostedV1alpha1Sentinel.ListResourceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/resources?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName", "appName"])}`, {...initReq, method: "GET"})
   }
+  static ListClusterFlow(req: SkoalaApiHostedV1alpha1Sentinel.ListClusterFlowReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.ListClusterFlowRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListClusterFlowReq, SkoalaApiHostedV1alpha1Sentinel.ListClusterFlowRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/cluster-flows?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName", "appName"])}`, {...initReq, method: "GET"})
+  }
+  static ListTokenServer(req: SkoalaApiHostedV1alpha1Sentinel.ListTokenServerReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.ListTokenServerRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListTokenServerReq, SkoalaApiHostedV1alpha1Sentinel.ListTokenServerRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/token-servers?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName", "appName"])}`, {...initReq, method: "GET"})
+  }
+  static CreateOrUpdateTokenServer(req: SkoalaApiHostedV1alpha1Sentinel.TokenServerReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.TokenServerReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/token-servers`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static DeleteClusterFlow(req: SkoalaApiHostedV1alpha1Sentinel.DeleteClusterFlowReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.DeleteClusterFlowReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["appName"]}/cluster-flows/${req["serverId"]}`, {...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.13.0-4",
+  "version": "0.14.0-10",
   "description": "",
   "main": "index.js",
   "scripts": {