@cloudbase/cli 2.0.3 → 2.0.5

package/src/commands/env/create.ts

@@ -1,92 +1,92 @@
-import inquirer from 'inquirer'
-import { createEnv, getEnvLimit } from '../../env'
-import { loadingFactory, genClickableLink } from '../../utils'
-import { CloudBaseError } from '../../error'
-import { Command, ICommand } from '../common'
-import { InjectParams, ArgsParams } from '../../decorators'
-
-@ICommand()
-export class CreateCommand extends Command {
-    get options() {
-        return {
-            cmd: 'env',
-            childCmd: 'create <alias>',
-            deprecateCmd: 'env:create <alias>',
-            options: [],
-            desc: '创建云开发免费环境',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsParams() params) {
-        const alias = params?.[0]
-        if (!alias) {
-            throw new CloudBaseError('环境名称不能为空！')
-        }
-
-        const loading = loadingFactory()
-
-        // 检查环境限制数量
-        loading.start('检查中...')
-        const { CurrentFreeEnvNum, MaxFreeEnvNum, CurrentEnvNum, MaxEnvNum } = await getEnvLimit()
-        loading.stop()
-
-        if (+CurrentFreeEnvNum >= +MaxFreeEnvNum) {
-            const link = genClickableLink('https://console.cloud.tencent.com/tcb')
-            throw new CloudBaseError(
-                `免费环境数量已达上限，无法创建免费的环境，请到云开发-控制台中创建付费环境\n👉 ${link}`
-            )
-        }
-
-        if (+CurrentEnvNum >= +MaxEnvNum) {
-            throw new CloudBaseError('环境数量已达上限，无法创建新的环境！')
-        }
-
-        const { payment } = await inquirer.prompt({
-            type: 'list',
-            name: 'payment',
-            choices: [
-                {
-                    name: '按量计费（免费配额）',
-                    value: 'postpay'
-                },
-                {
-                    name: '包年包月（免费版本）',
-                    value: 'prepay'
-                }
-            ],
-            message: '请选择环境计费模式：',
-            default: 'postpay'
-        })
-
-        // 通过控制台授权登录的用户无订单支付权限
-        const { confirm } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message:
-                '因支付权限问题，仅支持通过 API 秘钥登录的主账户使用 CLI 创建包年包月免费环境，其他用户需要登录控制台支付相关订单才能完成环境创建，是否继续？',
-            default: false
-        })
-
-        if (!confirm) {
-            throw new CloudBaseError('创建环境流程终止')
-        }
-
-        loading.start('环境创建中...')
-        try {
-            const res = await createEnv({
-                alias,
-                paymentMode: payment
-            })
-        } catch (e) {
-            if (e.code === 'ResourceInsufficient') {
-                throw new CloudBaseError('环境数量已达上限，无法创建新的环境！')
-            }
-            throw e
-        }
-
-        loading.succeed('创建环境成功，初始化预计需要花费 3 分钟')
-        console.log('你可以使用 cloudbase init 创建云开发项目')
-    }
-}
+import inquirer from 'inquirer'
+import { createEnv, getEnvLimit } from '../../env'
+import { loadingFactory, genClickableLink } from '../../utils'
+import { CloudBaseError } from '../../error'
+import { Command, ICommand } from '../common'
+import { InjectParams, ArgsParams } from '../../decorators'
+
+@ICommand()
+export class CreateCommand extends Command {
+    get options() {
+        return {
+            cmd: 'env',
+            childCmd: 'create <alias>',
+            deprecateCmd: 'env:create <alias>',
+            options: [],
+            desc: '创建云开发免费环境',
+            requiredEnvId: false
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsParams() params) {
+        const alias = params?.[0]
+        if (!alias) {
+            throw new CloudBaseError('环境名称不能为空！')
+        }
+
+        const loading = loadingFactory()
+
+        // 检查环境限制数量
+        loading.start('检查中...')
+        const { CurrentFreeEnvNum, MaxFreeEnvNum, CurrentEnvNum, MaxEnvNum } = await getEnvLimit()
+        loading.stop()
+
+        if (+CurrentFreeEnvNum >= +MaxFreeEnvNum) {
+            const link = genClickableLink('https://console.cloud.tencent.com/tcb')
+            throw new CloudBaseError(
+                `免费环境数量已达上限，无法创建免费的环境，请到云开发-控制台中创建付费环境\n👉 ${link}`
+            )
+        }
+
+        if (+CurrentEnvNum >= +MaxEnvNum) {
+            throw new CloudBaseError('环境数量已达上限，无法创建新的环境！')
+        }
+
+        const { payment } = await inquirer.prompt({
+            type: 'list',
+            name: 'payment',
+            choices: [
+                {
+                    name: '按量计费（免费配额）',
+                    value: 'postpay'
+                },
+                {
+                    name: '包年包月（免费版本）',
+                    value: 'prepay'
+                }
+            ],
+            message: '请选择环境计费模式：',
+            default: 'postpay'
+        })
+
+        // 通过控制台授权登录的用户无订单支付权限
+        const { confirm } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message:
+                '因支付权限问题，仅支持通过 API 秘钥登录的主账户使用 CLI 创建包年包月免费环境，其他用户需要登录控制台支付相关订单才能完成环境创建，是否继续？',
+            default: false
+        })
+
+        if (!confirm) {
+            throw new CloudBaseError('创建环境流程终止')
+        }
+
+        loading.start('环境创建中...')
+        try {
+            const res = await createEnv({
+                alias,
+                paymentMode: payment
+            })
+        } catch (e) {
+            if (e.code === 'ResourceInsufficient') {
+                throw new CloudBaseError('环境数量已达上限，无法创建新的环境！')
+            }
+            throw e
+        }
+
+        loading.succeed('创建环境成功，初始化预计需要花费 3 分钟')
+        console.log('你可以使用 cloudbase init 创建云开发项目')
+    }
+}

