@cloudbase/cli 2.0.3 → 2.0.5

package/src/commands/lowcode/utils.ts

@@ -1,25 +1,25 @@
-import { CloudBaseError } from '@cloudbase/toolbox'
-import { ChildProcess } from 'child_process'
-
-export function promisifyProcess(p: ChildProcess, pipe = false) {
-  return new Promise((resolve, reject) => {
-      let stdout = ''
-      let stderr = ''
-
-      p.stdout.on('data', (data => {
-          stdout +=String(data)
-      }))
-      p.stderr.on('data', (data => {
-          stderr += String(data)
-      }))
-      p.on('error', reject)
-      p.on('exit', exitCode => {
-          exitCode === 0 ? resolve(stdout) : reject(new CloudBaseError(stderr || String(exitCode)))
-      })
-
-      if (pipe) {
-        p.stdout.pipe(process.stdout)
-        p.stderr.pipe(process.stderr)
-      }
-  })
+import { CloudBaseError } from '@cloudbase/toolbox'
+import { ChildProcess } from 'child_process'
+
+export function promisifyProcess(p: ChildProcess, pipe = false) {
+  return new Promise((resolve, reject) => {
+      let stdout = ''
+      let stderr = ''
+
+      p.stdout.on('data', (data => {
+          stdout +=String(data)
+      }))
+      p.stderr.on('data', (data => {
+          stderr += String(data)
+      }))
+      p.on('error', reject)
+      p.on('exit', exitCode => {
+          exitCode === 0 ? resolve(stdout) : reject(new CloudBaseError(stderr || String(exitCode)))
+      })
+
+      if (pipe) {
+        p.stdout.pipe(process.stdout)
+        p.stderr.pipe(process.stderr)
+      }
+  })
 }

package/src/commands/run/image/index.ts

@@ -1,5 +1,5 @@
-export * from './common'
-export * from './download'
-export * from './upload'
-export * from './delete'
+export * from './common'
+export * from './download'
+export * from './upload'
+export * from './delete'
 export * from './list'

package/src/commands/run/list.ts

@@ -1,9 +1,8 @@
 import { Command, ICommand } from '../common'
 import { CloudBaseError } from '../../error'
-import { listRun, logCreate } from '../../run'
-import { printHorizontalTable, loadingFactory } from '../../utils'
+import { listRun } from '../../run'
+import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck} from '../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { checkTcbrEnv, logEnvCheck } from '../../utils'
 import { EnumEnvCheck } from '../../constant'
 
 const StatusMap = {

package/src/commands/run/standalonegateway/common.ts

@@ -1,8 +1,8 @@
-export const standalonegatewayCommonOptions = (sub: string) => ({
-  cmd: 'run',
-  childCmd: {
-    cmd: 'standalonegateway',
-    desc: '云托管小租户网关管理'
-  },
-  childSubCmd: sub
+export const standalonegatewayCommonOptions = (sub: string) => ({
+  cmd: 'run',
+  childCmd: {
+    cmd: 'standalonegateway',
+    desc: '云托管小租户网关管理'
+  },
+  childSubCmd: sub
 })

package/src/commands/run/standalonegateway/create.ts

@@ -1,85 +1,85 @@
-import { Command, ICommand } from '../../common'
-import { createStandaloneGateway } from '../../../run/'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class CreateStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('create'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gA, --gatewayAlias <gatewayAlias>',
-                    desc: '网关 alias'
-                },
-                {
-                    flags: '-gD, --gatewayDesc <gatewayDesc>',
-                    desc: '网关描述'
-                },
-                {
-                    flags: '-v --vpcId <vpcId>',
-                    desc: 'VPC'
-                },
-                {
-                    flags: '-s, --subnetIds <subnetIds...>',
-                    desc: '子网列表'
-                },
-                {
-                    flags: '-p, --packageVersion <packageVersion>',
-                    desc: '套餐版本'
-                }
-            ],
-            desc: '创建小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-
-        let { gatewayAlias = '', gatewayDesc = '', vpcId = '', subnetIds = [], packageVersion = '' } = options
-        gatewayAlias = String(gatewayAlias)
-        gatewayDesc = String(gatewayDesc)
-        vpcId = String(vpcId)
-        packageVersion = String(packageVersion)
-
-        if (vpcId === '') {
-            throw new CloudBaseError('请输入 VPC')
-        }
-
-        if (subnetIds.length === 0) {
-            throw new CloudBaseError('请输入子网列表')
-        }
-
-        if (gatewayDesc === '') {
-            throw new CloudBaseError('请输入网关描述')
-        }
-
-        if (packageVersion === '') {
-            throw new CloudBaseError('请输入套餐版本')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await createStandaloneGateway({
-            envId,
-            gatewayAlias,
-            gatewayDesc,
-            vpcId,
-            subnetIds,
-            packageVersion
-        })
-
-        loading.stop()
-
-        console.log('操作执行成功，网关名称：' + data)
-    }
-}
+import { Command, ICommand } from '../../common'
+import { createStandaloneGateway } from '../../../run/'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class CreateStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('create'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gA, --gatewayAlias <gatewayAlias>',
+                    desc: '网关 alias'
+                },
+                {
+                    flags: '-gD, --gatewayDesc <gatewayDesc>',
+                    desc: '网关描述'
+                },
+                {
+                    flags: '-v --vpcId <vpcId>',
+                    desc: 'VPC'
+                },
+                {
+                    flags: '-s, --subnetIds <subnetIds...>',
+                    desc: '子网列表'
+                },
+                {
+                    flags: '-p, --packageVersion <packageVersion>',
+                    desc: '套餐版本'
+                }
+            ],
+            desc: '创建小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+
+        let { gatewayAlias = '', gatewayDesc = '', vpcId = '', subnetIds = [], packageVersion = '' } = options
+        gatewayAlias = String(gatewayAlias)
+        gatewayDesc = String(gatewayDesc)
+        vpcId = String(vpcId)
+        packageVersion = String(packageVersion)
+
+        if (vpcId === '') {
+            throw new CloudBaseError('请输入 VPC')
+        }
+
+        if (subnetIds.length === 0) {
+            throw new CloudBaseError('请输入子网列表')
+        }
+
+        if (gatewayDesc === '') {
+            throw new CloudBaseError('请输入网关描述')
+        }
+
+        if (packageVersion === '') {
+            throw new CloudBaseError('请输入套餐版本')
+        }
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+
+        const data = await createStandaloneGateway({
+            envId,
+            gatewayAlias,
+            gatewayDesc,
+            vpcId,
+            subnetIds,
+            packageVersion
+        })
+
+        loading.stop()
+
+        console.log('操作执行成功，网关名称：' + data)
+    }
+}

