@daocloud-proto/ghippo 0.7.12 → 0.7.15

package/package.json

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

package/v1alpha1/gproductlicense.pb.ts

@@ -13,7 +13,7 @@ export type ListGProductLicensesResponse = {
 }
 
 export type GetGProductLicensesRequest = {
-  name?: string
+  id?: string
 }
 
 export type GetGProductLicensesResponse = {
@@ -29,7 +29,6 @@ export type UpdateGProductLicensesResponse = {
 }
 
 export type GetGProductLicenseYamlRequest = {
-  name?: string
 }
 
 export type GetGProductLicenseYamlResponse = {
@@ -37,7 +36,7 @@ export type GetGProductLicenseYamlResponse = {
 }
 
 export type DeleteProductLicensesRequest = {
-  name?: string
+  id?: string
 }
 
 export type DeleteProductLicensesResponse = {
@@ -58,6 +57,7 @@ export type GetGProductLicensesOverQuotaResponse = {
 }
 
 export type GProductLicense = {
+  id?: string
   name?: string
   module?: string
   level?: string
@@ -66,6 +66,7 @@ export type GProductLicense = {
 }
 
 export type GProductLicenseInfo = {
+  id?: string
   name?: string
   module?: string
   licenseKey?: string
@@ -82,7 +83,7 @@ export class GProducts {
     return fm.fetchReq<ListGProductLicensesRequest, ListGProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static GetGProductLicenses(req: GetGProductLicensesRequest, initReq?: fm.InitReq): Promise<GetGProductLicensesResponse> {
-    return fm.fetchReq<GetGProductLicensesRequest, GetGProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/${req["name"]}?${fm.renderURLSearchParams(req, ["name"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<GetGProductLicensesRequest, GetGProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/${req["id"]}?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
   }
   static UpdateGProductLicenses(req: UpdateGProductLicensesRequest, initReq?: fm.InitReq): Promise<UpdateGProductLicensesResponse> {
     return fm.fetchReq<UpdateGProductLicensesRequest, UpdateGProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses`, {...initReq, method: "PUT", body: JSON.stringify(req)})
@@ -91,7 +92,7 @@ export class GProducts {
     return fm.fetchReq<GetGProductLicenseYamlRequest, GetGProductLicenseYamlResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/yaml?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static DeleteGProductLicenses(req: DeleteProductLicensesRequest, initReq?: fm.InitReq): Promise<DeleteProductLicensesResponse> {
-    return fm.fetchReq<DeleteProductLicensesRequest, DeleteProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/${req["name"]}`, {...initReq, method: "DELETE"})
+    return fm.fetchReq<DeleteProductLicensesRequest, DeleteProductLicensesResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/${req["id"]}`, {...initReq, method: "DELETE"})
   }
   static GetGProductLicensesESN(req: GetGProductLicensesESNRequest, initReq?: fm.InitReq): Promise<GetGProductLicensesESNResponse> {
     return fm.fetchReq<GetGProductLicensesESNRequest, GetGProductLicensesESNResponse>(`/apis/ghippo.io/v1alpha1/gproduct-licenses/esn?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})

package/v1alpha1/ldap.pb.ts

@@ -11,7 +11,7 @@ export type GetLdapRequest = {
 export type GetLdapResponse = {
   id?: string
   name?: string
-  providerType?: string
+  vendor?: string
   startTls?: string
   ldapProtocol?: string
   ldapHost?: string
@@ -24,7 +24,7 @@ export type GetLdapResponse = {
 }
 
 export type CreateLdapRequest = {
-  providerType?: string
+  vendor?: string
   startTls?: string
   ldapProtocol?: string
   ldapHost?: string
@@ -56,7 +56,7 @@ export type TestLdapConnectionResponse = {
 
 export type UpdateLdapRequest = {
   id?: string
-  providerType?: string
+  vendor?: string
   startTls?: string
   ldapProtocol?: string
   ldapHost?: string
@@ -75,7 +75,7 @@ export type SyncUsersRequest = {
   id?: string
 }
 
-export type SyncUserResponse = {
+export type SyncUsersResponse = {
   ignored?: boolean
   added?: number
   updated?: number
@@ -91,6 +91,61 @@ export type DeleteLdapRequest = {
 export type DeleteLdapResponse = {
 }
 
+export type GetLdapGroupRequest = {
+  id?: string
+}
+
+export type GetLdapGroupResponse = {
+  id?: string
+  groupDn?: string
+  groupObjectClasses?: string
+  groupNameLdapAttribute?: string
+}
+
+export type CreateLdapGroupRequest = {
+  id?: string
+  groupDn?: string
+  groupObjectClasses?: string
+  groupNameLdapAttribute?: string
+}
+
+export type CreateLdapGroupResponse = {
+  id?: string
+}
+
+export type UpdateLdapGroupRequest = {
+  ldapId?: string
+  id?: string
+  groupDn?: string
+  groupObjectClasses?: string
+  groupNameLdapAttribute?: string
+}
+
+export type UpdateLdapGroupResponse = {
+}
+
+export type DeleteLdapGroupRequest = {
+  ldapId?: string
+  id?: string
+}
+
+export type DeleteLdapGroupResponse = {
+}
+
+export type SyncLdapGroupsRequest = {
+  ldapId?: string
+  id?: string
+}
+
+export type SyncLdapGroupsResponse = {
+  ignored?: boolean
+  added?: number
+  updated?: number
+  removed?: number
+  failed?: number
+  status?: string
+}
+
 export class Ldap {
   static GetLdap(req: GetLdapRequest, initReq?: fm.InitReq): Promise<GetLdapResponse> {
     return fm.fetchReq<GetLdapRequest, GetLdapResponse>(`/apis/ghippo.io/v1alpha1/ldap?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
@@ -104,10 +159,25 @@ export class Ldap {
   static UpdateLdap(req: UpdateLdapRequest, initReq?: fm.InitReq): Promise<UpdateLdapResponse> {
     return fm.fetchReq<UpdateLdapRequest, UpdateLdapResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}`, {...initReq, method: "PUT", body: JSON.stringify(req)})
   }
-  static SyncUsers(req: SyncUsersRequest, initReq?: fm.InitReq): Promise<SyncUserResponse> {
-    return fm.fetchReq<SyncUsersRequest, SyncUserResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}/sync?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
+  static SyncUsers(req: SyncUsersRequest, initReq?: fm.InitReq): Promise<SyncUsersResponse> {
+    return fm.fetchReq<SyncUsersRequest, SyncUsersResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}/sync?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
   }
   static DeleteLdap(req: DeleteLdapRequest, initReq?: fm.InitReq): Promise<DeleteLdapResponse> {
     return fm.fetchReq<DeleteLdapRequest, DeleteLdapResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}`, {...initReq, method: "DELETE"})
   }
+  static GetLdapGroup(req: GetLdapGroupRequest, initReq?: fm.InitReq): Promise<GetLdapGroupResponse> {
+    return fm.fetchReq<GetLdapGroupRequest, GetLdapGroupResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}/group?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
+  }
+  static CreateLdapGroup(req: CreateLdapGroupRequest, initReq?: fm.InitReq): Promise<CreateLdapGroupResponse> {
+    return fm.fetchReq<CreateLdapGroupRequest, CreateLdapGroupResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["id"]}/group`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static UpdateLdapGroup(req: UpdateLdapGroupRequest, initReq?: fm.InitReq): Promise<UpdateLdapGroupResponse> {
+    return fm.fetchReq<UpdateLdapGroupRequest, UpdateLdapGroupResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["ldapId"]}/group/${req["id"]}`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+  }
+  static DeleteLdapGroup(req: DeleteLdapGroupRequest, initReq?: fm.InitReq): Promise<DeleteLdapGroupResponse> {
+    return fm.fetchReq<DeleteLdapGroupRequest, DeleteLdapGroupResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["ldapId"]}/group/${req["id"]}`, {...initReq, method: "DELETE"})
+  }
+  static SyncLdapGroups(req: SyncLdapGroupsRequest, initReq?: fm.InitReq): Promise<SyncLdapGroupsResponse> {
+    return fm.fetchReq<SyncLdapGroupsRequest, SyncLdapGroupsResponse>(`/apis/ghippo.io/v1alpha1/ldap/${req["ldapId"]}/group/${req["id"]}/sync?${fm.renderURLSearchParams(req, ["ldapId", "id"])}`, {...initReq, method: "GET"})
+  }
 }

package/v1alpha1/workspace.pb.ts

@@ -27,7 +27,7 @@ export type ListWorkspacesResponse = {
   pagination?: Pagination
 }
 
-export type ResourceInfo = {
+export type WorkspacesResourceInfo = {
   resourceName?: string
   resourceType?: string
   resourceScope?: string
@@ -35,15 +35,15 @@ export type ResourceInfo = {
   workspaceId?: number
 }
 
-export type ListResourcesRequest = {
+export type ListWorkspacesResourcesRequest = {
   page?: number
   pageSize?: number
   workspaceId?: number
   gproduct?: string
 }
 
-export type ListResourcesResponse = {
-  items?: ResourceInfo[]
+export type ListWorkspacesResourcesResponse = {
+  items?: WorkspacesResourceInfo[]
   pagination?: Pagination
 }
 
@@ -54,7 +54,7 @@ export type ListExclusiveResourcesByWorkspaceRequest = {
 }
 
 export type ListExclusiveResourcesByWorkspaceResponse = {
-  items?: ResourceInfo[]
+  items?: WorkspacesResourceInfo[]
   pagination?: Pagination
 }
 
@@ -65,7 +65,7 @@ export type ListSharedResourcesByWorkspaceRequest = {
 }
 
 export type ListSharedResourcesByWorkspaceResponse = {
-  items?: ResourceInfo[]
+  items?: WorkspacesResourceInfo[]
   pagination?: Pagination
 }
 
@@ -253,19 +253,19 @@ export type ListMembersRolesResourcesResponse = {
   pagination?: Pagination
 }
 
-export type ProductSubResourceInfo = {
+export type SubResourceInfo = {
   type?: string
   names?: string[]
 }
 
-export type ProductResourceInfo = {
+export type ResourceInfo = {
   name?: string
   type?: string
   gproduct?: string
-  subresource?: ProductSubResourceInfo
+  subresource?: SubResourceInfo
 }
 
-export type ListProductResourcesRequest = {
+export type ListResourcesRequest = {
   page?: number
   pageSize?: number
   name?: string
@@ -273,12 +273,12 @@ export type ListProductResourcesRequest = {
   type?: string
 }
 
-export type ListProductResourcesResponse = {
-  items?: ProductResourceInfo[]
+export type ListResourcesResponse = {
+  items?: ResourceInfo[]
   pagination?: Pagination
 }
 
-export type ProductResourceType = {
+export type ResourceType = {
   parent?: boolean
   name?: string
 }
@@ -287,7 +287,7 @@ export type ListResourceTypesRequest = {
 }
 
 export type ListResourceTypesResponse = {
-  items?: ProductResourceType[]
+  items?: ResourceType[]
   pagination?: Pagination
 }
 
@@ -295,7 +295,7 @@ export type ListExclusiveResourceTypesRequest = {
 }
 
 export type ListExclusiveResourceTypesResponse = {
-  items?: ProductResourceType[]
+  items?: ResourceType[]
   pagination?: Pagination
 }
 
@@ -303,48 +303,68 @@ export type ListSharedResourceTypesRequest = {
 }
 
 export type ListSharedResourceTypesResponse = {
-  items?: ProductResourceType[]
+  items?: ResourceType[]
   pagination?: Pagination
 }
 
+export type Resource = {
+  resourceName?: string
+  resourceType?: string
+  resourceScope?: string
+  gproduct?: string
+}
+
+export type QuotaHard = {
+  limits?: QuotaResource
+  requests?: QuotaResource
+}
+
+export type QuotaResource = {
+  cpu?: string
+  memory?: string
+}
+
 export type BindResourceAndSetQuotaHardToWorkspaceRequest = {
-  workspaceId?: number
   resourceName?: string
+  resourceType?: string
+  gproduct?: string
+  workspaceId?: number
+  quotaHard?: QuotaHard
 }
 
 export type BindResourceAndSetQuotaHardToWorkspaceResponse = {
 }
 
 export type SetQuotaHardForWorkspaceResourceRequest = {
+  workspaceResourceId?: number
+  quotaHard?: QuotaHard
 }
 
 export type SetQuotaHardForWorkspaceResourceResponse = {
 }
 
 export type GetWorkspaceResourceQuotaUsedRequest = {
+  workspaceId?: number
+  cluster?: string
 }
 
 export type GetWorkspaceResourceQuotaUsedResponse = {
-}
-
-export type GetWorkspaceResourceQuotaAllocatableRequest = {
-}
-
-export type GetWorkspaceResourceQuotaAllocatableResponse = {
+  quota?: {[key: string]: string}
 }
 
 export type ListResourceQuotaTypesRequest = {
 }
 
 export type ListResourceQuotaTypesResponse = {
+  items?: string[]
 }
 
 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/resources?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  static ListWorkspacesResources(req: ListWorkspacesResourcesRequest, initReq?: fm.InitReq): Promise<ListWorkspacesResourcesResponse> {
+    return fm.fetchReq<ListWorkspacesResourcesRequest, ListWorkspacesResourcesResponse>(`/apis/ghippo.io/v1alpha1/workspacesresources?${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"})
@@ -400,8 +420,8 @@ export class Workspace {
   static ListMembersRolesResources(req: ListMembersRolesResourcesRequest, initReq?: fm.InitReq): Promise<ListMembersRolesResourcesResponse> {
     return fm.fetchReq<ListMembersRolesResourcesRequest, ListMembersRolesResourcesResponse>(`/apis/ghippo.io/v1alpha1/resources/members-roles?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
-  static ListProductResources(req: ListProductResourcesRequest, initReq?: fm.InitReq): Promise<ListProductResourcesResponse> {
-    return fm.fetchReq<ListProductResourcesRequest, ListProductResourcesResponse>(`/apis/ghippo.io/v1alpha1/product-resources?${fm.renderURLSearchParams(req, [])}`, {...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 ListResourceTypes(req: ListResourceTypesRequest, initReq?: fm.InitReq): Promise<ListResourceTypesResponse> {
     return fm.fetchReq<ListResourceTypesRequest, ListResourceTypesResponse>(`/apis/ghippo.io/v1alpha1/resource-types?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
@@ -421,9 +441,6 @@ export class Workspace {
   static GetWorkspaceResourceQuotaUsed(req: GetWorkspaceResourceQuotaUsedRequest, initReq?: fm.InitReq): Promise<GetWorkspaceResourceQuotaUsedResponse> {
     return fm.fetchReq<GetWorkspaceResourceQuotaUsedRequest, GetWorkspaceResourceQuotaUsedResponse>(`/apis/ghippo.io/v1alpha1/workspaceresource-quota-used?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
-  static GetWorkspaceResourceQuotaAllocatable(req: GetWorkspaceResourceQuotaAllocatableRequest, initReq?: fm.InitReq): Promise<GetWorkspaceResourceQuotaAllocatableResponse> {
-    return fm.fetchReq<GetWorkspaceResourceQuotaAllocatableRequest, GetWorkspaceResourceQuotaAllocatableResponse>(`/apis/ghippo.io/v1alpha1/workspaceresource-quota-allocatable?${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"})
   }