@cloudbase/cli 2.0.3 → 2.0.5

package/src/commands/functions/trigger-delete.ts

@@ -1,105 +1,105 @@
-import inquirer from 'inquirer'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { InjectParams, CmdContext, ArgsParams } from '../../decorators'
-import { batchDeleteTriggers, deleteFunctionTrigger } from '../../function'
-
-@ICommand()
-export class DeleteTrigger extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: { cmd: 'trigger', desc: '函数触发器操作' },
-            childSubCmd: 'delete [functionName] [triggerName]',
-            deprecateCmd: 'functions:trigger:delete [functionName] [triggerName]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '删除云函数触发器'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params) {
-        const {
-            envId,
-            config: { functions }
-        } = ctx
-
-        const name = params?.[0]
-        const triggerName = params?.[1]
-
-        let isBatchDeleteTriggers
-        let isBatchDeleteFunctionTriggers = false
-
-        // 不指定云函数名称，删除配置文件中所有函数的所有触发器
-        if (!name) {
-            const answer = await inquirer.prompt({
-                type: 'confirm',
-                name: 'isBatch',
-                message: '无云函数名称，是否需要删除配置文件中的【全部云函数】的全部触发器？',
-                default: false
-            })
-
-            // 危险操作，再次确认
-            if (answer.isBatch) {
-                const { reConfirm } = await inquirer.prompt({
-                    type: 'confirm',
-                    name: 'reConfirm',
-                    message: '确定要删除配置文件中的【全部云函数】的全部触发器？',
-                    default: false
-                })
-                isBatchDeleteTriggers = reConfirm
-            }
-
-            if (!isBatchDeleteTriggers) {
-                throw new CloudBaseError('请指定云函数名称以及触发器名称！')
-            }
-        }
-
-        if (isBatchDeleteTriggers) {
-            return batchDeleteTriggers({
-                envId,
-                functions
-            })
-        }
-
-        // 指定了函数名称，但没有指定触发器名称，删除此函数的所有触发器
-        if (!triggerName && name) {
-            const { isBatch } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'isBatch',
-                message: '没有指定触发器名称，是否需要此云函数的全部触发器？',
-                default: false
-            })
-
-            isBatchDeleteFunctionTriggers = isBatch
-
-            if (!isBatchDeleteFunctionTriggers) {
-                throw new CloudBaseError('请指定云函数名称以及触发器名称！')
-            }
-        }
-
-        if (isBatchDeleteFunctionTriggers) {
-            const func = functions.find((item) => item.name === name)
-            return batchDeleteTriggers({
-                envId,
-                functions: [func]
-            })
-        }
-
-        if (!triggerName) {
-            throw new CloudBaseError('触发器名称不能为空')
-        }
-
-        // 删除指定函数的单个触发器
-        await deleteFunctionTrigger({
-            envId,
-            functionName: name,
-            triggerName
-        })
-    }
-}
+import inquirer from 'inquirer'
+import { Command, ICommand } from '../common'
+import { CloudBaseError } from '../../error'
+import { InjectParams, CmdContext, ArgsParams } from '../../decorators'
+import { batchDeleteTriggers, deleteFunctionTrigger } from '../../function'
+
+@ICommand()
+export class DeleteTrigger extends Command {
+    get options() {
+        return {
+            cmd: 'fn',
+            childCmd: { cmd: 'trigger', desc: '函数触发器操作' },
+            childSubCmd: 'delete [functionName] [triggerName]',
+            deprecateCmd: 'functions:trigger:delete [functionName] [triggerName]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '删除云函数触发器'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsParams() params) {
+        const {
+            envId,
+            config: { functions }
+        } = ctx
+
+        const name = params?.[0]
+        const triggerName = params?.[1]
+
+        let isBatchDeleteTriggers
+        let isBatchDeleteFunctionTriggers = false
+
+        // 不指定云函数名称，删除配置文件中所有函数的所有触发器
+        if (!name) {
+            const answer = await inquirer.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: '无云函数名称，是否需要删除配置文件中的【全部云函数】的全部触发器？',
+                default: false
+            })
+
+            // 危险操作，再次确认
+            if (answer.isBatch) {
+                const { reConfirm } = await inquirer.prompt({
+                    type: 'confirm',
+                    name: 'reConfirm',
+                    message: '确定要删除配置文件中的【全部云函数】的全部触发器？',
+                    default: false
+                })
+                isBatchDeleteTriggers = reConfirm
+            }
+
+            if (!isBatchDeleteTriggers) {
+                throw new CloudBaseError('请指定云函数名称以及触发器名称！')
+            }
+        }
+
+        if (isBatchDeleteTriggers) {
+            return batchDeleteTriggers({
+                envId,
+                functions
+            })
+        }
+
+        // 指定了函数名称，但没有指定触发器名称，删除此函数的所有触发器
+        if (!triggerName && name) {
+            const { isBatch } = await inquirer.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: '没有指定触发器名称，是否需要此云函数的全部触发器？',
+                default: false
+            })
+
+            isBatchDeleteFunctionTriggers = isBatch
+
+            if (!isBatchDeleteFunctionTriggers) {
+                throw new CloudBaseError('请指定云函数名称以及触发器名称！')
+            }
+        }
+
+        if (isBatchDeleteFunctionTriggers) {
+            const func = functions.find((item) => item.name === name)
+            return batchDeleteTriggers({
+                envId,
+                functions: [func]
+            })
+        }
+
+        if (!triggerName) {
+            throw new CloudBaseError('触发器名称不能为空')
+        }
+
+        // 删除指定函数的单个触发器
+        await deleteFunctionTrigger({
+            envId,
+            functionName: name,
+            triggerName
+        })
+    }
+}

