@daocloud-proto/ghippo 0.9.21 → 0.9.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@daocloud-proto/ghippo",
-    "version":"0.9.21",
+    "version":"0.9.22",
     "description": "",
     "author": "",
     "license": "ISC"

package/v1alpha1/workspace.pb.ts

@@ -46,6 +46,19 @@ export type WorkspacesResourceInfo = {
   workspaceResourceId?: number
 }
 
+export type ListResourcesRequest = {
+  page?: number
+  pageSize?: number
+  workspaceId?: number
+  resourceName?: string
+  resourceType?: string
+}
+
+export type ListResourcesResponse = {
+  items?: ResourceInfo[]
+  pagination?: Pagination
+}
+
 export type ListExclusiveResourcesByWorkspaceRequest = {
   page?: number
   pageSize?: number
@@ -71,7 +84,7 @@ export type ListSharedResourcesByWorkspaceResponse = {
   pagination?: Pagination
 }
 
-export type BindResourceToWorkspaceRequest = {
+export type BindExclusiveResourceToWorkspaceRequest = {
   workspaceId?: number
   resourceName?: string
   resourceType?: string
@@ -79,7 +92,7 @@ export type BindResourceToWorkspaceRequest = {
   gproduct?: string
 }
 
-export type BindResourceToWorkspaceResponse = {
+export type BindExclusiveResourceToWorkspaceResponse = {
 }
 
 export type UnbindResourceFromWorkspaceRequest = {
@@ -265,18 +278,6 @@ export type ResourceInfo = {
   resourceScope?: string
 }
 
-export type ListResourcesRequest = {
-  page?: number
-  pageSize?: number
-  name?: string
-  type?: string
-}
-
-export type ListResourcesResponse = {
-  items?: ResourceInfo[]
-  pagination?: Pagination
-}
-
 export type ListExclusiveResourceTypesRequest = {
 }
 
@@ -291,40 +292,22 @@ export type ListSharedResourceTypesResponse = {
   items?: string[]
 }
 
-export type Resource = {
-  resourceName?: string
-  resourceType?: string
-  resourceScope?: string
-  gproduct?: string
-}
-
-export type BindResourceAndSetQuotaHardToWorkspaceRequest = {
-  resourceName?: string
-  resourceType?: string
-  gproduct?: string
-  workspaceId?: number
-  quotaHard?: {[key: string]: string}
-}
-
-export type BindResourceAndSetQuotaHardToWorkspaceResponse = {
-}
-
-export type SetQuotaHardForWorkspaceResourceRequest = {
+export type SetQuotaHardForWorkspaceSharedResourceRequest = {
   workspaceResourceId?: number
   quotaHard?: {[key: string]: string}
 }
 
-export type SetQuotaHardForWorkspaceResourceResponse = {
+export type SetQuotaHardForWorkspaceSharedResourceResponse = {
 }
 
-export type GetWorkspaceResourceQuotaRequest = {
+export type GetWorkspaceSharedResourceQuotaRequest = {
   workspaceId?: number
   resourceName?: string
   resourceType?: string
   notFormatted?: boolean
 }
 
-export type GetWorkspaceResourceQuotaResponse = {
+export type GetWorkspaceSharedResourceQuotaResponse = {
   setting?: {[key: string]: string}
   allocatable?: {[key: string]: string}
   used?: {[key: string]: string}
@@ -420,17 +403,20 @@ export class Workspace {
   static ListWorkspaces(req: ListWorkspacesRequest, initReq?: fm.InitReq): Promise<ListWorkspacesResponse> {
     return fm.fetchReq<ListWorkspacesRequest, ListWorkspacesResponse>(`/apis/ghippo.io/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
+  static ListResources(req: ListResourcesRequest, initReq?: fm.InitReq): Promise<ListResourcesResponse> {
+    return fm.fetchReq<ListResourcesRequest, ListResourcesResponse>(`/apis/ghippo.io/v1alpha1/workspaces/resources?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
   static ListExclusiveResourcesByWorkspace(req: ListExclusiveResourcesByWorkspaceRequest, initReq?: fm.InitReq): Promise<ListExclusiveResourcesByWorkspaceResponse> {
     return fm.fetchReq<ListExclusiveResourcesByWorkspaceRequest, ListExclusiveResourcesByWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/exclusiveresources?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
   static ListSharedResourcesByWorkspace(req: ListSharedResourcesByWorkspaceRequest, initReq?: fm.InitReq): Promise<ListSharedResourcesByWorkspaceResponse> {
     return fm.fetchReq<ListSharedResourcesByWorkspaceRequest, ListSharedResourcesByWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/sharedresources?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
-  static BindResourceToWorkspace(req: BindResourceToWorkspaceRequest, initReq?: fm.InitReq): Promise<BindResourceToWorkspaceResponse> {
-    return fm.fetchReq<BindResourceToWorkspaceRequest, BindResourceToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-resource`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  static BindExclusiveResourceToWorkspace(req: BindExclusiveResourceToWorkspaceRequest, initReq?: fm.InitReq): Promise<BindExclusiveResourceToWorkspaceResponse> {
+    return fm.fetchReq<BindExclusiveResourceToWorkspaceRequest, BindExclusiveResourceToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-exclusiveresource`, {...initReq, method: "POST", body: JSON.stringify(req)})
   }
   static BindSharedResourceToWorkspace(req: BindSharedResourceToWorkspaceRequest, initReq?: fm.InitReq): Promise<BindSharedResourceToWorkspaceResponse> {
-    return fm.fetchReq<BindSharedResourceToWorkspaceRequest, BindSharedResourceToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-shared-resource`, {...initReq, method: "POST", body: JSON.stringify(req)})
+    return fm.fetchReq<BindSharedResourceToWorkspaceRequest, BindSharedResourceToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-sharedresource`, {...initReq, method: "POST", body: JSON.stringify(req)})
   }
   static UnbindResourceFromWorkspace(req: UnbindResourceFromWorkspaceRequest, initReq?: fm.InitReq): Promise<UnbindResourceFromWorkspaceResponse> {
     return fm.fetchReq<UnbindResourceFromWorkspaceRequest, UnbindResourceFromWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/unbind-resource`, {...initReq, method: "PUT", body: JSON.stringify(req)})
@@ -477,26 +463,20 @@ export class Workspace {
   static ListMembersRolesByFolder(req: ListMembersRolesByFolderRequest, initReq?: fm.InitReq): Promise<ListMembersRolesByFolderResponse> {
     return fm.fetchReq<ListMembersRolesByFolderRequest, ListMembersRolesByFolderResponse>(`/apis/ghippo.io/v1alpha1/folders/${req["folderId"]}/members-roles?${fm.renderURLSearchParams(req, ["folderId"])}`, {...initReq, method: "GET"})
   }
-  static ListResources(req: ListResourcesRequest, initReq?: fm.InitReq): Promise<ListResourcesResponse> {
-    return fm.fetchReq<ListResourcesRequest, ListResourcesResponse>(`/apis/ghippo.io/v1alpha1/resources?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
-  }
   static ListExclusiveResourceTypes(req: ListExclusiveResourceTypesRequest, initReq?: fm.InitReq): Promise<ListExclusiveResourceTypesResponse> {
     return fm.fetchReq<ListExclusiveResourceTypesRequest, ListExclusiveResourceTypesResponse>(`/apis/ghippo.io/v1alpha1/exclusiveresource-types?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static ListSharedResourceTypes(req: ListSharedResourceTypesRequest, initReq?: fm.InitReq): Promise<ListSharedResourceTypesResponse> {
     return fm.fetchReq<ListSharedResourceTypesRequest, ListSharedResourceTypesResponse>(`/apis/ghippo.io/v1alpha1/sharedresource-types?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
-  static BindResourceAndSetQuotaHardToWorkspace(req: BindResourceAndSetQuotaHardToWorkspaceRequest, initReq?: fm.InitReq): Promise<BindResourceAndSetQuotaHardToWorkspaceResponse> {
-    return fm.fetchReq<BindResourceAndSetQuotaHardToWorkspaceRequest, BindResourceAndSetQuotaHardToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-resource-setquota`, {...initReq, method: "POST", body: JSON.stringify(req)})
-  }
   static BindSharedResourceAndSetQuotaHardToWorkspace(req: BindSharedResourceAndSetQuotaHardToWorkspaceRequest, initReq?: fm.InitReq): Promise<BindSharedResourceAndSetQuotaHardToWorkspaceResponse> {
-    return fm.fetchReq<BindSharedResourceAndSetQuotaHardToWorkspaceRequest, BindSharedResourceAndSetQuotaHardToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-shared-resource-setquota`, {...initReq, method: "POST", body: JSON.stringify(req)})
+    return fm.fetchReq<BindSharedResourceAndSetQuotaHardToWorkspaceRequest, BindSharedResourceAndSetQuotaHardToWorkspaceResponse>(`/apis/ghippo.io/v1alpha1/workspaces/${req["workspaceId"]}/bind-sharedresource-setquota`, {...initReq, method: "POST", body: JSON.stringify(req)})
   }
-  static SetQuotaHardForWorkspaceResource(req: SetQuotaHardForWorkspaceResourceRequest, initReq?: fm.InitReq): Promise<SetQuotaHardForWorkspaceResourceResponse> {
-    return fm.fetchReq<SetQuotaHardForWorkspaceResourceRequest, SetQuotaHardForWorkspaceResourceResponse>(`/apis/ghippo.io/v1alpha1/workspaceresource-quota-hard`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+  static SetQuotaHardForWorkspaceSharedResource(req: SetQuotaHardForWorkspaceSharedResourceRequest, initReq?: fm.InitReq): Promise<SetQuotaHardForWorkspaceSharedResourceResponse> {
+    return fm.fetchReq<SetQuotaHardForWorkspaceSharedResourceRequest, SetQuotaHardForWorkspaceSharedResourceResponse>(`/apis/ghippo.io/v1alpha1/workspace-sharedresource-quota-hard`, {...initReq, method: "PUT", body: JSON.stringify(req)})
   }
-  static GetWorkspaceResourceQuota(req: GetWorkspaceResourceQuotaRequest, initReq?: fm.InitReq): Promise<GetWorkspaceResourceQuotaResponse> {
-    return fm.fetchReq<GetWorkspaceResourceQuotaRequest, GetWorkspaceResourceQuotaResponse>(`/apis/ghippo.io/v1alpha1/workspaceresource-quota?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  static GetWorkspaceSharedResourceQuota(req: GetWorkspaceSharedResourceQuotaRequest, initReq?: fm.InitReq): Promise<GetWorkspaceSharedResourceQuotaResponse> {
+    return fm.fetchReq<GetWorkspaceSharedResourceQuotaRequest, GetWorkspaceSharedResourceQuotaResponse>(`/apis/ghippo.io/v1alpha1/workspace-sharedresource-quota?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static ListResourceQuotaTypes(req: ListResourceQuotaTypesRequest, initReq?: fm.InitReq): Promise<ListResourceQuotaTypesResponse> {
     return fm.fetchReq<ListResourceQuotaTypesRequest, ListResourceQuotaTypesResponse>(`/apis/ghippo.io/v1alpha1/resourcequota-types?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})