@daocloud-proto/skoala 0.5.1-6 → 0.5.1-60

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

@@ -12,6 +12,12 @@ export enum ListNamespaceReqGatewayStatus {
   Unavailable = "Unavailable",
 }
 
+export enum ListServiceReqServiceType {
+  ALL = "ALL",
+  SESAME = "SESAME",
+  K8S = "K8S",
+}
+
 export type ListWorkspaceReq = {
   page?: number
   pageSize?: number
@@ -49,6 +55,30 @@ export type ListNamespaceReq = {
   pageSize?: number
 }
 
+export type ListServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string[]
+  serviceType?: ListServiceReqServiceType
+  serviceName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListServiceRes = {
+  items?: ListServiceInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListServiceInfo = {
+  serviceName?: string
+  namespaceName?: string
+  labels?: {[key: string]: string}
+  createdAt?: string
+  sesameServiceName?: string
+  sesameNamespaceName?: string
+}
+
 export type ListNamespaceRes = {
   namespaceNames?: string[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination

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

@@ -5,7 +5,6 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
-import * as SkoalaApiHostedV1alpha1Gatewayservice from "./gatewayservice.pb"
 import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
@@ -17,6 +16,25 @@ type OneOf<T> =
         : never)
     : never);
 
+export enum HttpRetryOnEnum {
+  five_xx = "five_xx",
+  gateway_error = "gateway_error",
+  reset = "reset",
+  connect_failure = "connect_failure",
+  retriable_4xx = "retriable_4xx",
+  refused_stream = "refused_stream",
+  retriable_status_codes = "retriable_status_codes",
+  retriable_headers = "retriable_headers",
+}
+
+export enum GrpcRetryOnEnum {
+  cancelled = "cancelled",
+  deadline_exceeded = "deadline_exceeded",
+  internal = "internal",
+  resource_exhausted = "resource_exhausted",
+  unavailable = "unavailable",
+}
+
 export enum ValueMatchType {
   CONTAIN = "CONTAIN",
   EXACT = "EXACT",
@@ -48,6 +66,7 @@ export type CreateAPIReq = {
   clusterName?: string
   namespaceName?: string
   apiConfig?: APIConfig
+  advancedApiConfig?: AdvancedAPIConfig
 }
 
 export type AdvancedAPIReq = {
@@ -76,6 +95,23 @@ export type AdvancedAPIConfig = {
   loadBalancePolicy?: LoadBalancePolicy
   timeoutPolicy?: TimeoutPolicy
   pathRewritePolicy?: PathRewritePolicy
+  retryPolicy?: RetryPolicy
+}
+
+export type RetryPolicy = {
+  count?: string
+  perTryTimeout?: string
+  retriablesStatusCode?: number[]
+  httpRetryOn?: HttpRetryOn
+  grpcRetryOn?: GrpcRetryOn
+}
+
+export type HttpRetryOn = {
+  httpRetryOn?: HttpRetryOnEnum[]
+}
+
+export type GrpcRetryOn = {
+  grpcRetryOn?: GrpcRetryOnEnum[]
 }
 
 export type LoadBalancePolicy = {
@@ -130,15 +166,18 @@ export type DeleteAPIReq = {
   namespaceName?: string
 }
 
-export type GetAPIRes = {
+
+type BaseGetAPIRes = {
   apiName?: string
-  apiStatus?: SkoalaApiHostedV1alpha1Http.APIStatus
+  enabled?: boolean
   fqdn?: string
   matchRule?: MatchRule
-  targetService?: TargetService
   advancedPolicy?: AdvancedAPIConfig
 }
 
+export type GetAPIRes = BaseGetAPIRes
+  & OneOf<{ route: RouteAction; redirect: RedirectAction; directResponse: DirectResponse }>
+
 export type TargetService = {
   serviceList?: ServiceDetail[]
 }
@@ -162,7 +201,7 @@ export type ServiceDetail = {
 
 type BaseAPIConfig = {
   apiName?: string
-  virtualhost?: Virtualhost
+  fqdn?: string
   matchRule?: MatchRule
   enabled?: boolean
 }
@@ -200,16 +239,15 @@ export type RouteAction = {
   routeService?: RouteService[]
 }
 
-
-type BaseRouteService = {
+export type RouteService = {
   protocol?: SkoalaApiHostedV1alpha1Http.Protocol
+  enableGrpc?: boolean
+  serviceName?: string
+  namespaceName?: string
   port?: number
   weight?: number
 }
 
-export type RouteService = BaseRouteService
-  & OneOf<{ kubernetesService: SkoalaApiHostedV1alpha1Gatewayservice.KubernetesService; registryService: SkoalaApiHostedV1alpha1Gatewayservice.RegistryService; externalService: SkoalaApiHostedV1alpha1Gatewayservice.ExternalService }>
-
 export type RedirectAction = {
   hostname?: string
   path?: string
@@ -228,11 +266,12 @@ export type APIListReq = {
   clusterName?: string
   gatewayName?: string
   namespaceName?: string
+  apiName?: string
   page?: number
   pageSize?: number
 }
 
 export type APIListRes = {
-  api?: SkoalaApiHostedV1alpha1Http.APIInfo[]
+  items?: SkoalaApiHostedV1alpha1Http.APIInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }

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

@@ -5,7 +5,17 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
-export type SearchLogReq = {
+
+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);
+
+type BaseSearchLogReq = {
   workspaceId?: string
   gatewayName?: string
   clusterName?: string
@@ -13,9 +23,7 @@ export type SearchLogReq = {
   requestId?: string
   fqdn?: string
   requestPath?: string
-  statusCode?: string[]
   requestMethod?: string[]
-  message?: string
   startTime?: string
   endTime?: string
   sortOrder?: SortOrder[]
@@ -23,25 +31,43 @@ export type SearchLogReq = {
   pageSize?: number
 }
 
+export type SearchLogReq = BaseSearchLogReq
+  & OneOf<{ httpCode: string; grpcCode: string }>
+
 export type SortOrder = {
   orderBy?: SkoalaApiGeneralV1alpha1Common.OrderBy
   sortBy?: string
 }
 
 export type SearchLogRes = {
-  logResult?: LogResult[]
+  items?: LogResult[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 
 export type LogResult = {
   authority?: string
-  userAgent?: string
-  gatewayName?: string
   method?: string
-  xForwardedFor?: string
-  requestId?: string
-  path?: string
+  requestStartTime?: string
+  duration?: string
   upstreamServiceTime?: string
-  requestTime?: string
+  path?: string
+  requestId?: string
+  bytesReceived?: string
+  bytesSent?: string
+  downstreamDirectRemoteAddress?: string
+  hostname?: string
+  userAgent?: string
+  xForwardedFor?: string
+  responseFlags?: string
+  upstreamCluster?: string
+  upstreamHost?: string
+  upstreamLocalAddress?: string
+  upstreamRequestAttemptCount?: number
+  protocol?: string
+  upstreamProtocol?: string
+  status?: string
+  gatewayName?: string
+  gatewayNamespaceName?: string
+  responseEndTime?: string
   json?: string
 }

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

@@ -93,7 +93,7 @@ export type ListGatewayServiceReq = {
 }
 
 export type ListGatewayServiceRes = {
-  serviceInfo?: ServiceInfo[]
+  items?: ServiceInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 

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

@@ -39,6 +39,7 @@ export type APIInfo = {
   method?: HttpMethod[]
   requestPath?: string
   routeType?: RouteType
+  enabled?: boolean
   apiStatus?: APIStatus
   updatedAt?: string
 }

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

@@ -26,6 +26,7 @@ export type ListNacosReq = {
   workspaceId?: string
   clusterName?: string
   namespaceName?: string
+  nacosName?: string
   page?: number
   pageSize?: number
 }
@@ -42,11 +43,13 @@ export type Nacos = {
   namespaceName?: string
   type?: NacosConfigType
   serviceType?: SkoalaApiGeneralV1alpha1Service.ServiceType
-  nodePort?: number
+  nodePort?: string
   status?: NacosStatus
   replicas?: number
   image?: string
   version?: string
+  nodeCount?: number
+  healthNodeCount?: number
   database?: NacosDatabase
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   condition?: NacosCondition[]
@@ -120,8 +123,7 @@ export type NacosConfig = {
   type?: NacosConfigType
   version?: string
   replicas?: number
-  cpu?: string
-  memory?: string
+  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   serviceType?: SkoalaApiGeneralV1alpha1Service.ServiceType
   nodePort?: string
   databaseEnabled?: boolean

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

@@ -38,7 +38,7 @@ export type VirtualhostInfo = {
 }
 
 export type ListVirtualhostRes = {
-  virtualhost?: VirtualhostInfo[]
+  items?: VirtualhostInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 

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

@@ -38,6 +38,9 @@ export class Skoala {
   static ListClusterNamespace(req: SkoalaApiGeneralV1alpha1Skoala.ListNamespaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListNamespaceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListNamespaceReq, SkoalaApiGeneralV1alpha1Skoala.ListNamespaceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
   }
+  static ListClusterNamespaceService(req: SkoalaApiGeneralV1alpha1Skoala.ListServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListServiceRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...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"})
   }

package/package.json

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