@daocloud-proto/skoala 0.3.2 → 0.3.3-109

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

@@ -18,21 +18,33 @@ export type Cluster = {
 }
 
 export type Workspace = {
-  id?: string
+  id?: number
   name?: string
-  parentWorkspaceId?: string
+}
+
+export type Pagination = {
+  total?: number
+  page?: number
+  pageSize?: number
+  pages?: number
 }
 
 export type ListWorkspaceReq = {
   page?: number
-  size?: number
+  pageSize?: number
 }
 
 export type ListWorkspaceRes = {
-  workspaces?: Workspace[]
-  page?: number
-  size?: number
-  total?: number
+  items?: Workspace[]
+  pagination?: Pagination
+}
+
+export type GetWorkspaceReq = {
+  workspaceId?: number
+}
+
+export type GetWorkspaceRes = {
+  workspace?: Workspace
 }
 
 export type ListClusterReq = {

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

@@ -40,15 +40,15 @@ export type Gateway = {
   updatedAt?: string
   status?: SkoalaApiGeneralV1alpha1Skoala.Status
   endpoints?: string[]
-  master?: Node
-  worker?: Node
+  contour?: Node
+  envoy?: Node
   config?: GatewayConfig
 }
 
 export type ListAllGatewayReq = {
   workspaceId?: number
   page?: number
-  size?: number
+  pageSize?: number
   filter?: string
 }
 
@@ -56,7 +56,7 @@ export type ListClusterGatewayReq = {
   workspaceId?: number
   clusterName?: string
   page?: number
-  size?: number
+  pageSize?: number
 }
 
 export type ListNamespaceGatewayReq = {
@@ -64,14 +64,12 @@ export type ListNamespaceGatewayReq = {
   clusterName?: string
   namespaceName?: string
   page?: number
-  size?: number
+  pageSize?: number
 }
 
 export type ListGatewayRes = {
-  gateways?: Gateway[]
-  page?: number
-  size?: number
-  total?: number
+  items?: Gateway[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
 }
 
 export type GetGatewayReq = {
@@ -85,6 +83,70 @@ export type GetGatewayRes = {
   gateways?: Gateway
 }
 
+export type EnvoyPortsString = {
+  http?: string
+  https?: string
+}
+
+export type EnvoyPorts = {
+  http?: number
+  https?: number
+}
+
+export type ContourPorts = {
+  xds?: number
+  metrics?: number
+}
+
+export type ContourPortsString = {
+  xds?: string
+}
+
+export type HostIPs = {
+  http?: string
+  https?: string
+}
+
+export type EnvoyService = {
+  type?: string
+  ports?: EnvoyPorts
+  targetPorts?: EnvoyPortsString
+  nodePorts?: EnvoyPortsString
+  extraPorts?: string[]
+  externalTrafficPolicy?: string
+}
+
+export type ContourService = {
+  type?: string
+  clusterIp?: string
+  ports?: ContourPorts
+  nodePorts?: ContourPortsString
+  extraPorts?: string[]
+  externalTrafficPolicy?: string
+  loadBalancerSourceRanges?: string[]
+  loadBalancerIp?: string
+}
+
+export type EnvoyNormalConfig = {
+  kind?: string
+  replicas?: number
+  hostNetwork?: boolean
+  dnsPolicy?: string
+  useHostIp?: boolean
+  useHostPort?: boolean
+  containerPorts?: EnvoyPorts
+  hostIps?: HostIPs
+  hostPorts?: EnvoyPorts
+  service?: EnvoyService
+}
+
+export type ContourNormalConfig = {
+  rootNamespaces?: string
+  replicas?: number
+  containerPorts?: ContourPorts
+  service?: ContourService
+}
+
 export type CreateGatewayReq = {
   workspaceId?: number
   name?: string
@@ -94,10 +156,6 @@ export type CreateGatewayReq = {
   config?: GatewayConfig
 }
 
-export type CreateGatewayRes = {
-  gateway?: Gateway
-}
-
 export type UpdateGatewayReq = {
   workspaceId?: number
   gatewayName?: string
@@ -106,10 +164,6 @@ export type UpdateGatewayReq = {
   config?: GatewayConfig
 }
 
-export type UpdateGatewayRes = {
-  gateway?: Gateway
-}
-
 export type DeleteGatewayReq = {
   workspaceId?: number
   clusterName?: string
@@ -121,71 +175,70 @@ export type DeleteGatewayRes = {
   gateway?: Gateway
 }
 
+export type NormalConfig = {
+  contour?: ContourNormalConfig
+  envoy?: EnvoyNormalConfig
+}
+
 export type GatewayConfig = {
   normal?: NormalConfig
   advanced?: AdvancedConfig
 }
 
 
-type BaseNormalConfig = {
-  masterCount?: number
-  workerCount?: number
+type BaseContourAdvancedConfig = {
+  resources?: Resource
 }
 
-export type NormalConfig = BaseNormalConfig
-  & OneOf<{ clusterIp: ClusterIP; nodePort: NodePort; loadBalancer: LoadBalancer; externalName: ExternalName }>
+export type ContourAdvancedConfig = BaseContourAdvancedConfig
+  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
 
-export type Port = {
-  name?: string
-  protocol?: string
-  port?: number
-  targetPort?: number
-  nodePort?: number
-}
 
-export type NodePort = {
-  ports?: Port[]
+type BaseEnvoyAdvancedConfig = {
+  resources?: Resource
 }
 
-export type ClusterIP = {
-  ports?: Port[]
-}
+export type EnvoyAdvancedConfig = BaseEnvoyAdvancedConfig
+  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
 
-export type LoadBalancer = {
+export type AdvancedConfig = {
+  log?: Log
+  contour?: ContourAdvancedConfig
+  envoy?: EnvoyAdvancedConfig
+  globalRateLimit?: boolean
 }
 
-export type ExternalName = {
-  externalName?: string
+export type Log = {
+  envoyLogLevel?: LogLogLevel
+  k8SDebug?: number
+  contourDebug?: boolean
+  logToInsight?: boolean
 }
 
-
-type BaseAdvancedConfig = {
-  log?: Log
-  resource?: Resource
-  enableGlobalRateLimit?: boolean
+export type Resource = {
+  cpuRequests?: string
+  cpuLimits?: string
+  memoryRequests?: string
+  memoryLimits?: string
 }
 
-export type AdvancedConfig = BaseAdvancedConfig
-  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
-
-export type Log = {
-  workerLogLevel?: LogLogLevel
-  podLogLevel?: number
-  enableDebugLog?: boolean
-  enableLogToInsight?: boolean
+export type RollingUpdate = {
+  maxSurge?: string
+  maxUnavailable?: string
 }
 
-export type Quota = {
-  cpuRequests?: number
-  cpuLimits?: number
-  memoryRequests?: number
-  memoryLimits?: number
+export type GetImagesRes = {
+  contour?: string
+  envoy?: string
 }
 
-export type Resource = {
-  master?: Quota
-  worker?: Quota
+export type GetGatewayStatusReq = {
+  workspaceId?: number
+  clusterName?: string
+  namespaceName?: string
+  gatewayName?: string
 }
 
-export type RollingUpdate = {
+export type GetGatewayStatusRes = {
+  ready?: boolean
 }

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

@@ -3,26 +3,92 @@
 /*
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
+
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
+
+export enum NacosStatus {
+  STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
+  Running = "Running",
+  Creating = "Creating",
+  Failed = "Failed",
+  Scaling = "Scaling",
+}
+
+export enum NacosConfigType {
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+  standalone = "standalone",
+  cluster = "cluster",
+}
+
 export type ListNacosReq = {
   workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
   page?: number
+  pageSize?: number
 }
 
 export type ListNacosRes = {
+  items?: Nacos[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
+}
+
+export type Nacos = {
+  workspaceId?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  status?: NacosStatus
+  replicas?: number
+  image?: string
+  version?: string
+  database?: NacosDatabase
+  resource?: NacosResource
+  condition?: NacosCondition[]
+  createAt?: string
+}
+
+export type NacosDatabase = {
+  type?: string
+  host?: string
+  port?: string
+  db?: string
+  user?: string
+}
+
+export type NacosResource = {
+  limits?: {[key: string]: string}
+  request?: {[key: string]: string}
+}
+
+export type NacosCondition = {
+  type?: string
+  status?: string
+  reason?: string
+  message?: string
+  instance?: string
+  hostIP?: string
+  podName?: string
+  nodeName?: string
 }
 
 export type GetNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
+  namespaceName?: string
 }
 
 export type GetNacosRes = {
+  nacos?: Nacos
 }
 
 export type UpdateNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
-  config?: string
+  namespaceName?: string
+  config?: NacosConfig
 }
 
 export type UpdateNacosRes = {
@@ -30,7 +96,11 @@ export type UpdateNacosRes = {
 
 export type CreateNacosReq = {
   workspaceId?: string
-  gatewayName?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  createNamespace?: boolean
+  config?: NacosConfig
 }
 
 export type CreateNacosRes = {
@@ -38,8 +108,28 @@ export type CreateNacosRes = {
 
 export type DeleteNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
+  namespaceName?: string
 }
 
 export type DeleteNacosRes = {
+}
+
+export type NacosConfig = {
+  type?: NacosConfigType
+  version?: string
+  replicas?: string
+  cpu?: string
+  memory?: string
+  useDatabase?: boolean
+  databaseParam?: DatabaseParam
+}
+
+export type DatabaseParam = {
+  host?: string
+  port?: string
+  username?: string
+  password?: string
+  db?: string
 }

package/api/integrated/v1alpha1/insight.pb.ts

@@ -4,12 +4,27 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as InsightIoApiSpan_metricV1alpha1Span_metric from "../../../span_metric/v1alpha1/span_metric.pb"
+import * as InsightIoApiMetricV1alpha1Metric from "../../../metric/v1alpha1/metric.pb"
 export type Insight = {
+  serviceDetail?: InsightValue
+  serviceMetrics?: InsightMetrics
+}
+
+export type InsightValue = {
   call?: string
   successRates?: string
   latencies?: string
-  metricsLatencies?: {[key: string]: InsightIoApiSpan_metricV1alpha1Span_metric.GetMetricsResponse}
-  metricsErrorRates?: InsightIoApiSpan_metricV1alpha1Span_metric.GetMetricsResponse
-  metricsCallRates?: InsightIoApiSpan_metricV1alpha1Span_metric.GetMetricsResponse
+}
+
+export type InsightMetrics = {
+  p50Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p75Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p90Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p95Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p99Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  reqRateMetric?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  repLatencyMetric?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  errorsRateMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  successTotalCallsMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  errorTotalCallsMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
 }

package/api/integrated/v1alpha1/instance.pb.ts

@@ -4,17 +4,25 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as SkoalaApiIntegratedV1alpha1Registry from "./registry.pb"
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
+
+export enum InstanceStatus {
+  STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
+  RUNNING = "RUNNING",
+  FAILED = "FAILED",
+}
+
 export type Instance = {
-  workspaceId?: string
   id?: string
   serviceName?: string
   frameworkType?: string
   host?: string
-  port?: number
+  ports?: number[]
+  instanceStatus?: InstanceStatus
+  enabled?: boolean
   metadata?: {[key: string]: string}
-  registry?: SkoalaApiIntegratedV1alpha1Registry.Registry
   detail?: {[key: string]: string}
+  updateAt?: string
 }
 
 export type ListInstanceReq = {
@@ -23,37 +31,39 @@ export type ListInstanceReq = {
   namespaceId?: string
   groupName?: string
   serviceName?: string
+  instanceId?: string
+  page?: number
+  pageSize?: number
 }
 
-export type ListAllInstanceReq = {
-  workspaceId?: string
-  page?: number
-  size?: number
+export type ListInstanceRes = {
+  items?: Instance[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
 }
 
-export type ListRegistryAllInstanceReq = {
+export type GetInstanceReq = {
   workspaceId?: string
   registryId?: string
-  page?: number
-  size?: number
+  namespaceId?: string
+  groupName?: string
+  serviceName?: string
+  instanceId?: string
 }
 
-export type ListInstanceRes = {
-  instances?: Instance[]
-  page?: number
-  size?: number
-  total?: number
+export type GetInstanceRes = {
+  instance?: Instance
 }
 
-export type GetInstanceReq = {
+export type UpdateInstanceReq = {
   workspaceId?: string
   registryId?: string
   namespaceId?: string
   groupName?: string
-  serviceName?: string
   instanceId?: string
+  serviceName?: string
+  enabled?: boolean
 }
 
-export type GetInstanceRes = {
+export type UpdateInstanceRes = {
   instance?: Instance
 }

package/api/integrated/v1alpha1/registry.pb.ts

@@ -4,6 +4,8 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
+
 export enum RegistryStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   RUNNING = "RUNNING",
@@ -22,6 +24,7 @@ export enum RegistryType {
 export type Registry = {
   workspaceId?: string
   registryId?: string
+  extId?: string
   name?: string
   type?: RegistryType
   status?: RegistryStatus
@@ -45,14 +48,12 @@ export type ListRegistryReq = {
   type?: string
   name?: string
   page?: number
-  size?: number
+  pageSize?: number
 }
 
 export type ListRegistryRes = {
-  registries?: Registry[]
-  page?: number
-  size?: number
-  total?: number
+  items?: Registry[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
 }
 
 export type GetRegistryReq = {

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

@@ -4,11 +4,13 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
 import * as SkoalaApiIntegratedV1alpha1Insight from "./insight.pb"
 import * as SkoalaApiIntegratedV1alpha1Registry from "./registry.pb"
 export type Service = {
   name?: string
   namespace?: NamespaceWithGroup
+  healthInstanceCount?: number
   instanceCount?: number
   registry?: SkoalaApiIntegratedV1alpha1Registry.Registry
   detail?: {[key: string]: string}
@@ -18,21 +20,14 @@ export type Service = {
 export type ListServiceReq = {
   workspaceId?: string
   registryId?: string
+  serviceName?: string
   page?: number
-  size?: number
-}
-
-export type ListAllServiceReq = {
-  workspaceId?: string
-  page?: number
-  size?: number
+  pageSize?: number
 }
 
 export type ListServiceRes = {
-  services?: Service[]
-  page?: number
-  size?: number
-  total?: number
+  items?: Service[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
 }
 
 export type GetServiceReq = {
@@ -41,6 +36,8 @@ export type GetServiceReq = {
   namespaceId?: string
   groupName?: string
   serviceName?: string
+  start?: string
+  end?: string
 }
 
 export type GetServiceRes = {

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

@@ -89,10 +89,10 @@ export class Book {
     return fm.fetchReq<ListBookReq, ListBookReply>(`/v1alpha1/books?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static Create(req: CreateBookReq, initReq?: fm.InitReq): Promise<CreateBookReply> {
-    return fm.fetchReq<CreateBookReq, CreateBookReply>(`/v1alpha1/books`, {...initReq, method: "POST", body: JSON.stringify(req)})
+    return fm.fetchReq<CreateBookReq, CreateBookReply>(`/v1alpha1/books`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static Update(req: UpdateBookReq, initReq?: fm.InitReq): Promise<UpdateBookRely> {
-    return fm.fetchReq<UpdateBookReq, UpdateBookRely>(`/v1alpha1/books/${req["uid"]}`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+    return fm.fetchReq<UpdateBookReq, UpdateBookRely>(`/v1alpha1/books/${req["uid"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
   static Delete(req: DeleteBookReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
     return fm.fetchReq<DeleteBookReq, GoogleProtobufEmpty.Empty>(`/v1alpha1/books/${req["uid"]}`, {...initReq, method: "DELETE"})