@daocloud-proto/skoala 0.4.1-53 → 0.4.1-59

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

@@ -5,7 +5,7 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
-import * as SkoalaApiHostedV1alpha1Api-basic from "./api-basic.pb"
+import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
 type OneOf<T> =
@@ -107,7 +107,7 @@ export type ServiceDetail = {
   serviceName?: string
   registrationId?: string
   address?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
   port?: number
   weight?: string
   nacosNamespaceId?: string
@@ -130,7 +130,7 @@ export type APIConfig = BaseAPIConfig
 
 export type Virtualhost = {
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type Certificate = {
@@ -139,7 +139,7 @@ export type Certificate = {
 
 
 type BaseMatchRule = {
-  httpMethod?: SkoalaApiHostedV1alpha1Api-basic.HttpMethod[]
+  httpMethod?: SkoalaApiHostedV1alpha1Http.HttpMethod[]
   headers?: HeaderRule[]
 }
 
@@ -160,7 +160,7 @@ export type RouteAction = {
 
 
 type BaseRouteService = {
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
   port?: number
   weight?: number
 }
@@ -218,7 +218,7 @@ export type RedirectAction = {
   path?: string
   port?: number
   statusCode?: number
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type DirectResponse = {
@@ -243,7 +243,7 @@ export type APIListRes = {
 export type APIInfo = {
   apiName?: string
   fqdn?: string
-  method?: SkoalaApiHostedV1alpha1Api-basic.HttpMethod[]
+  method?: SkoalaApiHostedV1alpha1Http.HttpMethod[]
   requestPath?: string
   routeType?: RouteType
   apiStatus?: APIStatus

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

@@ -38,7 +38,7 @@ export type Node = {
 }
 
 export type Gateway = {
-  workspaceId?: number
+  workspaceId?: string
   clusterName?: string
   namespaceName?: string
   name?: string
@@ -48,18 +48,19 @@ export type Gateway = {
   endpoints?: string[]
   contour?: Node
   envoy?: Node
+  apiCount?: number
   config?: GatewayConfig
 }
 
 export type ListAllGatewayReq = {
-  workspaceId?: number
+  workspaceId?: string
   page?: number
   pageSize?: number
   filter?: string
 }
 
 export type ListClusterGatewayReq = {
-  workspaceId?: number
+  workspaceId?: string
   clusterName?: string
   page?: number
   pageSize?: number
@@ -73,10 +74,10 @@ export type ListGatewayRes = {
 }
 
 export type GetGatewayReq = {
-  workspaceId?: number
+  workspaceId?: string
   clusterName?: string
   namespaceName?: string
-  gatewayName?: string
+  name?: string
 }
 
 export type GetGatewayRes = {
@@ -109,6 +110,7 @@ export type HostIPs = {
 
 export type EnvoyService = {
   type?: ServiceType
+  enableHttps?: boolean
 }
 
 export type EnvoyServicePro = {
@@ -162,7 +164,7 @@ export type ContourNormalConfigPro = {
 }
 
 export type CreateGatewayReq = {
-  workspaceId?: number
+  workspaceId?: string
   name?: string
   clusterName?: string
   namespaceName?: string
@@ -170,7 +172,7 @@ export type CreateGatewayReq = {
 }
 
 export type CreateGatewayProReq = {
-  workspaceId?: number
+  workspaceId?: string
   name?: string
   clusterName?: string
   namespaceName?: string
@@ -179,26 +181,26 @@ export type CreateGatewayProReq = {
 }
 
 export type UpdateGatewayReq = {
-  workspaceId?: number
-  gatewayName?: string
+  workspaceId?: string
+  name?: string
   clusterName?: string
   namespaceName?: string
   config?: GatewayConfig
 }
 
 export type UpdateGatewayProReq = {
-  workspaceId?: number
-  gatewayName?: string
+  workspaceId?: string
+  name?: string
   clusterName?: string
   namespaceName?: string
   config?: GatewayConfigPro
 }
 
 export type DeleteGatewayReq = {
-  workspaceId?: number
+  workspaceId?: string
   clusterName?: string
   namespaceName?: string
-  gatewayName?: string
+  name?: string
 }
 
 export type DeleteGatewayRes = {
@@ -272,10 +274,10 @@ export type GetImagesRes = {
 }
 
 export type GetGatewayStatusReq = {
-  workspaceId?: number
+  workspaceId?: string
   clusterName?: string
   namespaceName?: string
-  gatewayName?: string
+  name?: string
 }
 
 export type GetGatewayStatusRes = {

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

@@ -5,14 +5,14 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
-import * as SkoalaApiHostedV1alpha1Api-basic from "./api-basic.pb"
+import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
 export type CreateVirtualhostReq = {
   workspaceId?: string
   gatewayName?: string
   clusterName?: string
   namespaceName?: string
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type CreateVirtualhostRes = {
@@ -31,7 +31,7 @@ export type ListVirtualhostReq = {
 
 export type VirtualhostInfo = {
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
   secretName?: string
   namespaceName?: string
   updatedAt?: string
@@ -52,7 +52,7 @@ export type GetVirtualhostReq = {
 
 export type GetVirtualhostRes = {
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type UpdateVirtualhostReq = {
@@ -61,7 +61,7 @@ export type UpdateVirtualhostReq = {
   clusterName?: string
   namespaceName?: string
   fqdn?: string
-  protocol?: SkoalaApiHostedV1alpha1Api-basic.Protocol
+  protocol?: SkoalaApiHostedV1alpha1Http.Protocol
 }
 
 export type UpdateVirtualhostRes = {

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

@@ -121,22 +121,22 @@ export class Gateway {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.ListClusterGatewayReq, SkoalaApiHostedV1alpha1Gateway.ListGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
   }
   static Get(req: SkoalaApiHostedV1alpha1Gateway.GetGatewayReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.GetGatewayRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["name"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "name"])}`, {...initReq, method: "GET"})
   }
   static Create(req: SkoalaApiHostedV1alpha1Gateway.CreateGatewayReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.CreateGatewayReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static Update(req: SkoalaApiHostedV1alpha1Gateway.UpdateGatewayReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.UpdateGatewayReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.UpdateGatewayReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["name"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
   static Delete(req: SkoalaApiHostedV1alpha1Gateway.DeleteGatewayReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.DeleteGatewayReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}`, {...initReq, method: "DELETE"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.DeleteGatewayReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["name"]}`, {...initReq, method: "DELETE"})
   }
   static GetImages(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.GetImagesRes> {
     return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiHostedV1alpha1Gateway.GetImagesRes>(`/apis/sesame.skoala.io/v1alpha1/images?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static GetGatewayStatus(req: SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/status?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["name"]}/status?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "name"])}`, {...initReq, method: "GET"})
   }
   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-53",
+  "version": "0.4.1-59",
   "description": "",
   "main": "index.js",
   "scripts": {