package/src/commands/run/standalonegateway/destroy.ts

@@ -1,59 +1,59 @@
-import { Command, ICommand } from '../../common'
-import { destroyStandalonegateway } from '../../../run'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class DestroyStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('destroy'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gN, --gatewayName <gatewayName>',
-                    desc: '网关 name'
-                },
-                {
-                    flags: '--isForce',
-                    desc: '强制确认删除资源'
-                }
-            ],
-            desc: '销毁小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-
-        let { isForce = false, gatewayName = '' } = options
-        isForce = Boolean(isForce)
-        gatewayName = String(gatewayName)
-
-        if (gatewayName === '') {
-            throw new CloudBaseError('请输入网关名称')
-        }
-
-        if (!isForce) {
-            throw new CloudBaseError('请使用 --isForce 选项确认销毁资源！')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-        
-        await destroyStandalonegateway({
-            envId,
-            gatewayName
-        })
-
-        loading.stop()
-
-        console.log('网关已销毁')
-    }
-}
+import { Command, ICommand } from '../../common'
+import { destroyStandalonegateway } from '../../../run'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class DestroyStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('destroy'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gN, --gatewayName <gatewayName>',
+                    desc: '网关 name'
+                },
+                {
+                    flags: '--isForce',
+                    desc: '强制确认删除资源'
+                }
+            ],
+            desc: '销毁小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+
+        let { isForce = false, gatewayName = '' } = options
+        isForce = Boolean(isForce)
+        gatewayName = String(gatewayName)
+
+        if (gatewayName === '') {
+            throw new CloudBaseError('请输入网关名称')
+        }
+
+        if (!isForce) {
+            throw new CloudBaseError('请使用 --isForce 选项确认销毁资源！')
+        }
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+        
+        await destroyStandalonegateway({
+            envId,
+            gatewayName
+        })
+
+        loading.stop()
+
+        console.log('网关已销毁')
+    }
+}