package/src/commands/functions/version/index.ts

@@ -1,2 +1,2 @@
-export * from './publish'
+export * from './publish'
 export * from './list'

package/src/commands/functions/version/list.ts

@@ -1,73 +1,73 @@
-
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { loadingFactory, printHorizontalTable } from '../../../utils'
-import { listFunctionVersions } from '../../../function'
-import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
-import { StatusMap } from '../../../constant'
-
-
-@ICommand()
-export class ListFunctionVersion extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'list-function-versions <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                { flags: '-l, --limit <limit>', desc: '返回数据长度，默认值为 20' },
-                {
-                    flags: '-o, --offset <offset>',
-                    desc: '数据偏移量，默认值为 0'
-                }
-            ],
-            desc: '展示函数版本列表'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params, @ArgsOptions() options) {
-        const name = params?.[0]
-        let { limit = 20, offset = 0 } = options
-        limit = Number(limit)
-        offset = Number(offset)
-        if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
-            throw new CloudBaseError('limit 和 offset 必须为整数')
-        }
-
-        if (limit < 0 || offset < 0) {
-            throw new CloudBaseError('limit 和 offset 必须为大于 0 的整数')
-        }
-
-        const {
-            envId
-        } = ctx
-
-        const loading = loadingFactory()
-        loading.start(`拉取函数 [${name}] 版本列表中...`)
-
-        const res = await listFunctionVersions({
-            envId,
-            functionName: name,
-            offset,
-            limit
-        })
-
-        loading.stop()
-
-        const head: string[] = ['版本', '描述', '创建时间', '修改时间', '状态']
-
-        const tableData = res.Versions.map((item) => [
-            item.Version,
-            item.Description,
-            item.AddTime,
-            item.ModTime,
-            StatusMap[item.Status]
-        ])
-
-        printHorizontalTable(head, tableData)
-    }
-}
+
+import { Command, ICommand } from '../../common'
+import { CloudBaseError } from '../../../error'
+import { loadingFactory, printHorizontalTable } from '../../../utils'
+import { listFunctionVersions } from '../../../function'
+import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
+import { StatusMap } from '../../../constant'
+
+
+@ICommand()
+export class ListFunctionVersion extends Command {
+    get options() {
+        return {
+            cmd: 'fn',
+            childCmd: 'list-function-versions <name>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                { flags: '-l, --limit <limit>', desc: '返回数据长度，默认值为 20' },
+                {
+                    flags: '-o, --offset <offset>',
+                    desc: '数据偏移量，默认值为 0'
+                }
+            ],
+            desc: '展示函数版本列表'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsParams() params, @ArgsOptions() options) {
+        const name = params?.[0]
+        let { limit = 20, offset = 0 } = options
+        limit = Number(limit)
+        offset = Number(offset)
+        if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
+            throw new CloudBaseError('limit 和 offset 必须为整数')
+        }
+
+        if (limit < 0 || offset < 0) {
+            throw new CloudBaseError('limit 和 offset 必须为大于 0 的整数')
+        }
+
+        const {
+            envId
+        } = ctx
+
+        const loading = loadingFactory()
+        loading.start(`拉取函数 [${name}] 版本列表中...`)
+
+        const res = await listFunctionVersions({
+            envId,
+            functionName: name,
+            offset,
+            limit
+        })
+
+        loading.stop()
+
+        const head: string[] = ['版本', '描述', '创建时间', '修改时间', '状态']
+
+        const tableData = res.Versions.map((item) => [
+            item.Version,
+            item.Description,
+            item.AddTime,
+            item.ModTime,
+            StatusMap[item.Status]
+        ])
+
+        printHorizontalTable(head, tableData)
+    }
+}