package/src/commands/env/domain.ts

@@ -1,186 +1,186 @@
-import inquirer from 'inquirer'
-import { CloudBaseError } from '../../error'
-import { Command, ICommand } from '../common'
-import { printHorizontalTable, loadingFactory } from '../../utils'
-import { InjectParams, EnvId, ArgsParams, Log, Logger } from '../../decorators'
-import { getEnvAuthDomains, createEnvDomain, deleteEnvDomain } from '../../env'
-
-@ICommand()
-export class ListAuthDoaminCommand extends Command {
-    get options() {
-        return {
-            cmd: 'env',
-            childCmd: {
-                cmd: 'domain',
-                desc: '域名管理'
-            },
-            childSubCmd: 'list',
-            deprecateCmd: 'env:domain:list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '列出环境的安全域名列表'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId) {
-        const domains = await getEnvAuthDomains({
-            envId: envId
-        })
-
-        if (domains.length === 0) {
-            console.log('安全域名为空！')
-            return
-        }
-
-        const head = ['域名 Id', '域名', '创建时间', '状态']
-        const tableData = domains.map((item) => [
-            item.Id,
-            item.Domain,
-            item.CreateTime,
-            item.Status === 'ENABLE' ? '启用中' : '禁用中'
-        ])
-
-        printHorizontalTable(head, tableData)
-    }
-}
-
-@ICommand()
-export class CreateAuthDomainCommand extends Command {
-    get options() {
-        return {
-            cmd: 'env',
-            childCmd: {
-                cmd: 'domain',
-                desc: '域名管理'
-            },
-            childSubCmd: 'create <domain>',
-            deprecateCmd: 'env:domain:create <domain>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '添加环境安全域名，多个以斜杠 / 分隔'
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsParams() params, @EnvId() envId, @Log() log: Logger) {
-        log.verbose(params)
-
-        const domain = params?.[0]
-        const domains = domain.split('/')
-
-        const { confirm } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message: `确认添加以下安全域名： ${domains} ？`,
-            default: true
-        })
-
-        if (!confirm) {
-            throw new CloudBaseError('操作终止！')
-        }
-
-        // 检查域名是否已经添加，重复添加会报错
-        let envDomains = await getEnvAuthDomains({
-            envId
-        })
-        envDomains = envDomains.map((item) => item.Domain)
-        const exitDomains = []
-
-        domains.forEach((item) => {
-            if (envDomains.includes(item)) {
-                exitDomains.push(item)
-            }
-        })
-
-        if (exitDomains.length) {
-            throw new CloudBaseError(`域名 [${exitDomains.join(', ')}] 已存在！`)
-        }
-
-        await createEnvDomain({
-            envId,
-            domains: domains
-        })
-        log.success('添加安全域名成功！')
-    }
-}
-
-@ICommand()
-export class DeleteAuthDomainCommand extends Command {
-    get options() {
-        return {
-            cmd: 'env',
-            childCmd: {
-                cmd: 'domain',
-                desc: '域名管理'
-            },
-            childSubCmd: 'delete',
-            deprecateCmd: 'env:domain:delete',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '删除环境的安全域名'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @Log() log: Logger) {
-        const loading = loadingFactory()
-
-        loading.start('拉取环境安全域名中')
-
-        const domains = await getEnvAuthDomains({
-            envId
-        })
-
-        if (domains.length === 0) {
-            loading.fail('域名安全为空，不能执行删除操作！')
-            return
-        }
-
-        loading.succeed('拉取环境安全域名成功！')
-
-        const domainList = domains.map((item) => item.Domain)
-
-        const { selectDomains } = await inquirer.prompt({
-            type: 'checkbox',
-            name: 'selectDomains',
-            message: '请选择需要删除的域名（可多选）>',
-            choices: domainList,
-            default: true
-        })
-
-        const { confirm } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message: `确认删除以下安全域名： ${selectDomains} ？`,
-            default: true
-        })
-
-        if (!confirm) {
-            throw new CloudBaseError('操作终止！')
-        }
-
-        const domainIds = domains
-            .filter((item) => selectDomains.includes(item.Domain))
-            .map((item) => item.Id)
-
-        const deleted = await deleteEnvDomain({
-            domainIds,
-            envId
-        })
-
-        log.success(`成功删除了 ${deleted} 个域名！`)
-    }
-}
+import inquirer from 'inquirer'
+import { CloudBaseError } from '../../error'
+import { Command, ICommand } from '../common'
+import { printHorizontalTable, loadingFactory } from '../../utils'
+import { InjectParams, EnvId, ArgsParams, Log, Logger } from '../../decorators'
+import { getEnvAuthDomains, createEnvDomain, deleteEnvDomain } from '../../env'
+
+@ICommand()
+export class ListAuthDoaminCommand extends Command {
+    get options() {
+        return {
+            cmd: 'env',
+            childCmd: {
+                cmd: 'domain',
+                desc: '域名管理'
+            },
+            childSubCmd: 'list',
+            deprecateCmd: 'env:domain:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '列出环境的安全域名列表'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId) {
+        const domains = await getEnvAuthDomains({
+            envId: envId
+        })
+
+        if (domains.length === 0) {
+            console.log('安全域名为空！')
+            return
+        }
+
+        const head = ['域名 Id', '域名', '创建时间', '状态']
+        const tableData = domains.map((item) => [
+            item.Id,
+            item.Domain,
+            item.CreateTime,
+            item.Status === 'ENABLE' ? '启用中' : '禁用中'
+        ])
+
+        printHorizontalTable(head, tableData)
+    }
+}
+
+@ICommand()
+export class CreateAuthDomainCommand extends Command {
+    get options() {
+        return {
+            cmd: 'env',
+            childCmd: {
+                cmd: 'domain',
+                desc: '域名管理'
+            },
+            childSubCmd: 'create <domain>',
+            deprecateCmd: 'env:domain:create <domain>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '添加环境安全域名，多个以斜杠 / 分隔'
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsParams() params, @EnvId() envId, @Log() log: Logger) {
+        log.verbose(params)
+
+        const domain = params?.[0]
+        const domains = domain.split('/')
+
+        const { confirm } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message: `确认添加以下安全域名： ${domains} ？`,
+            default: true
+        })
+
+        if (!confirm) {
+            throw new CloudBaseError('操作终止！')
+        }
+
+        // 检查域名是否已经添加，重复添加会报错
+        let envDomains = await getEnvAuthDomains({
+            envId
+        })
+        envDomains = envDomains.map((item) => item.Domain)
+        const exitDomains = []
+
+        domains.forEach((item) => {
+            if (envDomains.includes(item)) {
+                exitDomains.push(item)
+            }
+        })
+
+        if (exitDomains.length) {
+            throw new CloudBaseError(`域名 [${exitDomains.join(', ')}] 已存在！`)
+        }
+
+        await createEnvDomain({
+            envId,
+            domains: domains
+        })
+        log.success('添加安全域名成功！')
+    }
+}
+
+@ICommand()
+export class DeleteAuthDomainCommand extends Command {
+    get options() {
+        return {
+            cmd: 'env',
+            childCmd: {
+                cmd: 'domain',
+                desc: '域名管理'
+            },
+            childSubCmd: 'delete',
+            deprecateCmd: 'env:domain:delete',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '删除环境的安全域名'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @Log() log: Logger) {
+        const loading = loadingFactory()
+
+        loading.start('拉取环境安全域名中')
+
+        const domains = await getEnvAuthDomains({
+            envId
+        })
+
+        if (domains.length === 0) {
+            loading.fail('域名安全为空，不能执行删除操作！')
+            return
+        }
+
+        loading.succeed('拉取环境安全域名成功！')
+
+        const domainList = domains.map((item) => item.Domain)
+
+        const { selectDomains } = await inquirer.prompt({
+            type: 'checkbox',
+            name: 'selectDomains',
+            message: '请选择需要删除的域名（可多选）>',
+            choices: domainList,
+            default: true
+        })
+
+        const { confirm } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message: `确认删除以下安全域名： ${selectDomains} ？`,
+            default: true
+        })
+
+        if (!confirm) {
+            throw new CloudBaseError('操作终止！')
+        }
+
+        const domainIds = domains
+            .filter((item) => selectDomains.includes(item.Domain))
+            .map((item) => item.Id)
+
+        const deleted = await deleteEnvDomain({
+            domainIds,
+            envId
+        })
+
+        log.success(`成功删除了 ${deleted} 个域名！`)
+    }
+}

package/src/commands/env/index.ts

@@ -1,4 +1,4 @@
-export * from './base'
-export * from './create'
-export * from './domain'
-export * from './login'
+export * from './base'
+export * from './create'
+export * from './domain'
+export * from './login'