@daocloud-proto/skoala 0.5.1 → 0.6.0

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

@@ -45,6 +45,14 @@ export enum PodPhase {
   PodPhaseFailed = "PodPhaseFailed",
 }
 
+export enum TimeUnit {
+  TIME_UNIT_UNSPECIFIED = "TIME_UNIT_UNSPECIFIED",
+  Day = "Day",
+  Hour = "Hour",
+  Minute = "Minute",
+  Second = "Second",
+}
+
 export type Cluster = {
   id?: string
   name?: string

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,60 @@ export type ListNamespaceReq = {
   pageSize?: number
 }
 
+export type ListMeshNamespaceReq = {
+  workspaceId?: string
+  meshId?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListMeshNamespaceRes = {
+  items?: string[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListMeshServiceReq = {
+  workspaceId?: string
+  meshId?: string
+  namespaceName?: string[]
+  page?: number
+  pageSize?: number
+}
+
+export type ListMeshServiceRes = {
+  items?: MeshServiceInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type MeshServiceInfo = {
+  serviceName?: string
+  namespaceName?: string
+}
+
+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
@@ -63,4 +123,13 @@ export type ListMeshReq = {
 export type ListMeshRes = {
   meshes?: SkoalaApiGeneralV1alpha1Common.Mesh[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListClaimReq = {
+  workspaceId?: string
+  clusterName?: string
+}
+
+export type ListClaimRes = {
+  items?: string[]
 }

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

@@ -5,8 +5,8 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
-import * as SkoalaApiHostedV1alpha1Gatewayservice from "./gatewayservice.pb"
 import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
+import * as SkoalaApiHostedV1alpha1Virtualhost from "./virtualhost.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
 type OneOf<T> =
@@ -17,6 +17,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 +67,7 @@ export type CreateAPIReq = {
   clusterName?: string
   namespaceName?: string
   apiConfig?: APIConfig
+  advancedApiConfig?: AdvancedAPIConfig
 }
 
 export type AdvancedAPIReq = {
@@ -76,6 +96,39 @@ export type AdvancedAPIConfig = {
   loadBalancePolicy?: LoadBalancePolicy
   timeoutPolicy?: TimeoutPolicy
   pathRewritePolicy?: PathRewritePolicy
+  retryPolicy?: RetryPolicy
+  websocketPolicy?: WebsocketPolicy
+  healthCheckPolicy?: HealthCheckPolicy
+  rateLimitPolicy?: SkoalaApiHostedV1alpha1Virtualhost.RateLimitPolicy
+}
+
+export type HealthCheckPolicy = {
+  healthThresholdCount?: string
+  host?: string
+  intervalSeconds?: string
+  path?: string
+  timeoutSeconds?: string
+  unhealthThresholdCount?: string
+}
+
+export type WebsocketPolicy = {
+  enabled?: boolean
+}
+
+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 = {
@@ -87,12 +140,17 @@ export type RequestHashPolicies = {
   hashSourceIp?: boolean
   terminal?: boolean
   headerHashPolicy?: HeaderHashPolicy
+  queryParameterHashPolicy?: QueryParameterHashPolicy
 }
 
 export type HeaderHashPolicy = {
   headerName?: string
 }
 
+export type QueryParameterHashPolicy = {
+  parameterName?: string
+}
+
 export type UpdateAPIReq = {
   apiName?: string
   workspaceId?: string
@@ -100,6 +158,21 @@ export type UpdateAPIReq = {
   clusterName?: string
   namespaceName?: string
   apiConfig?: APIConfig
+  advancedApiConfig?: AdvancedAPIConfig
+}
+
+export type UpdateAPIStatusReq = {
+  workspaceId?: string
+  gatewayName?: string
+  clusterName?: string
+  namespaceName?: string
+  apiName?: string
+  enabled?: boolean
+}
+
+export type UpdateAPIStatusRes = {
+  apiName?: string
+  enabled?: boolean
 }
 
 export type CreateAPIRes = {
@@ -130,15 +203,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 +238,7 @@ export type ServiceDetail = {
 
 type BaseAPIConfig = {
   apiName?: string
-  virtualhost?: Virtualhost
+  fqdn?: string
   matchRule?: MatchRule
   enabled?: boolean
 }
@@ -182,34 +258,25 @@ 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[]
 }
 
-
-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 +295,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/extension.pb.ts

@@ -0,0 +1,97 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
+export type GatewayRLSConfig = {
+  unit?: SkoalaApiGeneralV1alpha1Common.TimeUnit
+  requestsPerUnit?: number
+}
+
+export type CreateGatewayRLSReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+  config?: GatewayRLSConfig
+}
+
+export type CreateGatewayRLSRes = {
+}
+
+export type GetGatewayRLSReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type GetGatewayRLSRes = {
+  config?: GatewayRLSConfig
+}
+
+export type DeleteGatewayRLSReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type DeleteGatewayRLSRes = {
+}
+
+export type UpdateGatewayRLSReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+  config?: GatewayRLSConfig
+}
+
+export type UpdateGatewayRLSRes = {
+}
+
+export type GatewayAuthzConfig = {
+}
+
+export type CreateGatewayAuthzReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type CreateGatewayAuthzRes = {
+}
+
+export type GetGatewayAuthzReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type GetGatewayAuthzRes = {
+}
+
+export type DeleteGatewayAuthzReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type DeleteGatewayAuthzRes = {
+}
+
+export type UpdateGatewayAuthzReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
+}
+
+export type UpdateGatewayAuthzRes = {
+}

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

@@ -37,8 +37,7 @@ export type CreateExternalServiceReq = {
 }
 
 export type CreateExternalServiceRes = {
-  serviceName?: string
-  namespaceName?: string
+  sesameId?: string
 }
 
 export type GetGatewayServiceReq = {
@@ -46,7 +45,18 @@ export type GetGatewayServiceReq = {
   clusterName?: string
   gatewayName?: string
   namespaceName?: string
-  serviceName?: string
+  sesameId?: string
+}
+
+export type GetGatewayNamespaceReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  namespaceName?: string
+}
+
+export type GetGatewayNamespaceRes = {
+  namespaces?: string[]
 }
 
 export type UpdateGatewayServiceReq = {
@@ -54,13 +64,12 @@ export type UpdateGatewayServiceReq = {
   clusterName?: string
   gatewayName?: string
   namespaceName?: string
-  serviceName?: string
+  sesameId?: string
   externalServiceConf?: ExternalServiceConf
 }
 
 export type UpdateGatewayServiceRes = {
-  serviceName?: string
-  namespaceName?: string
+  sesameId?: string
 }
 
 export type DeleteGatewayServiceReq = {
@@ -68,17 +77,20 @@ export type DeleteGatewayServiceReq = {
   clusterName?: string
   gatewayName?: string
   namespaceName?: string
-  serviceName?: string
+  sesameId?: string
 }
 
 export type DeleteGatewayServiceRes = {
-  serviceName?: string
-  namespaceName?: string
+  sesameId?: string
 }
 
 export type GetGatewayServiceRes = {
-  serviceInfo?: ServiceInfo
+  externalServiceConf?: ExternalServiceConf
+  manageServiceConf?: ServiceInfo
+  serviceType?: SesameServiceType
   api?: SkoalaApiHostedV1alpha1Http.APIInfo[]
+  sesameId?: string
+  createdAt?: string
 }
 
 export type ListGatewayServiceReq = {
@@ -93,7 +105,7 @@ export type ListGatewayServiceReq = {
 }
 
 export type ListGatewayServiceRes = {
-  serviceInfo?: ServiceInfo[]
+  items?: ServiceInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 
@@ -102,20 +114,23 @@ export type ServiceInfo = {
   address?: Address
   apiCount?: number
   sourceInfo?: ServiceSourceInfo
-  createAt?: string
+  createdAt?: string
   serviceType?: SesameServiceType
-  sesameServiceName?: string
-  sesameServiceNamespace?: string
+  sesameId?: string
 }
 
 export type ServiceSourceInfo = {
   serviceSource?: ServiceSource
-  clusterName?: string
-  k8SNamespaceName?: string
+  kubernetesClusterName?: string
+  kubernetesNamespaceName?: string
   registrationId?: string
+  registrationName?: string
   registrationType?: string
   nacosNamespaceId?: string
-  groupName?: string
+  nacosGroupName?: string
+  meshId?: string
+  meshName?: string
+  meshNamespaceName?: string
 }
 
 
@@ -123,7 +138,15 @@ type BaseExternalServiceConf = {
 }
 
 export type ExternalServiceConf = BaseExternalServiceConf
-  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService }>
+  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService; meshService: MeshService }>
+
+export type MeshService = {
+  meshId?: string
+  meshName?: string
+  serviceName?: string
+  namespaceName?: string
+  address?: Address
+}
 
 export type KubernetesService = {
   clusterId?: string
@@ -136,6 +159,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",
@@ -11,7 +20,6 @@ export enum HttpMethod {
   PUT = "PUT",
   PATCH = "PATCH",
   OPTIONS = "OPTIONS",
-  ALL = "ALL",
 }
 
 export enum Protocol {
@@ -33,12 +41,26 @@ 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
   method?: HttpMethod[]
   requestPath?: string
   routeType?: RouteType
+  enabled?: boolean
   apiStatus?: APIStatus
   updatedAt?: string
 }