@cloudbase/cli 2.0.0 → 2.0.1

package/src/run/image/index.ts

@@ -1,4 +1,4 @@
-export * from './build'
-export * from './list'
-export * from './delete'
+export * from './build'
+export * from './list'
+export * from './delete'
 export * from './info'

package/src/run/image/info.ts

@@ -1,27 +1,27 @@
-import { access, constants, readFileSync } from 'fs'
-import { join } from 'path'
-import { CloudBaseError } from '../../error'
-
-// 查看本地是否已经登录腾讯云docker仓库
-export const getAuthFlag = async () => {
-    const USER_HOME = process.env.HOME || process.env.USERPROFILE
-
-    try {
-        await (new Promise(
-            (resolve, reject) => {
-                access(
-                    join(USER_HOME, '.docker/config.json'),
-                    constants.F_OK,
-                    err => err ? reject(err) : resolve(true))
-            }))
-    } catch (e) {
-        return false
-    }
-
-
-    const data = JSON.parse(readFileSync(join(USER_HOME, '.docker/config.json')).toString())
-
-    console.log()
-
-    return Boolean(data['auths']['ccr.ccs.tencentyun.com'])
+import { access, constants, readFileSync } from 'fs'
+import { join } from 'path'
+import { CloudBaseError } from '../../error'
+
+// 查看本地是否已经登录腾讯云docker仓库
+export const getAuthFlag = async () => {
+    const USER_HOME = process.env.HOME || process.env.USERPROFILE
+
+    try {
+        await (new Promise(
+            (resolve, reject) => {
+                access(
+                    join(USER_HOME, '.docker/config.json'),
+                    constants.F_OK,
+                    err => err ? reject(err) : resolve(true))
+            }))
+    } catch (e) {
+        return false
+    }
+
+
+    const data = JSON.parse(readFileSync(join(USER_HOME, '.docker/config.json')).toString())
+
+    console.log()
+
+    return Boolean(data['auths']['ccr.ccs.tencentyun.com'])
 }

package/src/run/list.ts

@@ -1,30 +1,30 @@
-import { CloudApiService } from '../utils'
-import {
-    IListRunOptions
-} from '../types'
-
-const scfService = CloudApiService.getInstance('tcb')
-
-export async function listRun(options: IListRunOptions) {
-    const { limit = 20, offset = 0, envId } = options
-    const res: any = await scfService.request('DescribeCloudBaseRunServers', {
-        EnvId: envId,
-        Limit: limit,
-        Offset: offset
-    })
-    const { CloudBaseRunServerSet = [] } = res
-    const data: Record<string, string>[] = []
-    CloudBaseRunServerSet.forEach(run => {
-        const { ServerName, CreatedTime, UpdatedTime, Status, VpcId, ServiceRemark } = run
-        data.push({
-            ServerName,
-            ServiceRemark,
-            CreatedTime,
-            UpdatedTime,
-            VpcId,
-            Status,
-        })
-    })
-
-    return data
+import { CloudApiService } from '../utils'
+import {
+    IListRunOptions
+} from '../types'
+
+const scfService = CloudApiService.getInstance('tcb')
+
+export async function listRun(options: IListRunOptions) {
+    const { limit = 20, offset = 0, envId } = options
+    const res: any = await scfService.request('DescribeCloudBaseRunServers', {
+        EnvId: envId,
+        Limit: limit,
+        Offset: offset
+    })
+    const { CloudBaseRunServerSet = [] } = res
+    const data: Record<string, string>[] = []
+    CloudBaseRunServerSet.forEach(run => {
+        const { ServerName, CreatedTime, UpdatedTime, Status, VpcId, ServiceRemark } = run
+        data.push({
+            ServerName,
+            ServiceRemark,
+            CreatedTime,
+            UpdatedTime,
+            VpcId,
+            Status,
+        })
+    })
+
+    return data
 }

package/src/run/repo.ts

@@ -1,25 +1,25 @@
-import { CloudApiService } from '../utils'
-import {
-    IListVersionOptions
-} from '../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const describeImageRepo = async (options: IListVersionOptions) => {
-    const { ImageRepo } = await tcbService.request('DescribeCloudBaseRunServer', {
-        EnvId: options.envId,
-        Limit: options.limit ? options.limit : 100,
-        Offset: options.offset ? options.offset : 0,
-        ServerName: options.serverName
-    })
-
-    return ImageRepo
-}
-
-export const deleteImageRepo = async (options: { imageRepo: string }) => {
-    const { result } = await tcbService.request('DeleteCloudBaseRunImageRepo', {
-        ImageRepo: options.imageRepo
-    })
-
-    return result
+import { CloudApiService } from '../utils'
+import {
+    IListVersionOptions
+} from '../types'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const describeImageRepo = async (options: IListVersionOptions) => {
+    const { ImageRepo } = await tcbService.request('DescribeCloudBaseRunServer', {
+        EnvId: options.envId,
+        Limit: options.limit ? options.limit : 100,
+        Offset: options.offset ? options.offset : 0,
+        ServerName: options.serverName
+    })
+
+    return ImageRepo
+}
+
+export const deleteImageRepo = async (options: { imageRepo: string }) => {
+    const { result } = await tcbService.request('DeleteCloudBaseRunImageRepo', {
+        ImageRepo: options.imageRepo
+    })
+
+    return result
 }

package/src/run/service/deployPackage.ts

@@ -1,8 +1,8 @@
-import { createBuild } from '..'
-import { CloudBaseError, execWithLoading, loadingFactory, zipDir } from '@cloudbase/toolbox'
-import axios from 'axios'
 import path from 'path'
 import * as fs from 'fs'
+import fetch from 'node-fetch'
+import { createBuild } from '..'
+import { CloudBaseError, execWithLoading, loadingFactory, zipDir } from '@cloudbase/toolbox'
 
 interface IPackageDeploy {
     envId: string,
@@ -44,7 +44,9 @@ export async function packageDeploy(options: IPackageDeploy) {
     try {
         return await execWithLoading(
             async () => {
-                await axios.put(UploadUrl, fs.readFileSync(zipFile), {
+                await fetch(UploadUrl, {
+                    method: 'PUT',
+                    body: fs.createReadStream(zipFile),
                     headers: {
                         'content-type': 'application/zip'
                     }

package/src/run/standalonegateway/create.ts

@@ -1,24 +1,24 @@
-import { ICreateStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const createStandaloneGateway = async (options: ICreateStandaloneGateway) => {
-    const res = await tcbService.request('CreateStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayAlias: options.gatewayAlias,
-        GatewayDesc: options.gatewayDesc,
-        VpcId: options.vpcId,
-        SubnetIds: options.subnetIds,
-        PackageVersion: options.packageVersion
-    })
-    const { GatewayName } = res
-    if (GatewayName === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return GatewayName
-}
+import { ICreateStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const createStandaloneGateway = async (options: ICreateStandaloneGateway) => {
+    const res = await tcbService.request('CreateStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayAlias: options.gatewayAlias,
+        GatewayDesc: options.gatewayDesc,
+        VpcId: options.vpcId,
+        SubnetIds: options.subnetIds,
+        PackageVersion: options.packageVersion
+    })
+    const { GatewayName } = res
+    if (GatewayName === undefined) {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+    return GatewayName
+}

package/src/run/standalonegateway/destroy.ts

@@ -1,19 +1,19 @@
-import { IDestroyStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const destroyStandalonegateway = async (options: IDestroyStandaloneGateway) => {
-    const res = await tcbService.request('DestroyStandaloneGateway', {
-        EnvId: options.envId,
-        IsForce: true,
-        GatewayName: options.gatewayName
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { IDestroyStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const destroyStandalonegateway = async (options: IDestroyStandaloneGateway) => {
+    const res = await tcbService.request('DestroyStandaloneGateway', {
+        EnvId: options.envId,
+        IsForce: true,
+        GatewayName: options.gatewayName
+    })
+
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}

package/src/run/standalonegateway/index.ts

@@ -1,5 +1,5 @@
-export * from './list'
-export * from './create'
-export * from './destroy'
-export * from './package'
+export * from './list'
+export * from './create'
+export * from './destroy'
+export * from './package'
 export * from './turn'

package/src/run/standalonegateway/list.ts

@@ -1,74 +1,74 @@
-import { IListStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listStandalonegateway = async (options: IListStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        GatewayAlias: options.gatewayAlias
-    })
-    // const res = {
-    //     StandaloneGatewayList: [
-    //         {
-    //             CPU: 2,
-    //             GateWayStatus: 'Success',
-    //             GatewayAlias: 'StandaloneGateway',
-    //             GatewayDesc: 'gateway',
-    //             GatewayName: 'x-tcb-cbr-gateway-4e9w8r711205c5',
-    //             InternalClbIp: '10.0.0.30',
-    //             Mem: 4,
-    //             PackageVersion: 'starter',
-    //             PublicClbIp: '1.15.159.47',
-    //             ServiceInfo: [
-    //                 {
-    //                     ServiceName: 'coylexie',
-    //                     Status: 'off'
-    //                 },
-    //                 {
-    //                     ServiceName: 'test',
-    //                     Status: 'on'
-    //                 }
-    //             ],
-    //             SubnetIds: ['subnet-g6ey7mid'],
-    //             VpcId: 'vpc-n73jhksu'
-    //         }
-    //     ],
-    //     Total: 1,
-    //     Error: {
-    //         Message: 'No Error'
-    //     }
-    // }
-    const { StandaloneGatewayList } = res
-    if (StandaloneGatewayList !== undefined) {
-        return StandaloneGatewayList.map((item) => [
-            item['GatewayName'],
-            item['GateWayStatus'],
-            item['GatewayAlias'],
-            item['PackageVersion'],
-            // item['Mem'],
-            // item['CPU'],
-            beautifySubnetList(item['SubnetIds']),
-            item['PublicClbIp'],
-            item['InternalClbIp'],
-            beautifyServiceList(item['ServiceInfo'])
-            // item['GatewayDesc'],
-        ])
-    } else {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-}
-
-const beautifySubnetList = (list: Array<string>) => list.join('\n')
-
-const beautifyServiceList = (list: Array<Record<string, string>>) =>
-    list
-        .map(
-            (item) => '服务 ' + item['ServiceName'] + (item['Status'] === 'on' ? ' 开启' : ' 未开启')
-        )
-        .join('\n')
+import { IListStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const listStandalonegateway = async (options: IListStandaloneGateway) => {
+    const res = await tcbService.request('DescribeStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        GatewayAlias: options.gatewayAlias
+    })
+    // const res = {
+    //     StandaloneGatewayList: [
+    //         {
+    //             CPU: 2,
+    //             GateWayStatus: 'Success',
+    //             GatewayAlias: 'StandaloneGateway',
+    //             GatewayDesc: 'gateway',
+    //             GatewayName: 'x-tcb-cbr-gateway-4e9w8r711205c5',
+    //             InternalClbIp: '10.0.0.30',
+    //             Mem: 4,
+    //             PackageVersion: 'starter',
+    //             PublicClbIp: '1.15.159.47',
+    //             ServiceInfo: [
+    //                 {
+    //                     ServiceName: 'coylexie',
+    //                     Status: 'off'
+    //                 },
+    //                 {
+    //                     ServiceName: 'test',
+    //                     Status: 'on'
+    //                 }
+    //             ],
+    //             SubnetIds: ['subnet-g6ey7mid'],
+    //             VpcId: 'vpc-n73jhksu'
+    //         }
+    //     ],
+    //     Total: 1,
+    //     Error: {
+    //         Message: 'No Error'
+    //     }
+    // }
+    const { StandaloneGatewayList } = res
+    if (StandaloneGatewayList !== undefined) {
+        return StandaloneGatewayList.map((item) => [
+            item['GatewayName'],
+            item['GateWayStatus'],
+            item['GatewayAlias'],
+            item['PackageVersion'],
+            // item['Mem'],
+            // item['CPU'],
+            beautifySubnetList(item['SubnetIds']),
+            item['PublicClbIp'],
+            item['InternalClbIp'],
+            beautifyServiceList(item['ServiceInfo'])
+            // item['GatewayDesc'],
+        ])
+    } else {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+}
+
+const beautifySubnetList = (list: Array<string>) => list.join('\n')
+
+const beautifyServiceList = (list: Array<Record<string, string>>) =>
+    list
+        .map(
+            (item) => '服务 ' + item['ServiceName'] + (item['Status'] === 'on' ? ' 开启' : ' 未开启')
+        )
+        .join('\n')

package/src/run/standalonegateway/package/list.ts

@@ -1,24 +1,24 @@
-import { IListPackageStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listPackageStandalonegateway = async (options: IListPackageStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGatewayPackage', {
-        EnvId: options.envId,
-        PackageVersion: options.packageVersion
-    })
-    const { StandaloneGatewayPackageList } = res
-    if (StandaloneGatewayPackageList === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return StandaloneGatewayPackageList.map((item) => [
-        item['CPU'],
-        item['Mem'],
-        item['PackageVersion']
-    ])
-}
+import { IListPackageStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const listPackageStandalonegateway = async (options: IListPackageStandaloneGateway) => {
+    const res = await tcbService.request('DescribeStandaloneGatewayPackage', {
+        EnvId: options.envId,
+        PackageVersion: options.packageVersion
+    })
+    const { StandaloneGatewayPackageList } = res
+    if (StandaloneGatewayPackageList === undefined) {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+    return StandaloneGatewayPackageList.map((item) => [
+        item['CPU'],
+        item['Mem'],
+        item['PackageVersion']
+    ])
+}

package/src/run/standalonegateway/turn/index.ts

@@ -1,2 +1,2 @@
-export * from './on'
+export * from './on'
 export * from './off'

package/src/run/standalonegateway/turn/off.ts

@@ -1,19 +1,19 @@
-import { ITurnOffStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOffStandalonegateway = async (options: ITurnOffStandaloneGateway) => {
-    const res = await tcbService.request('TurnOffStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { ITurnOffStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const turnOffStandalonegateway = async (options: ITurnOffStandaloneGateway) => {
+    const res = await tcbService.request('TurnOffStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        ServiceNameList: options.serviceList
+    })
+
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}

package/src/run/standalonegateway/turn/on.ts

@@ -1,19 +1,19 @@
-import { ITurnOnStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOnStandalonegateway = async (options: ITurnOnStandaloneGateway) => {
-    const res = await tcbService.request('TurnOnStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-    
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { ITurnOnStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const turnOnStandalonegateway = async (options: ITurnOnStandaloneGateway) => {
+    const res = await tcbService.request('TurnOnStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        ServiceNameList: options.serviceList
+    })
+    
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}