@daocloud-proto/skoala 0.26.2-4 → 0.26.2-40

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

@@ -98,21 +98,6 @@ export type ListMeshServiceReq = {
   pageSize?: number
 }
 
-export type ListMeshServiceVersion = {
-  versionName?: string
-}
-
-export type ListMeshServiceVersionReq = {
-  workspaceId?: string
-  meshId?: string
-  namespaceName?: string
-  serviceName?: string
-}
-
-export type ListMeshServiceVersionRes = {
-  items?: ListMeshServiceVersion[]
-}
-
 export type ListRegistryServiceReq = {
   workspaceId?: string
   registryId?: string
@@ -341,4 +326,12 @@ export type AuditItem = {
 export type ListAuditRes = {
   items?: AuditItem[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListWorkspaceRolePermissionsReq = {
+  workspaceId?: string
+}
+
+export type ListWorkspaceRolePermissionsRes = {
+  permissions?: string[]
 }

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

@@ -279,7 +279,7 @@ type BaseMatchRule = {
 }
 
 export type MatchRule = BaseMatchRule
-  & OneOf<{ path: string; prefix: string }>
+  & OneOf<{ path: string; prefix: string; regex: string }>
 
 export type RouteAction = {
   routeService?: RouteService[]

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

@@ -295,7 +295,7 @@ export type GatewayConfig = {
 
 export type PluginConfig = {
   globalRatelimitConfig?: GlobalRatelimitConfig
-  golbalAuthConfig?: GlobalAuthConfig
+  globalAuthConfig?: GlobalAuthConfig
 }
 
 export type GlobalRatelimitConfig = {

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

@@ -115,7 +115,7 @@ type BaseHeaderRule = {
 }
 
 export type HeaderRule = BaseHeaderRule
-  & OneOf<{ contains: string; exact: string; notContains: string; notExact: string; present: boolean; notPresent: boolean }>
+  & OneOf<{ contains: string; exact: string; notContains: string; notExact: string; present: boolean; notPresent: boolean; regex: string }>
 
 export type APIStatus = {
   currentStatus?: APIStatusEnum

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

@@ -27,6 +27,7 @@ export type ListLaneReq = {
   meshId?: string
   page?: number
   pageSize?: number
+  pageSearch?: string
 }
 
 export type ListLaneRes = {
@@ -35,21 +36,21 @@ export type ListLaneRes = {
 }
 
 export type ListLane = {
-  name?: string
+  laneName?: string
   meshId?: string
   phase?: LaneStatusPhase
   services?: LaneService[]
 }
 
 export type LaneService = {
-  name?: string
+  serviceName?: string
   subset?: string
 }
 
 export type CreateLaneReq = {
   workspaceId?: string
   meshId?: string
-  name?: string
+  laneName?: string
 }
 
 export type CreateLaneRes = {
@@ -84,13 +85,20 @@ export type GetLaneRes = {
   lane?: ListLane
 }
 
+export type FailedMessage = {
+  serviceInfo?: string[]
+  instancesInfo?: string[]
+  workloadsInfo?: string[]
+}
+
 export type ListLaneService = {
   namespace?: string
-  name?: string
+  serviceName?: string
   subset?: string
   status?: SkoalaApiHostedV1alpha1Mesh.ServiceStatus
   replicas?: number
   availableReplicas?: number
+  failedMessage?: FailedMessage
 }
 
 export type ListLaneServiceReq = {
@@ -103,9 +111,9 @@ export type ListLaneServiceRes = {
   items?: ListLaneService[]
 }
 
-export type AddLaneService = {
-  namespace?: string
-  name?: string
+export type LaneServiceDetail = {
+  namespaceName?: string
+  serviceName?: string
   subset?: string
 }
 
@@ -113,12 +121,34 @@ export type AddLaneServiceReq = {
   workspaceId?: string
   meshId?: string
   laneName?: string
-  services?: AddLaneService[]
+  service?: LaneServiceDetail
 }
 
 export type DeleteLaneServiceReq = {
   workspaceId?: string
   meshId?: string
   laneName?: string
-  services?: AddLaneService[]
+  services?: LaneServiceDetail[]
+}
+
+export type ListMeshServiceReq = {
+  workspaceId?: string
+  meshId?: string
+  namespaceName?: string
+  laneName?: string
+}
+
+export type ListMeshServiceRes = {
+  services?: string[]
+}
+
+export type ListMeshServiceVersionReq = {
+  workspaceId?: string
+  meshId?: string
+  namespaceName?: string
+  serviceName?: string
+}
+
+export type ListMeshServiceVersionRes = {
+  subsets?: string[]
 }

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

@@ -404,7 +404,28 @@ export type ListServiceIstioPluginRLSPortsReq = {
 }
 
 export type ListServiceIstioPluginRLSPortsRes = {
-  ports?: number[]
+  ports?: portRlsPluginInfo[]
+}
+
+export type portRlsPluginInfo = {
+  port?: number
+  ratelimitPluginName?: string
+  domain?: string
+}
+
+export type GetServiceIstioPluginRLSRulesReq = {
+  workspaceId?: string
+  meshId?: string
+  namespaceName?: string
+  serviceName?: string
+  port?: number
+}
+
+export type GetServiceIstioPluginRLSRulesRes = {
+  port?: number
+  ratelimitPluginName?: string
+  domain?: string
+  rlsRuleName?: string
 }
 
 export type ListServiceIstioPluginRLSRulesReq = {
@@ -415,12 +436,14 @@ export type ListServiceIstioPluginRLSRulesReq = {
 }
 
 export type ListServiceIstioPluginRLSRulesRes = {
-  items?: PortRuleName[]
+  items?: PortRlsRule[]
 }
 
-export type PortRuleName = {
+export type PortRlsRule = {
   port?: number
-  ruleName?: string
+  ratelimitPluginName?: string
+  domain?: string
+  rlsRuleName?: string
 }
 
 export type CreateServiceIstioPluginRLSRulesReq = {

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

@@ -742,6 +742,7 @@ export type CreateNacosConfigReq = {
   import?: boolean
   policy?: CreateNacosConfigReqPolicy
   file?: Uint8Array
+  betaIps?: string
 }
 
 export type UpdateNacosConfigReq = {
@@ -902,4 +903,36 @@ export type GetResourceInfoRes = {
   namespaceName?: string
   nacos?: GetResourceInfoResResourceInfo
   sentinel?: GetResourceInfoResResourceInfo
+}
+
+export type GetBetaConfigReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  nacosName?: string
+  nacosNamespace?: string
+  dataId?: string
+  group?: string
+}
+
+export type GetBetaConfigRes = {
+  appName?: string
+  content?: string
+  dataId?: string
+  group?: string
+  id?: string
+  md5?: string
+  tenant?: string
+  type?: NacosConfigFileType
+  betaIps?: string
+}
+
+export type DeleteBetaConfigReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  nacosName?: string
+  nacosNamespace?: string
+  dataId?: string
+  group?: string
 }

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

@@ -79,6 +79,7 @@ export type GetSentinelPluginRes = {
   ports?: SkoalaApiGeneralV1alpha1Service.ServicePort[]
   visitAddress?: string
   workloadState?: SkoalaApiGeneralV1alpha1Common.WorkloadState
+  pwd?: string
 }
 
 export type GetMeshPluginReq = {
@@ -111,6 +112,7 @@ export type UpdateSentinelPluginReq = {
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   type?: SkoalaApiGeneralV1alpha1Service.ServiceType
   ports?: SkoalaApiGeneralV1alpha1Service.ServicePort[]
+  pwd?: string
 }
 
 export type UpdateMeshPluginReq = {

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

@@ -216,4 +216,14 @@ export type LocalRateLimitPolicy = {
 export type TimeUnit = {
   time?: number
   unit?: TimeUnitUnit
+}
+
+export type CheckVirtualhostReq = {
+  workspaceId?: string
+  clusterName?: string
+  fqdn?: string
+}
+
+export type CheckVirtualhostRes = {
+  exists?: boolean
 }

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

@@ -74,9 +74,6 @@ export class Skoala {
   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"]}/meshes/${req["meshId"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "meshId"])}`, {...initReq, method: "GET"})
   }
-  static ListMeshServiceVersion(req: SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceVersionReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceVersionRes> {
-    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceVersionReq, SkoalaApiGeneralV1alpha1Skoala.ListMeshServiceVersionRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/versions?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName"])}`, {...initReq, method: "GET"})
-  }
   static ListRegistryServices(req: SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListRegistryServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/registry/${req["registryId"]}/services/gateway?${fm.renderURLSearchParams(req, ["workspaceId", "registryId"])}`, {...initReq, method: "GET"})
   }
@@ -116,6 +113,9 @@ export class Skoala {
   static ListAudit(req: SkoalaApiGeneralV1alpha1Skoala.ListAuditReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListAuditRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListAuditReq, SkoalaApiGeneralV1alpha1Skoala.ListAuditRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/audits?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
   }
+  static ListWorkspaceRolePermissions(req: SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRolePermissionsReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRolePermissionsRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRolePermissionsReq, SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRolePermissionsRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/permissions?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }
 export class Registry {
   static List(req: SkoalaApiIntegratedV1alpha1Registry.ListRegistryReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Registry.ListRegistryRes> {
@@ -305,6 +305,12 @@ export class Nacos {
   static GetResourceInfo(req: SkoalaApiHostedV1alpha1Nacos.GetResourceInfoReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetResourceInfoRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetResourceInfoReq, SkoalaApiHostedV1alpha1Nacos.GetResourceInfoRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/info?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName"])}`, {...initReq, method: "GET"})
   }
+  static GetBetaConfig(req: SkoalaApiHostedV1alpha1Nacos.GetBetaConfigReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetBetaConfigRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetBetaConfigReq, SkoalaApiHostedV1alpha1Nacos.GetBetaConfigRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/configs/${req["dataId"]}/beta?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "dataId"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteBetaConfig(req: SkoalaApiHostedV1alpha1Nacos.DeleteBetaConfigReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.DeleteBetaConfigReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/configs/beta`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
 }
 export class Sentinel {
   static GetInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes> {
@@ -496,6 +502,9 @@ export class Mesh {
   static ListServiceIstioPluginRLSRules(req: SkoalaApiHostedV1alpha1Mesh.ListServiceIstioPluginRLSRulesReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.ListServiceIstioPluginRLSRulesRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.ListServiceIstioPluginRLSRulesReq, SkoalaApiHostedV1alpha1Mesh.ListServiceIstioPluginRLSRulesRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/istioplugin/rls/rules?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName"])}`, {...initReq, method: "GET"})
   }
+  static GetServiceIstioPluginRLSRules(req: SkoalaApiHostedV1alpha1Mesh.GetServiceIstioPluginRLSRulesReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.GetServiceIstioPluginRLSRulesRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetServiceIstioPluginRLSRulesReq, SkoalaApiHostedV1alpha1Mesh.GetServiceIstioPluginRLSRulesRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/port/${req["port"]}/istioplugin/rls/rules?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
+  }
   static CreateServiceIstioPluginRLSRules(req: SkoalaApiHostedV1alpha1Mesh.CreateServiceIstioPluginRLSRulesReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateServiceIstioPluginRLSRulesReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/port/${req["port"]}/istioplugin/rls/rules`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
@@ -760,6 +769,9 @@ export class Virtualhost {
   static UpdateVirtualhost(req: SkoalaApiHostedV1alpha1Virtualhost.UpdateVirtualhostReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Virtualhost.UpdateVirtualhostReq, GoogleProtobufEmpty.Empty>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/virtualhosts/${req["fqdn"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
+  static CheckVirtualhost(req: SkoalaApiHostedV1alpha1Virtualhost.CheckVirtualhostReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Virtualhost.CheckVirtualhostRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Virtualhost.CheckVirtualhostReq, SkoalaApiHostedV1alpha1Virtualhost.CheckVirtualhostRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/virtualhosts/check?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
+  }
 }
 export class GatewayAPI {
   static CreateAPI(req: SkoalaApiHostedV1alpha1Api.CreateAPIReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
@@ -885,6 +897,12 @@ export class Lane {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Lane.AddLaneServiceReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/lanes/${req["laneName"]}/services`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static DeleteLaneService(req: SkoalaApiHostedV1alpha1Lane.DeleteLaneServiceReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Lane.DeleteLaneServiceReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/lanes/${req["laneName"]}/services`, {...initReq, method: "DELETE", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Lane.DeleteLaneServiceReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/lanes/${req["laneName"]}/services`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
+  static ListMeshService(req: SkoalaApiHostedV1alpha1Lane.ListMeshServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Lane.ListMeshServiceRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Lane.ListMeshServiceReq, SkoalaApiHostedV1alpha1Lane.ListMeshServiceRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName"])}`, {...initReq, method: "GET"})
+  }
+  static ListMeshServiceVersion(req: SkoalaApiHostedV1alpha1Lane.ListMeshServiceVersionReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Lane.ListMeshServiceVersionRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Lane.ListMeshServiceVersionReq, SkoalaApiHostedV1alpha1Lane.ListMeshServiceVersionRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/versions?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName"])}`, {...initReq, method: "GET"})
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.26.2-4",
+  "version": "0.26.2-40",
   "description": "",
   "main": "index.js",
   "scripts": {