package/src/commands/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/commands/run/standalonegateway/list.ts

@@ -1,53 +1,53 @@
-import { Command, ICommand } from '../../common'
-import { listStandalonegateway } from '../../../run/standalonegateway'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { printHorizontalTable } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class ListStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('list'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gN, --gatewayName <gatewayName>',
-                    desc: '网关 name'
-                },
-                {
-                    flags: '-gA, --gatewayAlias <gatewayAlias>',
-                    desc: '网关 alias'
-                }
-            ],
-            desc: '查询小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let { gatewayName = '', gatewayAlias = '' } = options
-        gatewayName = String(gatewayName)
-        gatewayAlias = String(gatewayAlias)
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await listStandalonegateway({
-            envId,
-            gatewayName,
-            gatewayAlias
-        })
-
-        loading.stop()
-
-        const head = ['名称', '状态', '别名', '套餐版本', '子网', '外网IP', '内网IP', '服务信息']
-        printHorizontalTable(head, data)
-    }
-}
+import { Command, ICommand } from '../../common'
+import { listStandalonegateway } from '../../../run/standalonegateway'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { printHorizontalTable } from '../../../utils'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class ListStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('list'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gN, --gatewayName <gatewayName>',
+                    desc: '网关 name'
+                },
+                {
+                    flags: '-gA, --gatewayAlias <gatewayAlias>',
+                    desc: '网关 alias'
+                }
+            ],
+            desc: '查询小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+        let { gatewayName = '', gatewayAlias = '' } = options
+        gatewayName = String(gatewayName)
+        gatewayAlias = String(gatewayAlias)
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+
+        const data = await listStandalonegateway({
+            envId,
+            gatewayName,
+            gatewayAlias
+        })
+
+        loading.stop()
+
+        const head = ['名称', '状态', '别名', '套餐版本', '子网', '外网IP', '内网IP', '服务信息']
+        printHorizontalTable(head, data)
+    }
+}

package/src/commands/run/standalonegateway/package.ts

@@ -1,62 +1,62 @@
-import { Command, ICommand } from '../../common'
-import { listPackageStandalonegateway } from '../../../run'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { EnvId, ArgsOptions, ArgsParams, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-import { printHorizontalTable } from '../../../utils'
-
-@ICommand()
-export class PackageStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('package <operation>'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-p, --packageVersion <packageVersion>',
-                    desc: '套餐版本'
-                }
-            ],
-            desc: '套餐操作'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
-        const operation = params?.[0]
-        if (!operation || ['list'].indexOf(operation) === -1) {
-            throw new CloudBaseError('请输入具体操作')
-        }
-
-        switch (operation) {
-            case 'list':
-                {
-                    let { appId, packageVersion = '' } = options
-                    appId = String(appId)
-                    packageVersion = String(packageVersion)
-
-                    const loading = loadingFactory()
-
-                    loading.start('数据加载中...')
-
-                    const data = await listPackageStandalonegateway({
-                        envId,
-                        packageVersion
-                    })
-
-                    loading.stop()
-
-                    const head = ['CPU', '内存', '版本']
-
-                    printHorizontalTable(head, data)
-                }
-                break
-            default:
-                break
-        }
-    }
-}
+import { Command, ICommand } from '../../common'
+import { listPackageStandalonegateway } from '../../../run'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { EnvId, ArgsOptions, ArgsParams, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+import { printHorizontalTable } from '../../../utils'
+
+@ICommand()
+export class PackageStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('package <operation>'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-p, --packageVersion <packageVersion>',
+                    desc: '套餐版本'
+                }
+            ],
+            desc: '套餐操作'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
+        const operation = params?.[0]
+        if (!operation || ['list'].indexOf(operation) === -1) {
+            throw new CloudBaseError('请输入具体操作')
+        }
+
+        switch (operation) {
+            case 'list':
+                {
+                    let { appId, packageVersion = '' } = options
+                    appId = String(appId)
+                    packageVersion = String(packageVersion)
+
+                    const loading = loadingFactory()
+
+                    loading.start('数据加载中...')
+
+                    const data = await listPackageStandalonegateway({
+                        envId,
+                        packageVersion
+                    })
+
+                    loading.stop()
+
+                    const head = ['CPU', '内存', '版本']
+
+                    printHorizontalTable(head, data)
+                }
+                break
+            default:
+                break
+        }
+    }
+}