package/src/commands/functions/version/publish.ts

@@ -1,43 +1,43 @@
-
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { loadingFactory } from '../../../utils'
-import { publishVersion } from '../../../function'
-import { InjectParams, CmdContext, ArgsParams } from '../../../decorators'
-
-@ICommand()
-export class PublishFunctionVersion extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'publish-version <name> [description]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '发布函数新版本'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params) {
-        const name = params?.[0]
-        const description = params?.[1]
-        const {
-            envId
-        } = ctx
-
-        const loading = loadingFactory()
-        loading.start(`发布函数 [${name}] 新版本中...`)
-
-        await publishVersion({
-            envId,
-            functionName: name,
-            description
-        })
-
-        loading.succeed(`发布函数 [${name}] 新版本成功！`)
-    }
-}
+
+import { Command, ICommand } from '../../common'
+import { CloudBaseError } from '../../../error'
+import { loadingFactory } from '../../../utils'
+import { publishVersion } from '../../../function'
+import { InjectParams, CmdContext, ArgsParams } from '../../../decorators'
+
+@ICommand()
+export class PublishFunctionVersion extends Command {
+    get options() {
+        return {
+            cmd: 'fn',
+            childCmd: 'publish-version <name> [description]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '发布函数新版本'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsParams() params) {
+        const name = params?.[0]
+        const description = params?.[1]
+        const {
+            envId
+        } = ctx
+
+        const loading = loadingFactory()
+        loading.start(`发布函数 [${name}] 新版本中...`)
+
+        await publishVersion({
+            envId,
+            functionName: name,
+            description
+        })
+
+        loading.succeed(`发布函数 [${name}] 新版本成功！`)
+    }
+}

package/src/commands/gateway/create.ts

@@ -1,109 +1,109 @@
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { createGateway, queryGatewayDomain } from '../../gateway'
-import { listFunction } from '../../function'
-import { assertTruthy } from '../../utils/validator'
-import { loadingFactory, genClickableLink } from '../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class CreateService extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: 'create',
-            deprecateCmd: 'service:create',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-p, --service-path <servicePath>',
-                    desc: 'HTTP 访问服务路径，如 api'
-                },
-                {
-                    flags: '-f, --function <name>',
-                    desc: 'HTTP 访问服务路径绑定的云函数名称'
-                }
-            ],
-            desc: '创建 HTTP 访问服务'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let { function: functionName, servicePath } = options
-        const loading = loadingFactory()
-
-        if (!servicePath || !functionName) {
-            loading.start('数据加载中...')
-            const functions = await listFunction({
-                envId,
-                limit: 100,
-                offset: 0
-            })
-
-            loading.stop()
-
-            if (!functions.length) {
-                throw new CloudBaseError('当前环境下不存在可用的云函数，请先创建云函数！')
-            }
-
-            let { name } = await prompt<any>({
-                type: 'select',
-                name: 'name',
-                message: '请选择创建HTTP 访问服务的云函数',
-                choices: functions.map((item) => item.FunctionName)
-            })
-
-            let { path } = await prompt<any>({
-                type: 'input',
-                name: 'path',
-                message: '请输入HTTP 访问服务路径'
-            })
-
-            functionName = name
-            servicePath = path
-        }
-
-        assertTruthy(servicePath, '请指定需要创建的HTTP 访问服务路径！')
-
-        // 创建云函数网关
-        loading.start(`[${functionName}] HTTP 访问服务创建中...`)
-
-        // 补充 / 符号
-        servicePath = servicePath[0] === '/' ? servicePath : `/${servicePath}`
-
-        try {
-            // step1: 判断云函数是否存在
-            const functionList = await listFunction({
-                envId,
-                limit: 100
-            })
-            const isExisted = functionList.filter((item) => item.FunctionName === functionName)
-            if (isExisted.length <= 0) {
-                throw new CloudBaseError(`[${functionName}] 云函数不存在！`)
-            }
-
-            // step2: 创建云函数网关
-            await createGateway({
-                envId,
-                path: servicePath,
-                name: functionName
-            })
-
-            // 查询访问域名
-            const res = await queryGatewayDomain({ envId })
-            const link = genClickableLink(`https://${res.DefaultDomain}${servicePath}`)
-            loading.succeed(`HTTP 访问服务创建成功！\n点击访问> ${link}`)
-        } catch (e) {
-            loading.stop()
-            if (e.code === 'InvalidParameter.APICreated') {
-                throw new CloudBaseError('路径已存在！')
-            }
-            throw e
-        }
-    }
-}
+import { prompt } from 'enquirer'
+import { Command, ICommand } from '../common'
+import { CloudBaseError } from '../../error'
+import { createGateway, queryGatewayDomain } from '../../gateway'
+import { listFunction } from '../../function'
+import { assertTruthy } from '../../utils/validator'
+import { loadingFactory, genClickableLink } from '../../utils'
+import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
+
+@ICommand()
+export class CreateService extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: 'create',
+            deprecateCmd: 'service:create',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-p, --service-path <servicePath>',
+                    desc: 'HTTP 访问服务路径，如 api'
+                },
+                {
+                    flags: '-f, --function <name>',
+                    desc: 'HTTP 访问服务路径绑定的云函数名称'
+                }
+            ],
+            desc: '创建 HTTP 访问服务'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+        let { function: functionName, servicePath } = options
+        const loading = loadingFactory()
+
+        if (!servicePath || !functionName) {
+            loading.start('数据加载中...')
+            const functions = await listFunction({
+                envId,
+                limit: 100,
+                offset: 0
+            })
+
+            loading.stop()
+
+            if (!functions.length) {
+                throw new CloudBaseError('当前环境下不存在可用的云函数，请先创建云函数！')
+            }
+
+            let { name } = await prompt<any>({
+                type: 'select',
+                name: 'name',
+                message: '请选择创建HTTP 访问服务的云函数',
+                choices: functions.map((item) => item.FunctionName)
+            })
+
+            let { path } = await prompt<any>({
+                type: 'input',
+                name: 'path',
+                message: '请输入HTTP 访问服务路径'
+            })
+
+            functionName = name
+            servicePath = path
+        }
+
+        assertTruthy(servicePath, '请指定需要创建的HTTP 访问服务路径！')
+
+        // 创建云函数网关
+        loading.start(`[${functionName}] HTTP 访问服务创建中...`)
+
+        // 补充 / 符号
+        servicePath = servicePath[0] === '/' ? servicePath : `/${servicePath}`
+
+        try {
+            // step1: 判断云函数是否存在
+            const functionList = await listFunction({
+                envId,
+                limit: 100
+            })
+            const isExisted = functionList.filter((item) => item.FunctionName === functionName)
+            if (isExisted.length <= 0) {
+                throw new CloudBaseError(`[${functionName}] 云函数不存在！`)
+            }
+
+            // step2: 创建云函数网关
+            await createGateway({
+                envId,
+                path: servicePath,
+                name: functionName
+            })
+
+            // 查询访问域名
+            const res = await queryGatewayDomain({ envId })
+            const link = genClickableLink(`https://${res.DefaultDomain}${servicePath}`)
+            loading.succeed(`HTTP 访问服务创建成功！\n点击访问> ${link}`)
+        } catch (e) {
+            loading.stop()
+            if (e.code === 'InvalidParameter.APICreated') {
+                throw new CloudBaseError('路径已存在！')
+            }
+            throw e
+        }
+    }
+}