@daocloud-proto/skoala 0.26.1 → 0.26.2-12

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 = {
@@ -113,7 +114,7 @@ export type AddLaneServiceReq = {
   workspaceId?: string
   meshId?: string
   laneName?: string
-  services?: AddLaneService[]
+  service?: AddLaneService
 }
 
 export type DeleteLaneServiceReq = {

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 = {
@@ -630,7 +653,7 @@ export type CreateConnectionPoolReq = {
   meshId?: string
   namespaceName?: string
   serviceName?: string
-  port?: number
+  ports?: number[]
   cp?: ConnectionPool
 }
 
@@ -694,7 +717,7 @@ export type CreateOutlierDetectionReq = {
   meshId?: string
   namespaceName?: string
   serviceName?: string
-  port?: number
+  ports?: number[]
   od?: OutlierDetection
 }
 
@@ -758,7 +781,7 @@ export type CreateRewriteReq = {
   meshId?: string
   namespaceName?: string
   serviceName?: string
-  port?: number
+  ports?: number[]
   rewrite?: HTTPRewrite
 }
 
@@ -886,7 +909,7 @@ export type CreateRetryReq = {
   meshId?: string
   namespaceName?: string
   serviceName?: string
-  port?: number
+  ports?: number[]
   retry?: HTTPRetry
 }
 
@@ -950,7 +973,7 @@ export type CreateTimeoutReq = {
   meshId?: string
   namespaceName?: string
   serviceName?: string
-  port?: number
+  ports?: number[]
   timeout?: GoogleProtobufDuration.Duration
 }
 

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

@@ -496,6 +496,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)})
   }
@@ -530,7 +533,7 @@ export class Mesh {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetConnectionPoolReq, SkoalaApiHostedV1alpha1Mesh.GetConnectionPoolRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/connection_pool/${req["port"]}?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
   }
   static CreateConnectionPool(req: SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolReq, SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/connection_pool/${req["port"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolReq, SkoalaApiHostedV1alpha1Mesh.CreateConnectionPoolRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/connection_pool`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static UpdateConnectionPool(req: SkoalaApiHostedV1alpha1Mesh.UpdateConnectionPoolReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.UpdateConnectionPoolRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.UpdateConnectionPoolReq, SkoalaApiHostedV1alpha1Mesh.UpdateConnectionPoolRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/connection_pool/${req["port"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
@@ -545,7 +548,7 @@ export class Mesh {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetOutlierDetectionReq, SkoalaApiHostedV1alpha1Mesh.GetOutlierDetectionRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/outlier_detection/${req["port"]}?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
   }
   static CreateOutlierDetection(req: SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionReq, SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/outlier_detection/${req["port"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionReq, SkoalaApiHostedV1alpha1Mesh.CreateOutlierDetectionRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/outlier_detection`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static UpdateOutlierDetection(req: SkoalaApiHostedV1alpha1Mesh.UpdateOutlierDetectionReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.UpdateOutlierDetectionRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.UpdateOutlierDetectionReq, SkoalaApiHostedV1alpha1Mesh.UpdateOutlierDetectionRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/outlier_detection/${req["port"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
@@ -560,7 +563,7 @@ export class Mesh {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetRewriteReq, SkoalaApiHostedV1alpha1Mesh.GetRewriteRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/rewrite/${req["port"]}?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
   }
   static CreateRewrite(req: SkoalaApiHostedV1alpha1Mesh.CreateRewriteReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.CreateRewriteRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateRewriteReq, SkoalaApiHostedV1alpha1Mesh.CreateRewriteRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/rewrite/${req["port"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateRewriteReq, SkoalaApiHostedV1alpha1Mesh.CreateRewriteRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/rewrite`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static UpdateRewrite(req: SkoalaApiHostedV1alpha1Mesh.UpdateRewriteReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.UpdateRewriteRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.UpdateRewriteReq, SkoalaApiHostedV1alpha1Mesh.UpdateRewriteRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/rewrite/${req["port"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
@@ -590,7 +593,7 @@ export class Mesh {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetRetryReq, SkoalaApiHostedV1alpha1Mesh.GetRetryRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/retry/${req["port"]}?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
   }
   static CreateRetry(req: SkoalaApiHostedV1alpha1Mesh.CreateRetryReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.CreateRetryRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateRetryReq, SkoalaApiHostedV1alpha1Mesh.CreateRetryRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/retry/${req["port"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateRetryReq, SkoalaApiHostedV1alpha1Mesh.CreateRetryRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/retry`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static UpdateRetry(req: SkoalaApiHostedV1alpha1Mesh.UpdateRetryReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.UpdateRetryRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.UpdateRetryReq, SkoalaApiHostedV1alpha1Mesh.UpdateRetryRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/retry/${req["port"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
@@ -605,7 +608,7 @@ export class Mesh {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.GetTimeoutReq, SkoalaApiHostedV1alpha1Mesh.GetTimeoutRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/timeout/${req["port"]}?${fm.renderURLSearchParams(req, ["workspaceId", "meshId", "namespaceName", "serviceName", "port"])}`, {...initReq, method: "GET"})
   }
   static CreateTimeout(req: SkoalaApiHostedV1alpha1Mesh.CreateTimeoutReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.CreateTimeoutRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateTimeoutReq, SkoalaApiHostedV1alpha1Mesh.CreateTimeoutRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/timeout/${req["port"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.CreateTimeoutReq, SkoalaApiHostedV1alpha1Mesh.CreateTimeoutRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/timeout`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static UpdateTimeout(req: SkoalaApiHostedV1alpha1Mesh.UpdateTimeoutReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.UpdateTimeoutRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Mesh.UpdateTimeoutReq, SkoalaApiHostedV1alpha1Mesh.UpdateTimeoutRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/meshes/${req["meshId"]}/namespaces/${req["namespaceName"]}/services/${req["serviceName"]}/timeout/${req["port"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
@@ -885,6 +888,6 @@ 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)})
   }
 }

package/package.json

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