@daocloud-proto/skoala 0.5.1-74 → 0.5.1-80

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

@@ -97,6 +97,16 @@ export type AdvancedAPIConfig = {
   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 = {
@@ -143,6 +153,20 @@ export type UpdateAPIReq = {
   apiConfig?: APIConfig
 }
 
+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 = {
   apiName?: string
 }

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

@@ -110,12 +110,13 @@ export type ServiceInfo = {
 
 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
 }
 
 
@@ -136,6 +137,7 @@ export type KubernetesService = {
 
 type BaseRegistryService = {
   registrationId?: string
+  registrationName?: string
 }
 
 export type RegistryService = BaseRegistryService

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

@@ -143,12 +143,23 @@ export type ListNacosServiceReq = {
   clusterName?: string
   nacosName?: string
   namespaceName?: string
-  namespaceId?: string
+  nacosNamespace?: string
+  page?: number
+  pageSize?: number
 }
 
 export type ListNacosServiceRes = {
-  count?: number
-  doms?: string[]
+  items?: HostNacosService[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type HostNacosService = {
+  name?: string
+  groupName?: string
+  clusterCount?: number
+  healthyInstanceCount?: number
+  ipCount?: number
+  triggerFlag?: boolean
 }
 
 export type GetNacosServiceReq = {
@@ -156,9 +167,43 @@ export type GetNacosServiceReq = {
   clusterName?: string
   nacosName?: string
   namespaceName?: string
-  namespaceId?: string
-  serviceName?: string
+  nacosNamespace?: string
+  nacosService?: string
+}
+
+export type GetNacosServiceRes = {
+}
+
+export type GetNacosServiceAPIReq = {
+  workspaceId?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  nacosNamespace?: string
+  nacosService?: string
 }
 
 export type GetNacosServiceAPIRes = {
+}
+
+export type ListNamespaceReq = {
+  workspaceId?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListNamespaceRes = {
+  items?: NacosNamespace[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type NacosNamespace = {
+  namespace?: string
+  namespaceShowName?: string
+  quota?: number
+  configCount?: number
+  type?: number
 }

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

@@ -102,16 +102,16 @@ export class Nacos {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.DeleteNacosReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}`, {...initReq, method: "DELETE"})
   }
   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"})
+    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["nacosNamespace"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace"])}`, {...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 GetService(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService"])}`, {...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 GetServiceAPI(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceAPIRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/apis?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService"])}`, {...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"})
+  static ListNamespace(req: SkoalaApiHostedV1alpha1Nacos.ListNamespaceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.ListNamespaceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.ListNamespaceReq, SkoalaApiHostedV1alpha1Nacos.ListNamespaceRes>(`/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"})
   }
 }
 export class Sentinel {

package/package.json

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