@daocloud-proto/skoala 0.4.1-148 → 0.4.1-150

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

@@ -5,6 +5,7 @@
 */
 
 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 };
@@ -33,20 +34,6 @@ export enum RedirectResponseCode {
   PERMANENT_REDIRECT = "PERMANENT_REDIRECT",
 }
 
-export enum RouteType {
-  CLUSTRE_SERVER = "CLUSTRE_SERVER",
-  DIRECT = "DIRECT",
-  REDIRECT = "REDIRECT",
-  EXTERNAL = "EXTERNAL",
-  REGISTRY = "REGISTRY",
-  UNKNOW = "UNKNOW",
-}
-
-export enum APIStatus {
-  UP = "UP",
-  DOWN = "DOWN",
-}
-
 export type CreateAPIReq = {
   workspaceId?: string
   gatewayName?: string
@@ -91,7 +78,7 @@ export type DeleteAPIReq = {
 
 export type GetAPIRes = {
   apiName?: string
-  apiStatus?: APIStatus
+  apiStatus?: SkoalaApiHostedV1alpha1Http.APIStatus
   fqdn?: string
   matchRule?: MatchRule
   targetService?: TargetService
@@ -112,7 +99,7 @@ export type ServiceDetail = {
   weight?: string
   nacosNamespaceId?: string
   groupName?: string
-  routeType?: RouteType
+  routeType?: SkoalaApiHostedV1alpha1Http.RouteType
   path?: string
   statusCode?: number
 }
@@ -166,52 +153,7 @@ type BaseRouteService = {
 }
 
 export type RouteService = BaseRouteService
-  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService }>
-
-export type KubernetesService = {
-  clusterId?: string
-  clusterName?: string
-  namespaceName?: string
-  serviceName?: string
-  address?: string
-}
-
-export type ExternalService = {
-  serviceName?: string
-  address?: string
-}
-
-
-type BaseRegistryService = {
-  registryId?: string
-}
-
-export type RegistryService = BaseRegistryService
-  & OneOf<{ eurekaService: EurekaService; nacosService: NacosService; zookeeperService: ZookeeperService; kubernetesService: KubernetesService }>
-
-export type EurekaService = {
-  address?: string
-  serviceName?: string
-}
-
-export type NacosService = {
-  address?: string
-  serviceName?: string
-  namespaceId?: string
-  groupName?: string
-}
-
-export type ZookeeperService = {
-  address?: string
-  serviceName?: string
-}
-
-export type MeshService = {
-  instanceId?: string
-}
-
-export type ApplicationService = {
-}
+  & OneOf<{ kubernetesService: SkoalaApiHostedV1alpha1Gatewayservice.KubernetesService; registryService: SkoalaApiHostedV1alpha1Gatewayservice.RegistryService; externalService: SkoalaApiHostedV1alpha1Gatewayservice.ExternalService }>
 
 export type RedirectAction = {
   hostname?: string
@@ -236,16 +178,6 @@ export type APIListReq = {
 }
 
 export type APIListRes = {
-  api?: APIInfo[]
+  api?: SkoalaApiHostedV1alpha1Http.APIInfo[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
-}
-
-export type APIInfo = {
-  apiName?: string
-  fqdn?: string
-  method?: SkoalaApiHostedV1alpha1Http.HttpMethod[]
-  requestPath?: string
-  routeType?: RouteType
-  apiStatus?: APIStatus
-  updatedAt?: string
 }

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

@@ -0,0 +1,170 @@
+/* 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"
+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 enum ServiceSource {
+  SOURCE_CLUSTER = "SOURCE_CLUSTER",
+  SOURCE_MESH = "SOURCE_MESH",
+  SOURCE_REGISTRY = "SOURCE_REGISTRY",
+  SOURCE_EXTERNAL = "SOURCE_EXTERNAL",
+}
+
+export enum SesameServiceType {
+  EXTERNAL_SERVICE = "EXTERNAL_SERVICE",
+  MANAGE_SERVICE = "MANAGE_SERVICE",
+}
+
+export type CreateExternalServiceReq = {
+  workspaceId?: string
+  gatewayName?: string
+  clusterName?: string
+  namespaceName?: string
+  externalServiceConf?: ExternalServiceConf
+}
+
+export type CreateExternalServiceRes = {
+  serviceName?: string
+  namespaceName?: string
+}
+
+export type GetGatewayServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  namespaceName?: string
+  serviceName?: string
+}
+
+export type UpdateGatewayServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  namespaceName?: string
+  serviceName?: string
+  externalServiceConf?: ExternalServiceConf
+}
+
+export type UpdateGatewayServiceRes = {
+  serviceName?: string
+  namespaceName?: string
+}
+
+export type DeleteGatewayServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  namespaceName?: string
+  serviceName?: string
+}
+
+export type DeleteGatewayServiceRes = {
+  serviceName?: string
+  namespaceName?: string
+}
+
+export type GetGatewayServiceRes = {
+  serviceInfo?: ServiceInfo
+  api?: SkoalaApiHostedV1alpha1Http.APIInfo[]
+}
+
+export type ListGatewayServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  namespaceName?: string
+  serviceName?: string
+  serviceType?: SesameServiceType
+  page?: number
+  pageSize?: number
+}
+
+export type ListGatewayServiceRes = {
+  serviceInfo?: ServiceInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ServiceInfo = {
+  serviceName?: string
+  address?: Address
+  apiCount?: number
+  sourceInfo?: ServiceSourceInfo
+  createAt?: string
+  serviceType?: SesameServiceType
+  sesameServiceName?: string
+  sesameServiceNamespace?: string
+}
+
+export type ServiceSourceInfo = {
+  serviceSource?: ServiceSource
+  clusterName?: string
+  k8SNamespaceName?: string
+  registrationId?: string
+  registrationType?: string
+  nacosNamespaceId?: string
+  groupName?: string
+}
+
+
+type BaseExternalServiceConf = {
+}
+
+export type ExternalServiceConf = BaseExternalServiceConf
+  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService }>
+
+export type KubernetesService = {
+  clusterId?: string
+  clusterName?: string
+  namespaceName?: string
+  serviceName?: string
+  address?: Address
+}
+
+
+type BaseRegistryService = {
+  registrationId?: string
+}
+
+export type RegistryService = BaseRegistryService
+  & OneOf<{ eurekaService: EurekaService; nacosService: NacosService; zookeeperService: ZookeeperService; kubernetesService: KubernetesService }>
+
+export type EurekaService = {
+  address?: Address
+  serviceName?: string
+}
+
+export type NacosService = {
+  address?: Address
+  serviceName?: string
+  namespaceId?: string
+  groupName?: string
+}
+
+export type ZookeeperService = {
+  address?: Address
+  serviceName?: string
+}
+
+export type ExternalService = {
+  serviceName?: string
+  address?: Address
+}
+
+export type Address = {
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
+  hostname?: string
+  port?: number
+}

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

@@ -17,4 +17,28 @@ export enum HttpMethod {
 export enum Protocol {
   HTTP = "HTTP",
   HTTPS = "HTTPS",
+}
+
+export enum RouteType {
+  CLUSTRE_SERVER = "CLUSTRE_SERVER",
+  DIRECT = "DIRECT",
+  REDIRECT = "REDIRECT",
+  EXTERNAL = "EXTERNAL",
+  REGISTRY = "REGISTRY",
+  UNKNOW = "UNKNOW",
+}
+
+export enum APIStatus {
+  UP = "UP",
+  DOWN = "DOWN",
+}
+
+export type APIInfo = {
+  apiName?: string
+  fqdn?: string
+  method?: HttpMethod[]
+  requestPath?: string
+  routeType?: RouteType
+  apiStatus?: APIStatus
+  updatedAt?: string
 }

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

@@ -11,6 +11,7 @@ import * as SkoalaApiGeneralV1alpha1Version from "../../general/v1alpha1/version
 import * as SkoalaApiHostedV1alpha1Api from "../../hosted/v1alpha1/api.pb"
 import * as SkoalaApiHostedV1alpha1Apilog from "../../hosted/v1alpha1/apilog.pb"
 import * as SkoalaApiHostedV1alpha1Gateway from "../../hosted/v1alpha1/gateway.pb"
+import * as SkoalaApiHostedV1alpha1Gatewayservice from "../../hosted/v1alpha1/gatewayservice.pb"
 import * as SkoalaApiHostedV1alpha1Nacos from "../../hosted/v1alpha1/nacos.pb"
 import * as SkoalaApiHostedV1alpha1Sentinel from "../../hosted/v1alpha1/sentinel.pb"
 import * as SkoalaApiHostedV1alpha1Virtualhost from "../../hosted/v1alpha1/virtualhost.pb"
@@ -166,6 +167,21 @@ export class Gateway {
   static QueryGatewayPodMetric(req: SkoalaApiHostedV1alpha1Gateway.QueryGatewayPodMetricReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.QueryGatewayPodMetricRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.QueryGatewayPodMetricReq, SkoalaApiHostedV1alpha1Gateway.QueryGatewayPodMetricRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterId"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/metric/pods/${req["podName"]}/query?${fm.renderURLSearchParams(req, ["workspaceId", "clusterId", "namespaceName", "gatewayName", "podName"])}`, {...initReq, method: "GET"})
   }
+  static CreateService(req: SkoalaApiHostedV1alpha1Gatewayservice.CreateExternalServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gatewayservice.CreateExternalServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gatewayservice.CreateExternalServiceReq, SkoalaApiHostedV1alpha1Gatewayservice.CreateExternalServiceRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/services`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static ListService(req: SkoalaApiHostedV1alpha1Gatewayservice.ListGatewayServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gatewayservice.ListGatewayServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gatewayservice.ListGatewayServiceReq, SkoalaApiHostedV1alpha1Gatewayservice.ListGatewayServiceRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName"])}`, {...initReq, method: "GET"})
+  }
+  static GetService(req: SkoalaApiHostedV1alpha1Gatewayservice.GetGatewayServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gatewayservice.GetGatewayServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gatewayservice.GetGatewayServiceReq, SkoalaApiHostedV1alpha1Gatewayservice.GetGatewayServiceRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/services/${req["serviceName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName", "serviceName"])}`, {...initReq, method: "GET"})
+  }
+  static UpdateService(req: SkoalaApiHostedV1alpha1Gatewayservice.UpdateGatewayServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gatewayservice.UpdateGatewayServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gatewayservice.UpdateGatewayServiceReq, SkoalaApiHostedV1alpha1Gatewayservice.UpdateGatewayServiceRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/services/${req["serviceName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
+  static DeleteService(req: SkoalaApiHostedV1alpha1Gatewayservice.DeleteGatewayServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gatewayservice.DeleteGatewayServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gatewayservice.DeleteGatewayServiceReq, SkoalaApiHostedV1alpha1Gatewayservice.DeleteGatewayServiceRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/services/${req["serviceName"]}`, {...initReq, method: "DELETE"})
+  }
   static CreateVirtualhost(req: SkoalaApiHostedV1alpha1Virtualhost.CreateVirtualhostReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Virtualhost.CreateVirtualhostRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Virtualhost.CreateVirtualhostReq, SkoalaApiHostedV1alpha1Virtualhost.CreateVirtualhostRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/virtualhosts`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }

package/package.json

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