@daocloud-proto/skoala 0.14.0-8 → 0.15.0

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

@@ -54,4 +54,14 @@ export type InsightMonitorMetrics = {
   diskWrite?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
   netBytesReceived?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
   netBytesTransmitted?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+}
+
+export type NacosInsightMetrics = {
+  enabled?: boolean
+  serviceCount?: number
+  avgPushCost?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  maxPushCost?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  failedPush?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  configCount?: number
+  longPolling?: number
 }

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

@@ -12,6 +12,11 @@ export enum ListNamespaceReqGatewayStatus {
   Unavailable = "Unavailable",
 }
 
+export enum ListRegistryServiceReqRegistryType {
+  hosted = "hosted",
+  integrated = "integrated",
+}
+
 export enum RegistryServiceInfoRegistryType {
   NACOS = "NACOS",
   EUREKA = "EUREKA",
@@ -89,6 +94,11 @@ export type ListMeshServiceReq = {
 export type ListRegistryServiceReq = {
   workspaceId?: string
   registryId?: string
+  kubernetesClusterName?: string
+  kubernetesNamespaceName?: string
+  registryName?: string
+  nacosNamespaceName?: string
+  registryType?: ListRegistryServiceReqRegistryType
   serviceName?: string
   page?: number
   pageSize?: number
@@ -115,6 +125,7 @@ export type RegistryServiceInfo = {
   kubernetesPorts?: string[]
   kubernetesLabels?: string[]
   registryType?: RegistryServiceInfoRegistryType
+  isHosted?: boolean
 }
 
 export type ListMeshServiceRes = {

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

@@ -101,6 +101,12 @@ export type AdvancedAPIConfig = {
   requestHeadersPolicy?: HeaderPolicy
   responseHeadersPolicy?: HeaderPolicy
   jwtPolicy?: JWTPolicy
+  authPolicy?: AuthPolicy
+}
+
+export type AuthPolicy = {
+  context?: {[key: string]: string}
+  disabled?: boolean
 }
 
 export type JWTPolicy = {

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

@@ -21,6 +21,7 @@ export enum ServiceSource {
   SOURCE_MESH = "SOURCE_MESH",
   SOURCE_REGISTRY = "SOURCE_REGISTRY",
   SOURCE_EXTERNAL = "SOURCE_EXTERNAL",
+  SOURCE_HOSTED_REGISTRY = "SOURCE_HOSTED_REGISTRY",
 }
 
 export enum SesameServiceType {
@@ -168,7 +169,15 @@ type BaseExternalServiceConf = {
 }
 
 export type ExternalServiceConf = BaseExternalServiceConf
-  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService; meshService: MeshService }>
+  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService; meshService: MeshService; hostedRegistryService: HostedRegistryService }>
+
+
+type BaseHostedRegistryService = {
+  registrationName?: string
+}
+
+export type HostedRegistryService = BaseHostedRegistryService
+  & OneOf<{ eurekaService: EurekaService; nacosService: NacosService; zookeeperService: ZookeeperService; kubernetesService: KubernetesService; meshService: MeshService }>
 
 export type CircuitBreakerPolicy = {
   maxConnections?: number

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

@@ -100,15 +100,13 @@ export type Nacos = {
   version?: string
   nodeCount?: number
   healthNodeCount?: number
-  serviceCount?: number
-  configCount?: number
-  insightEnabled?: boolean
   database?: NacosDatabase
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   condition?: NacosCondition[]
   certificationEnabled?: boolean
   volume?: Volume
   createAt?: string
+  insight?: SkoalaApiGeneralV1alpha1Insight.NacosInsightMetrics
 }
 
 export type NacosDatabase = {
@@ -845,22 +843,4 @@ export type GetNacosGrafanaReq = {
 export type GetNacosGrafanaRes = {
   url?: string
   zhUrl?: string
-}
-
-export type NacosDashBoardReq = {
-  workspaceId?: string
-  isHosted?: boolean
-}
-
-export type NacosDashBoardRessvcCount = {
-  count?: number
-  name?: string
-}
-
-export type NacosDashBoardRes = {
-  total?: number
-  health?: number
-  serviceCount?: number
-  configCount?: number
-  serviceRanking?: NacosDashBoardRessvcCount[]
 }

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

@@ -45,6 +45,18 @@ export type VirtualhostConfig = {
   corsPolicy?: CorsPolicy
   tlsPolicy?: VirtualhostTLSPolicy
   jwtProviders?: JwtProvider[]
+  authPolicy?: AuthorizationPolicy
+}
+
+export type AuthorizationPolicy = {
+  disabled?: boolean
+  context?: {[key: string]: string}
+  authServer?: string
+  failOpen?: boolean
+  responseTimeout?: string
+  maxRequestBytes?: number
+  allowPartialMessage?: boolean
+  packAsBytes?: boolean
 }
 
 export type JwtProvider = {
@@ -101,6 +113,7 @@ export type VirtualhostInfo = {
   secretNamespaceName?: string
   healthCheckUrl?: string
   enableJWT?: boolean
+  enableAuth?: boolean
   namespaceName?: string
   apiCount?: number
   updatedAt?: string
@@ -130,6 +143,7 @@ export type GetVirtualhostRes = {
   corsPolicy?: CorsPolicy
   tlsPolicy?: VirtualhostTLSPolicy
   jwtProviders?: JwtProvider[]
+  authorizationPolicy?: AuthorizationPolicy
 }
 
 export type UpdateVirtualhostReq = {
@@ -208,10 +222,4 @@ export type LocalRateLimitPolicy = {
 export type TimeUnit = {
   time?: number
   unit?: TimeUnitUnit
-}
-
-export type Authorization = {
-}
-
-export type AuthPolicy = {
 }

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

@@ -250,9 +250,6 @@ export class Nacos {
   static CheckConfig(req: SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/configs/${req["dataId"]}/check?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "dataId"])}`, {...initReq, method: "GET"})
   }
-  static GetNacosDashBoard(req: SkoalaApiHostedV1alpha1Nacos.NacosDashBoardReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.NacosDashBoardRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.NacosDashBoardReq, SkoalaApiHostedV1alpha1Nacos.NacosDashBoardRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacos_dashboard?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
-  }
 }
 export class Sentinel {
   static GetInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.14.0-8",
+  "version": "0.15.0",
   "description": "",
   "main": "index.js",
   "scripts": {