@daocloud-proto/zestu 0.1.0-dev-3146bd8a → 0.1.0-dev-b9706963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"@daocloud-proto/zestu",
-  "version":"v0.1.0-dev-3146bd8a",
+  "version":"v0.1.0-dev-b9706963",
   "description": "",
   "main": "index.js",
   "scripts": {

package/zestu.io/api/containerinstance/v1alpha1/containerinstance.pb.ts

@@ -5,6 +5,7 @@
 */
 
 import * as ZestuIoApiTypesPage from "../../types/page.pb"
+import * as ZestuIoApiTypesTypes from "../../types/types.pb"
 
 export enum ImageType {
   IMAGE_TYPE_UNSPECIFIED = "IMAGE_TYPE_UNSPECIFIED",
@@ -14,16 +15,6 @@ export enum ImageType {
   IMAGE_PRIVATE = "IMAGE_PRIVATE",
 }
 
-export enum ChargeMode {
-  CHARGE_MODE_UNSPECIFIED = "CHARGE_MODE_UNSPECIFIED",
-  CHARGE_ELASTIC = "CHARGE_ELASTIC",
-  CHARGE_HOUR = "CHARGE_HOUR",
-  CHARGE_DAY = "CHARGE_DAY",
-  CHARGE_WEEK = "CHARGE_WEEK",
-  CHARGE_MONTH = "CHARGE_MONTH",
-  CHARGE_YEAR = "CHARGE_YEAR",
-}
-
 export enum InstanceType {
   INSTANCE_TYPE_UNSPECIFIED = "INSTANCE_TYPE_UNSPECIFIED",
   POD = "POD",
@@ -42,10 +33,10 @@ export enum InstanceStatus {
 
 export enum NetworkType {
   NETWORK_TYPE_UNSPECIFIED = "NETWORK_TYPE_UNSPECIFIED",
-  NETWORK_TYPE_SSH = "NETWORK_TYPE_SSH",
-  NETWORK_TYPE_JUPYTER = "NETWORK_TYPE_JUPYTER",
-  NETWORK_TYPE_VSCODE = "NETWORK_TYPE_VSCODE",
-  NETWORK_TYPE_CUSTOM = "NETWORK_TYPE_CUSTOM",
+  SSH = "SSH",
+  JUPYTER = "JUPYTER",
+  VSCODE = "VSCODE",
+  CUSTOM = "CUSTOM",
 }
 
 export enum NetworkProtocol {
@@ -76,11 +67,27 @@ export type ContainerInstance = {
   instanceId?: string
   status?: InstanceStatus
   charge?: ChargeInfo
-  hardware?: {[key: string]: string}
+  hardware?: Hardware
   volumeSpec?: VolumeSpec[]
   image?: string
   instanceSpec?: InstanceSpec
   regionId?: string
+  servers?: Server[]
+}
+
+export type Hardware = {
+  systemDiskSize?: string
+  gpuMemory?: string
+  cpuNum?: number
+  memory?: string
+  gpuType?: string
+  gpuNum?: number
+}
+
+export type Server = {
+  available?: boolean
+  type?: NetworkType
+  url?: string
 }
 
 export type CreateContainerInstanceRequest = {
@@ -110,7 +117,7 @@ export type CreateContainerInstanceResponse = {
 }
 
 export type ChargeInfo = {
-  chargeMode?: ChargeMode
+  chargeMode?: ZestuIoApiTypesTypes.BillingType
   duration?: number
 }
 
@@ -131,7 +138,6 @@ export type ServiceEnable = {
 }
 
 export type StopContainerInstanceRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
 }
@@ -141,7 +147,6 @@ export type StopContainerInstanceResponse = {
 }
 
 export type StartContainerInstanceRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
 }
@@ -151,13 +156,11 @@ export type StartContainerInstanceResponse = {
 }
 
 export type DeleteContainerInstanceRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
 }
 
 export type ListContainerInstanceNetworksRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
 }
@@ -184,7 +187,6 @@ export type ContainerInstanceNetwork = {
 }
 
 export type AddContainerInstanceNetworkRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
   protocol?: NetworkProtocol
@@ -196,19 +198,8 @@ export type AddContainerInstanceNetworkResponse = {
 }
 
 export type DeleteContainerInstanceNetworkRequest = {
-  namespace?: string
   instanceId?: string
   regionId?: string
   protocol?: NetworkProtocol
   port?: number
-}
-
-export type Region = {
-  regionId?: string
-  regionNameCh?: string
-  regionNameEng?: string
-}
-
-export type ListRegionsResponse = {
-  items?: Region[]
 }

package/zestu.io/api/region/v1alpha1/region.pb.ts

@@ -5,8 +5,7 @@
 */
 export type Region = {
   regionId?: string
-  regionNameCh?: string
-  regionNameEng?: string
+  regionName?: string
 }
 
 export type ListRegionsResponse = {

package/zestu.io/api/v1alpha1/zestu.pb.ts

@@ -27,7 +27,7 @@ export class ContainerInstance {
     return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.StartContainerInstanceRequest, ZestuIoApiContainerinstanceV1alpha1Containerinstance.StartContainerInstanceResponse>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}/start`, {...initReq, method: "PATCH", body: JSON.stringify(req)})
   }
   static DeleteContainerInstance(req: ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceRequest, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
-    return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceRequest, GoogleProtobufEmpty.Empty>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}`, {...initReq, method: "DELETE", body: JSON.stringify(req)})
+    return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceRequest, GoogleProtobufEmpty.Empty>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}`, {...initReq, method: "DELETE"})
   }
   static AddContainerInstanceNetwork(req: ZestuIoApiContainerinstanceV1alpha1Containerinstance.AddContainerInstanceNetworkRequest, initReq?: fm.InitReq): Promise<ZestuIoApiContainerinstanceV1alpha1Containerinstance.AddContainerInstanceNetworkResponse> {
     return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.AddContainerInstanceNetworkRequest, ZestuIoApiContainerinstanceV1alpha1Containerinstance.AddContainerInstanceNetworkResponse>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}/ports`, {...initReq, method: "POST", body: JSON.stringify(req)})
@@ -36,7 +36,7 @@ export class ContainerInstance {
     return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.ListContainerInstanceNetworksRequest, ZestuIoApiContainerinstanceV1alpha1Containerinstance.ListContainerInstanceNetworksResponse>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}/ports?${fm.renderURLSearchParams(req, ["regionId", "instanceId"])}`, {...initReq, method: "GET"})
   }
   static DeleteContainerInstanceNetwork(req: ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceNetworkRequest, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
-    return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceNetworkRequest, GoogleProtobufEmpty.Empty>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}/ports`, {...initReq, method: "DELETE", body: JSON.stringify(req)})
+    return fm.fetchReq<ZestuIoApiContainerinstanceV1alpha1Containerinstance.DeleteContainerInstanceNetworkRequest, GoogleProtobufEmpty.Empty>(`/apis/zestu.io/v1/region/${req["regionId"]}/containerinstances/${req["instanceId"]}/ports`, {...initReq, method: "DELETE"})
   }
 }
 export class Region {