@daocloud-proto/skoala 0.12.2 → 0.13.0

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

@@ -57,6 +57,7 @@ export enum TimeUnit {
   Hour = "Hour",
   Minute = "Minute",
   Second = "Second",
+  Millisecond = "Millisecond",
 }
 
 export enum PluginSwitchStatus {
@@ -114,4 +115,16 @@ export type Image = {
 export type Component = {
   name?: string
   images?: {[key: string]: Image}
+}
+
+export type Mysql = {
+  id?: string
+  name?: string
+  address?: string
+}
+
+export type Redis = {
+  id?: string
+  name?: string
+  address?: string
 }

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

@@ -12,6 +12,15 @@ export enum ListNamespaceReqGatewayStatus {
   Unavailable = "Unavailable",
 }
 
+export enum RegistryServiceInfoRegistryType {
+  NACOS = "NACOS",
+  EUREKA = "EUREKA",
+  KUBERNETES = "KUBERNETES",
+  ZOOKEEPER = "ZOOKEEPER",
+  MESH = "MESH",
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+}
+
 export enum ListServiceReqServiceType {
   ALL = "ALL",
   SESAME = "SESAME",
@@ -77,6 +86,32 @@ export type ListMeshServiceReq = {
   pageSize?: number
 }
 
+export type ListRegistryServiceReq = {
+  workspaceId?: string
+  registryId?: string
+  serviceName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListRegistryServiceRes = {
+  items?: RegistryServiceInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type RegistryServiceInfo = {
+  serviceName?: string
+  sesameId?: string
+  meshId?: string
+  meshName?: string
+  meshNamespaceName?: string
+  nacosNamespaceId?: string
+  nacosGroupName?: string
+  kubernetesClusterName?: string
+  kubernetesNamespaceName?: string
+  registryType?: RegistryServiceInfoRegistryType
+}
+
 export type ListMeshServiceRes = {
   items?: MeshServiceInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
@@ -146,4 +181,26 @@ export type GetPrerequisiteReq = {
 
 export type GetPrerequisiteRes = {
   ok?: boolean
+}
+
+export type ListMysqlReq = {
+  workspaceId?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListMysqlRes = {
+  items?: SkoalaApiGeneralV1alpha1Common.Mysql[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListRedisReq = {
+  workspaceId?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListRedisRes = {
+  items?: SkoalaApiGeneralV1alpha1Common.Redis[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }

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

@@ -100,6 +100,12 @@ export type AdvancedAPIConfig = {
   rateLimitPolicy?: SkoalaApiHostedV1alpha1Virtualhost.RateLimitPolicy
   requestHeadersPolicy?: HeaderPolicy
   responseHeadersPolicy?: HeaderPolicy
+  jwtPolicy?: JWTPolicy
+}
+
+export type JWTPolicy = {
+  require?: string
+  disabled?: boolean
 }
 
 export type HeaderPolicy = {

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

@@ -76,7 +76,7 @@ export enum LogLogLevel {
   Trace = "Trace",
   Debug = "Debug",
   Info = "Info",
-  Warning = "Warning",
+  Warn = "Warn",
   Error = "Error",
   Critical = "Critical",
   Off = "Off",

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

@@ -86,6 +86,25 @@ export type GetAppsSentinelGrafanaRes = {
   zhUrl?: string
 }
 
+export type Resource = {
+  name?: string
+}
+
+export type ListResourceReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  sentinelName?: string
+  appName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListResourceRes = {
+  items?: Resource[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
 export type FlowRule = {
   id?: string
   app?: string

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

@@ -15,6 +15,21 @@ type OneOf<T> =
       (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
         : never)
     : never);
+
+export enum RemoteJWKSDnsLookupFamily {
+  auto = "auto",
+  v4 = "v4",
+  v6 = "v6",
+}
+
+export enum TimeUnitUnit {
+  Hour = "Hour",
+  Minute = "Minute",
+  Second = "Second",
+  Millisecond = "Millisecond",
+  Nanosecond = "Nanosecond",
+}
+
 export type CreateVirtualhostReq = {
   workspaceId?: string
   gatewayName?: string
@@ -33,8 +48,9 @@ export type VirtualhostConfig = {
 }
 
 export type JwtProvider = {
-  audiences?: string
+  audiences?: string[]
   default?: boolean
+  forwardJWT?: boolean
   issuer?: string
   name?: string
   remoteJwks?: RemoteJWKS
@@ -45,10 +61,12 @@ export type RemoteJWKS = {
   timeout?: string
   uri?: string
   validation?: Validation
+  dnsLookupFamily?: RemoteJWKSDnsLookupFamily
 }
 
 export type Validation = {
-  caSecret?: string
+  caSecretName?: string
+  caSecretNamespace?: string
   subjectName?: string
 }
 
@@ -82,6 +100,7 @@ export type VirtualhostInfo = {
   secretName?: string
   secretNamespaceName?: string
   healthCheckUrl?: string
+  enableJWT?: boolean
   namespaceName?: string
   apiCount?: number
   updatedAt?: string
@@ -110,6 +129,7 @@ export type GetVirtualhostRes = {
   rateLimitPolicy?: RateLimitPolicy
   corsPolicy?: CorsPolicy
   tlsPolicy?: VirtualhostTLSPolicy
+  jwtProviders?: JwtProvider[]
 }
 
 export type UpdateVirtualhostReq = {
@@ -185,6 +205,11 @@ export type LocalRateLimitPolicy = {
   unit?: SkoalaApiGeneralV1alpha1Common.TimeUnit
 }
 
+export type TimeUnit = {
+  time?: number
+  unit?: TimeUnitUnit
+}
+
 export type Authorization = {
 }
 

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

@@ -57,6 +57,9 @@ export class Skoala {
   static ListMeshNamespaceServices(req: SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...initReq, method: "GET"})
   }
+  static ListRegistryServices(req: SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/registry/${req["registryId"]}/services/gateway?${fm.renderURLSearchParams(req, ["workspaceId", "registryId"])}`, {...initReq, method: "GET"})
+  }
   static ListWorkspace(req: SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes>(`/apis/skoala.io/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
@@ -69,6 +72,12 @@ export class Skoala {
   static GetPrerequisite(req: SkoalaApiGeneralV1alpha1Skoala.GetPrerequisiteReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.GetPrerequisiteRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.GetPrerequisiteReq, SkoalaApiGeneralV1alpha1Skoala.GetPrerequisiteRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/prerequisites/${req["prerequisite"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "prerequisite"])}`, {...initReq, method: "GET"})
   }
+  static ListMysql(req: SkoalaApiGeneralV1alpha1Skoala.ListMysqlReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListMysqlRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMysqlReq, SkoalaApiGeneralV1alpha1Skoala.ListMysqlRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/mysqls?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static ListRedis(req: SkoalaApiGeneralV1alpha1Skoala.ListRedisReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListRedisRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListRedisReq, SkoalaApiGeneralV1alpha1Skoala.ListRedisRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/redis?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }
 export class Registry {
   static List(req: SkoalaApiIntegratedV1alpha1Registry.ListRegistryReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Registry.ListRegistryRes> {
@@ -249,6 +258,9 @@ export class Sentinel {
   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/services/${req["serviceName"]}/instances/${req["instanceIp"]}/heartbeat-ports/${req["heartbeatPort"]}`, {...initReq, method: "DELETE"})
   }
+  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 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.12.2",
+  "version": "0.13.0",
   "description": "",
   "main": "index.js",
   "scripts": {