@daocloud-proto/skoala 0.5.1-70 → 0.5.1-76

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

@@ -96,6 +96,21 @@ export type AdvancedAPIConfig = {
   timeoutPolicy?: TimeoutPolicy
   pathRewritePolicy?: PathRewritePolicy
   retryPolicy?: RetryPolicy
+  websocketPolicy?: WebsocketPolicy
+  healthCheckPolicy?: HealthCheckPolicy
+}
+
+export type HealthCheckPolicy = {
+  healthThresholdCount?: string
+  host?: string
+  intervalSeconds?: string
+  path?: string
+  timeoutSeconds?: string
+  unhealthThresholdCount?: string
+}
+
+export type WebsocketPolicy = {
+  enabled?: boolean
 }
 
 export type RetryPolicy = {
@@ -221,20 +236,12 @@ export type Certificate = {
 
 type BaseMatchRule = {
   httpMethod?: SkoalaApiHostedV1alpha1Http.HttpMethod[]
-  headers?: HeaderRule[]
+  headers?: SkoalaApiHostedV1alpha1Http.HeaderRule[]
 }
 
 export type MatchRule = BaseMatchRule
   & OneOf<{ path: string; prefix: string }>
 
-
-type BaseHeaderRule = {
-  name?: string
-}
-
-export type HeaderRule = BaseHeaderRule
-  & OneOf<{ contains: string; exact: string; notContains: string; notExact: string; present: boolean; notPresent: boolean }>
-
 export type RouteAction = {
   routeService?: RouteService[]
 }

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

@@ -110,12 +110,13 @@ export type ServiceInfo = {
 
 export type ServiceSourceInfo = {
   serviceSource?: ServiceSource
-  clusterName?: string
+  k8SClusterName?: string
   k8SNamespaceName?: string
   registrationId?: string
+  registrationName?: string
   registrationType?: string
   nacosNamespaceId?: string
-  groupName?: string
+  nacosGroupName?: string
 }
 
 
@@ -136,6 +137,7 @@ export type KubernetesService = {
 
 type BaseRegistryService = {
   registrationId?: string
+  registrationName?: string
 }
 
 export type RegistryService = BaseRegistryService

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

@@ -4,6 +4,15 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
 export enum HttpMethod {
   GET = "GET",
   POST = "POST",
@@ -19,6 +28,12 @@ export enum Protocol {
   HTTPS = "HTTPS",
 }
 
+export enum TimeUnit {
+  SECOND = "SECOND",
+  MINUTE = "MINUTE",
+  HOUR = "HOUR",
+}
+
 export enum RouteType {
   CLUSTRE_SERVER = "CLUSTRE_SERVER",
   DIRECT = "DIRECT",
@@ -33,6 +48,19 @@ export enum APIStatus {
   DOWN = "DOWN",
 }
 
+export type Header = {
+  name?: string
+  value?: string
+}
+
+
+type BaseHeaderRule = {
+  name?: string
+}
+
+export type HeaderRule = BaseHeaderRule
+  & OneOf<{ contains: string; exact: string; notContains: string; notExact: string; present: boolean; notPresent: boolean }>
+
 export type APIInfo = {
   apiName?: string
   fqdn?: string

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

@@ -149,4 +149,16 @@ export type ListNacosServiceReq = {
 export type ListNacosServiceRes = {
   count?: number
   doms?: string[]
+}
+
+export type GetNacosServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  namespaceId?: string
+  serviceName?: string
+}
+
+export type GetNacosServiceAPIRes = {
 }

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

@@ -6,13 +6,28 @@
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
 import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
 export type CreateVirtualhostReq = {
   workspaceId?: string
   gatewayName?: string
   clusterName?: string
   namespaceName?: string
+  virtualhostConfig?: VirtualhostConfig
+}
+
+export type VirtualhostConfig = {
   fqdn?: string
   protocol?: SkoalaApiHostedV1alpha1Http.Protocol
+  rateLimitPolicy?: RateLimitPolicy
+  corsPolicy?: CorsPolicy
 }
 
 export type CreateVirtualhostRes = {
@@ -34,6 +49,7 @@ export type VirtualhostInfo = {
   protocol?: SkoalaApiHostedV1alpha1Http.Protocol
   secretName?: string
   namespaceName?: string
+  apiCount?: number
   updatedAt?: string
 }
 
@@ -53,6 +69,8 @@ export type GetVirtualhostReq = {
 export type GetVirtualhostRes = {
   fqdn?: string
   protocol?: SkoalaApiHostedV1alpha1Http.Protocol
+  rateLimitPolicy?: RateLimitPolicy
+  corsPolicy?: CorsPolicy
 }
 
 export type UpdateVirtualhostReq = {
@@ -60,8 +78,8 @@ export type UpdateVirtualhostReq = {
   gatewayName?: string
   clusterName?: string
   namespaceName?: string
+  virtualhostConfig?: VirtualhostConfig
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type UpdateVirtualhostRes = {
@@ -81,9 +99,59 @@ export type DeleteVirtualhostRes = {
 }
 
 export type CorsPolicy = {
+  allowCredentials?: boolean
+  allowHeaders?: string[]
+  allowOrigin?: string[]
+  exposeHeaders?: string[]
+  maxAge?: string
+  allowMethod?: SkoalaApiHostedV1alpha1Http.HttpMethod[]
 }
 
 export type RateLimitPolicy = {
+  global?: GlobalRateLimitPolicy
+  local?: LocalRateLimitPolicy
+}
+
+export type GlobalRateLimitPolicy = {
+  descriptors?: RateLimitDescriptor[]
+}
+
+export type RateLimitDescriptor = {
+  entries?: RateLimitDescriptorEntry[]
+}
+
+
+type BaseRateLimitDescriptorEntry = {
+}
+
+export type RateLimitDescriptorEntry = BaseRateLimitDescriptorEntry
+  & OneOf<{ genericKey: GenericKeyDescriptor; requestHeader: RequestHeaderDescriptor; requestHeaderValueMatch: RequestHeaderValueMatchDescriptor; remoteAddress: RemoteAddressDescriptor }>
+
+export type GenericKeyDescriptor = {
+  key?: string
+  value?: string
+}
+
+export type RequestHeaderDescriptor = {
+  headerName?: string
+  descriptorKey?: string
+}
+
+export type RequestHeaderValueMatchDescriptor = {
+  headers?: SkoalaApiHostedV1alpha1Http.HeaderRule[]
+  expectMatch?: boolean
+  value?: string
+}
+
+export type RemoteAddressDescriptor = {
+}
+
+export type LocalRateLimitPolicy = {
+  burst?: number
+  request?: number
+  responseHeadersToAdd?: SkoalaApiHostedV1alpha1Http.Header[]
+  responseStatusCode?: number
+  unit?: SkoalaApiHostedV1alpha1Http.TimeUnit
 }
 
 export type Tls = {

package/api/integrated/v1alpha1/service.pb.ts

@@ -44,6 +44,9 @@ export type GetServiceRes = {
   service?: Service
 }
 
+export type GetServiceAPIRes = {
+}
+
 export type NamespaceWithGroup = {
   id?: string
   name?: string

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

@@ -72,6 +72,9 @@ export class Registry {
   static GetService(req: SkoalaApiIntegratedV1alpha1Service.GetServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Service.GetServiceRes> {
     return fm.fetchReq<SkoalaApiIntegratedV1alpha1Service.GetServiceReq, SkoalaApiIntegratedV1alpha1Service.GetServiceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/registries/${req["registryId"]}/services/${req["serviceName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "registryId", "serviceName"])}`, {...initReq, method: "GET"})
   }
+  static GetServiceAPI(req: SkoalaApiIntegratedV1alpha1Service.GetServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Service.GetServiceAPIRes> {
+    return fm.fetchReq<SkoalaApiIntegratedV1alpha1Service.GetServiceReq, SkoalaApiIntegratedV1alpha1Service.GetServiceAPIRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/registries/${req["registryId"]}/services/${req["serviceName"]}/apis?${fm.renderURLSearchParams(req, ["workspaceId", "registryId", "serviceName"])}`, {...initReq, method: "GET"})
+  }
   static ListInstance(req: SkoalaApiIntegratedV1alpha1Instance.ListInstanceReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Instance.ListInstanceRes> {
     return fm.fetchReq<SkoalaApiIntegratedV1alpha1Instance.ListInstanceReq, SkoalaApiIntegratedV1alpha1Instance.ListInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/registries/${req["registryId"]}/services/${req["serviceName"]}/instances?${fm.renderURLSearchParams(req, ["workspaceId", "registryId", "serviceName"])}`, {...initReq, method: "GET"})
   }
@@ -101,6 +104,12 @@ export class Nacos {
   static ListService(req: SkoalaApiHostedV1alpha1Nacos.ListNacosServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.ListNacosServiceRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.ListNacosServiceReq, SkoalaApiHostedV1alpha1Nacos.ListNacosServiceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["namespaceId"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "namespaceId"])}`, {...initReq, method: "GET"})
   }
+  static GetService(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["namespaceId"]}/services/${req["serviceName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "namespaceId", "serviceName"])}`, {...initReq, method: "GET"})
+  }
+  static GetServiceAPI(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["namespaceId"]}/services/${req["serviceName"]}/apis?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "namespaceId", "serviceName"])}`, {...initReq, method: "GET"})
+  }
   static ListNamespace(req: SkoalaApiHostedV1alpha1Nacos.ListNacosServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.ListNacosServiceRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.ListNacosServiceReq, SkoalaApiHostedV1alpha1Nacos.ListNacosServiceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName"])}`, {...initReq, method: "GET"})
   }

package/api/swagger/v1alpha1/swagger.pb.ts

@@ -0,0 +1 @@
+export default {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.5.1-70",
+  "version": "0.5.1-76",
   "description": "",
   "main": "index.js",
   "scripts": {