@daocloud-proto/skoala 0.6.1-34 → 0.6.1-38

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

@@ -17,6 +17,6 @@ export type ServicePort = {
   protocol?: string
   appProtocol?: string
   port?: number
-  targetPort?: string
+  targetPort?: number
   nodePort?: number
 }

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

@@ -121,7 +121,7 @@ export type ListMeshReq = {
 }
 
 export type ListMeshRes = {
-  meshes?: SkoalaApiGeneralV1alpha1Common.Mesh[]
+  items?: SkoalaApiGeneralV1alpha1Common.Mesh[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
 }
 

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

@@ -75,7 +75,6 @@ export type Nacos = {
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   condition?: NacosCondition[]
   volume?: Volume
-  plugins?: Plugins
   createAt?: string
 }
 
@@ -107,21 +106,6 @@ export type GetNacosReq = {
 
 export type GetNacosRes = {
   nacos?: Nacos
-  plugins?: GetPluginsRes
-}
-
-export type GetPluginsRes = {
-  mode?: string
-  sentinel?: GetSentinelRes
-}
-
-export type GetSentinelRes = {
-  nodes?: number
-  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
-  port?: number
-  nodePort?: number
-  phase?: string
-  visitAddress?: string
 }
 
 export type UpdateNacosReq = {
@@ -130,21 +114,6 @@ export type UpdateNacosReq = {
   nacosName?: string
   namespaceName?: string
   config?: NacosConfig
-  plugins?: Plugins
-}
-
-export type Plugins = {
-  sentinel?: Sentinel
-}
-
-export type Sentinel = {
-  enabled?: boolean
-  image?: string
-  replicas?: number
-  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
-  serviceType?: SkoalaApiGeneralV1alpha1Service.ServiceType
-  port?: number
-  nodePort?: number
 }
 
 export type UpdateNacosRes = {
@@ -157,7 +126,6 @@ export type CreateNacosReq = {
   namespaceName?: string
   createNamespace?: boolean
   config?: NacosConfig
-  plugins?: Plugins
 }
 
 export type CreateNacosRes = {
@@ -234,6 +202,7 @@ export type NacosServiceBrief = {
   healthyInstanceCount?: number
   ipCount?: number
   triggerFlag?: boolean
+  nacosNamespace?: string
   insight?: SkoalaApiGeneralV1alpha1Insight.InsightBrief
 }
 
@@ -273,6 +242,7 @@ export type NacosServiceInstance = {
   serviceName?: string
   weight?: number
   pluginsHealthy?: boolean
+  nacosNamespace?: string
   insight?: SkoalaApiGeneralV1alpha1Insight.InsightBrief
 }
 
@@ -425,7 +395,10 @@ export type GetNacosServiceInstanceReq = {
   nacosGroupName?: string
   nacosClusterName?: string
   nacosService?: string
-  nacosServiceInstanceIp?: string
+  ip?: string
+  port?: number
+  ephemeral?: boolean
+  nacosInstanceId?: string
 }
 
 export type GetNacosServiceInstanceRes = {
@@ -441,7 +414,10 @@ export type GetNacosServiceInstanceInsightReq = {
   nacosGroupName?: string
   nacosClusterName?: string
   nacosService?: string
-  nacosServiceInstanceIp?: string
+  ip?: string
+  port?: number
+  ephemeral?: boolean
+  nacosInstanceId?: string
 }
 
 export type GetNacosServiceInstanceInsightRes = {
@@ -463,6 +439,7 @@ export type UpdateNacosServiceInstanceReq = {
   weight?: number
   enabled?: boolean
   metadata?: string
+  nacosInstanceId?: string
 }
 
 export type UpdateNacosServiceInstanceRes = {

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

@@ -0,0 +1,112 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as SkoalaApiGeneralV1alpha1Resource from "../../general/v1alpha1/resource.pb"
+import * as SkoalaApiGeneralV1alpha1Service from "../../general/v1alpha1/service.pb"
+export type Plugin = {
+  name?: string
+  enabled?: boolean
+}
+
+export type ListPluginReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespace?: string
+  nacosName?: string
+}
+
+export type ListPluginRes = {
+  items?: Plugin[]
+}
+
+export type GetPluginReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespace?: string
+  nacosName?: string
+  name?: string
+}
+
+export type GetPluginRes = {
+  sentinel?: GetSentinelPluginRes
+  mesh?: GetMeshPluginRes
+}
+
+export type GetSentinelPluginReq = {
+}
+
+export type GetSentinelPluginRes = {
+  image?: string
+  replicas?: number
+  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
+  type?: string
+  ports?: SkoalaApiGeneralV1alpha1Service.ServicePort[]
+}
+
+export type GetMeshPluginReq = {
+}
+
+export type GetMeshPluginRes = {
+  name?: string
+}
+
+export type UpdatePluginReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespace?: string
+  nacosName?: string
+  sentinel?: UpdateSentinelPluginReq
+  mesh?: UpdateMeshPluginReq
+}
+
+export type UpdatePluginRes = {
+}
+
+export type UpdateSentinelPluginReq = {
+  enabled?: boolean
+  image?: string
+  replicas?: number
+  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
+  type?: string
+  ports?: SkoalaApiGeneralV1alpha1Service.ServicePort[]
+}
+
+export type UpdateSentinelPluginRes = {
+}
+
+export type UpdateMeshPluginReq = {
+  enabled?: boolean
+  name?: string
+}
+
+export type UpdateMeshPluginRes = {
+}
+
+export type GetGovernReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespace?: string
+  nacosName?: string
+}
+
+export type GetGovernRes = {
+  mode?: string
+  sentinel?: GetSentinelRes
+  mesh?: GetMeshRes
+}
+
+export type GetSentinelRes = {
+  nodes?: number
+  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
+  port?: number
+  nodePort?: number
+  phase?: string
+  visitAddress?: string
+}
+
+export type GetMeshRes = {
+  name?: string
+}

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

@@ -15,6 +15,7 @@ import * as SkoalaApiHostedV1alpha1Extension from "../../hosted/v1alpha1/extensi
 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 SkoalaApiHostedV1alpha1Plugins from "../../hosted/v1alpha1/plugins.pb"
 import * as SkoalaApiHostedV1alpha1Sentinel from "../../hosted/v1alpha1/sentinel.pb"
 import * as SkoalaApiHostedV1alpha1Virtualhost from "../../hosted/v1alpha1/virtualhost.pb"
 import * as SkoalaApiIntegratedV1alpha1Instance from "../../integrated/v1alpha1/instance.pb"
@@ -44,10 +45,10 @@ export class Skoala {
     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 ListMeshNamespaces(req: SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceRes> {
-    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshs/${req["meshId"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshNamespaceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...initReq, method: "GET"})
   }
   static ListMeshNamespaceServices(req: SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceRes> {
-    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshs/${req["meshId"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...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"})
@@ -165,13 +166,13 @@ export class Nacos {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.ListNacosServiceInstanceReq, SkoalaApiHostedV1alpha1Nacos.ListNacosServiceInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService"])}`, {...initReq, method: "GET"})
   }
   static GetServiceInstance(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances/${req["nacosServiceInstanceIp"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService", "nacosServiceInstanceIp"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances/${req["nacosInstanceId"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService", "nacosInstanceId"])}`, {...initReq, method: "GET"})
   }
   static GetServiceInstanceInsight(req: SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances/${req["nacosServiceInstanceIp"]}/insight?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService", "nacosServiceInstanceIp"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightReq, SkoalaApiHostedV1alpha1Nacos.GetNacosServiceInstanceInsightRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances/${req["nacosInstanceId"]}/insight?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "nacosService", "nacosInstanceId"])}`, {...initReq, method: "GET"})
   }
   static UpdateServiceInstance(req: SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceReq, SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceReq, SkoalaApiHostedV1alpha1Nacos.UpdateNacosServiceInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/services/${req["nacosService"]}/instances/${req["nacosInstanceId"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
   static ListNamespace(req: SkoalaApiHostedV1alpha1Nacos.ListNacosNamespaceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.ListNacosNamespaceRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.ListNacosNamespaceReq, SkoalaApiHostedV1alpha1Nacos.ListNacosNamespaceRes>(`/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"})
@@ -236,6 +237,20 @@ export class Sentinel {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceReq, SkoalaApiHostedV1alpha1Sentinel.GetAppInstanceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinel/${req["sentinelName"]}/appinstance?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "sentinelName"])}`, {...initReq, method: "GET"})
   }
 }
+export class Plugin {
+  static List(req: SkoalaApiHostedV1alpha1Plugins.ListPluginReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Plugins.ListPluginRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Plugins.ListPluginReq, SkoalaApiHostedV1alpha1Plugins.ListPluginRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespace"]}/nacoses/${req["nacosName"]}/plugins?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespace", "nacosName"])}`, {...initReq, method: "GET"})
+  }
+  static Get(req: SkoalaApiHostedV1alpha1Plugins.GetPluginReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Plugins.GetPluginRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Plugins.GetPluginReq, SkoalaApiHostedV1alpha1Plugins.GetPluginRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespace"]}/nacoses/${req["nacosName"]}/plugins/${req["name"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespace", "nacosName", "name"])}`, {...initReq, method: "GET"})
+  }
+  static Update(req: SkoalaApiHostedV1alpha1Plugins.UpdatePluginReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Plugins.UpdatePluginRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Plugins.UpdatePluginReq, SkoalaApiHostedV1alpha1Plugins.UpdatePluginRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespace"]}/nacoses/${req["nacosName"]}/plugins`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
+  static GetGovern(req: SkoalaApiHostedV1alpha1Plugins.GetGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Plugins.GetGovernRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Plugins.GetGovernReq, SkoalaApiHostedV1alpha1Plugins.GetGovernRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespace"]}/nacoses/${req["nacosName"]}/governs?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespace", "nacosName"])}`, {...initReq, method: "GET"})
+  }
+}
 export class Gateway {
   static ListAll(req: SkoalaApiHostedV1alpha1Gateway.ListAllGatewayReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.ListGatewayRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.ListAllGatewayReq, SkoalaApiHostedV1alpha1Gateway.ListGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/gateways?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})

package/package.json

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