@cloudbase/cli 2.0.3 → 2.0.4-alpha.0

package/src/commands/framework/index.ts

@@ -1,124 +1,124 @@
-import { run } from '@cloudbase/framework-core'
-import { Command, ICommand } from '../common'
-import { ICommandContext } from '../../types'
-import { InjectParams, CmdContext, ArgsParams, Log, Logger, ArgsOptions } from '../../decorators'
-
-import * as Hosting from '../../hosting'
-import * as Function from '../../function'
-import { authSupevisor } from '../../utils'
-
-async function callFramework(ctx, command, module, params?) {
-    const { envId, config } = ctx
-    const { bumpVersion, versionRemark } = ctx.options
-
-    const loginState = await authSupevisor.getLoginState()
-    const { token, secretId, secretKey } = loginState
-
-    await run(
-        {
-            projectPath: process.cwd(),
-            cloudbaseConfig: {
-                secretId,
-                secretKey,
-                token,
-                envId
-            },
-            config,
-            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
-            resourceProviders: {
-                hosting: Hosting,
-                function: Function
-            },
-            bumpVersion: Boolean(bumpVersion),
-            versionRemark
-        },
-        command,
-        module,
-        params
-    )
-}
-
-@ICommand()
-export class FrameworkDeploy extends Command {
-    get options() {
-        return {
-            cmd: 'framework',
-            childCmd: 'deploy [module]',
-            deprecateCmd: 'framework:deploy [module]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                { flags: '--verbose', desc: '是否打印详细日志' }
-            ],
-            desc: '云开发 Serverless 应用框架：部署全栈应用'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params) {
-        const [module] = params || []
-        await callFramework(ctx, 'deploy', module)
-    }
-}
-
-@ICommand()
-export class FrameworkCompile extends Command {
-    get options() {
-        return {
-            cmd: 'framework',
-            childCmd: 'compile [module]',
-            deprecateCmd: 'framework:compile [module]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                { flags: '--verbose', desc: '是否打印详细日志' },
-                { flags: '--bumpVersion', desc: '是否生成新版本' },
-                {
-                    flags: '--versionRemark <versionRemark>',
-                    desc: '新版本描述信息'
-                }
-            ],
-            desc: '云开发 Serverless 应用框架：编译应用描述文件'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params) {
-        const [module] = params || []
-        await callFramework(ctx, 'compile', module)
-    }
-}
-
-@ICommand()
-export class FrameworkRun extends Command {
-    get options() {
-        return {
-            cmd: 'framework',
-            childCmd: 'run [command]',
-            deprecateCmd: 'framework:run [command]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--plugin <plugin>',
-                    desc: '执行命令的插件'
-                }
-            ],
-            desc: '云开发 Serverless 应用框架：执行自定义命令'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params, @ArgsOptions() options) {
-        const [command] = params || []
-        const { plugin } = options
-
-        await callFramework(ctx, 'run', plugin, { runCommandKey: command })
-    }
-}
+import { run } from '@cloudbase/framework-core'
+import { Command, ICommand } from '../common'
+import { ICommandContext } from '../../types'
+import { InjectParams, CmdContext, ArgsParams, Log, Logger, ArgsOptions } from '../../decorators'
+
+import * as Hosting from '../../hosting'
+import * as Function from '../../function'
+import { authSupevisor } from '../../utils'
+
+async function callFramework(ctx, command, module, params?) {
+    const { envId, config } = ctx
+    const { bumpVersion, versionRemark } = ctx.options
+
+    const loginState = await authSupevisor.getLoginState()
+    const { token, secretId, secretKey } = loginState
+
+    await run(
+        {
+            projectPath: process.cwd(),
+            cloudbaseConfig: {
+                secretId,
+                secretKey,
+                token,
+                envId
+            },
+            config,
+            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
+            resourceProviders: {
+                hosting: Hosting,
+                function: Function
+            },
+            bumpVersion: Boolean(bumpVersion),
+            versionRemark
+        },
+        command,
+        module,
+        params
+    )
+}
+
+@ICommand()
+export class FrameworkDeploy extends Command {
+    get options() {
+        return {
+            cmd: 'framework',
+            childCmd: 'deploy [module]',
+            deprecateCmd: 'framework:deploy [module]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                { flags: '--verbose', desc: '是否打印详细日志' }
+            ],
+            desc: '云开发 Serverless 应用框架：部署全栈应用'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params) {
+        const [module] = params || []
+        await callFramework(ctx, 'deploy', module)
+    }
+}
+
+@ICommand()
+export class FrameworkCompile extends Command {
+    get options() {
+        return {
+            cmd: 'framework',
+            childCmd: 'compile [module]',
+            deprecateCmd: 'framework:compile [module]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                { flags: '--verbose', desc: '是否打印详细日志' },
+                { flags: '--bumpVersion', desc: '是否生成新版本' },
+                {
+                    flags: '--versionRemark <versionRemark>',
+                    desc: '新版本描述信息'
+                }
+            ],
+            desc: '云开发 Serverless 应用框架：编译应用描述文件'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params) {
+        const [module] = params || []
+        await callFramework(ctx, 'compile', module)
+    }
+}
+
+@ICommand()
+export class FrameworkRun extends Command {
+    get options() {
+        return {
+            cmd: 'framework',
+            childCmd: 'run [command]',
+            deprecateCmd: 'framework:run [command]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '--plugin <plugin>',
+                    desc: '执行命令的插件'
+                }
+            ],
+            desc: '云开发 Serverless 应用框架：执行自定义命令'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx: ICommandContext, @Log() logger: Logger, @ArgsParams() params, @ArgsOptions() options) {
+        const [command] = params || []
+        const { plugin } = options
+
+        await callFramework(ctx, 'run', plugin, { runCommandKey: command })
+    }
+}

package/src/commands/functions/alias/getRoute.ts

@@ -1,76 +1,76 @@
-
-import { Command, ICommand } from '../../common'
-import { loadingFactory, printHorizontalTable } from '../../../utils'
-import { getFunctionAliasConfig } from '../../../function'
-import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
-
-
-function parseRoutingConfigValue(expression: string) {
-    const commaIndex = expression.indexOf(',')
-    const valueExpression = expression.substring(commaIndex + 1, expression.length - 1)
-    return valueExpression
-}
-
-@ICommand()
-export class getFunctionRoutingConfig extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'get-route <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '查看函数版本流量配置'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params) {
-        const name = params?.[0]
-
-        const {
-            envId
-        } = ctx
-
-        const loading = loadingFactory()
-        loading.start(`查询函数 [${name}] 版本流量配置中...`)
-
-        const aliasRes = await getFunctionAliasConfig({
-            envId,
-            functionName: name,
-            name: '$DEFAULT'
-        })
-
-        const routingConfig = aliasRes?.RoutingConfig?.AddtionVersionMatchs
-        let finalConfig = []
-        if (routingConfig.length === 1) {
-            finalConfig.push({
-                version: routingConfig[0].Version,
-                value: parseRoutingConfigValue(routingConfig[0].Expression)
-            })
-        } else if (routingConfig.length === 2) {
-            finalConfig.push({
-                version: routingConfig[0].Version,
-                value: parseRoutingConfigValue(routingConfig[0].Expression)
-            }, {
-                version: routingConfig[1].Version,
-                value: 100 - Number(parseRoutingConfigValue(routingConfig[0].Expression))
-            })
-        }
-
-        loading.stop()
-
-        const head: string[] = ['版本', '流量比例']
-
-        const tableData = finalConfig.map((item) => [
-            item.version,
-            item.value
-        ])
-
-        printHorizontalTable(head, tableData)
-
-    }
-}
+
+import { Command, ICommand } from '../../common'
+import { loadingFactory, printHorizontalTable } from '../../../utils'
+import { getFunctionAliasConfig } from '../../../function'
+import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
+
+
+function parseRoutingConfigValue(expression: string) {
+    const commaIndex = expression.indexOf(',')
+    const valueExpression = expression.substring(commaIndex + 1, expression.length - 1)
+    return valueExpression
+}
+
+@ICommand()
+export class getFunctionRoutingConfig extends Command {
+    get options() {
+        return {
+            cmd: 'fn',
+            childCmd: 'get-route <name>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '查看函数版本流量配置'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsParams() params) {
+        const name = params?.[0]
+
+        const {
+            envId
+        } = ctx
+
+        const loading = loadingFactory()
+        loading.start(`查询函数 [${name}] 版本流量配置中...`)
+
+        const aliasRes = await getFunctionAliasConfig({
+            envId,
+            functionName: name,
+            name: '$DEFAULT'
+        })
+
+        const routingConfig = aliasRes?.RoutingConfig?.AddtionVersionMatchs
+        let finalConfig = []
+        if (routingConfig.length === 1) {
+            finalConfig.push({
+                version: routingConfig[0].Version,
+                value: parseRoutingConfigValue(routingConfig[0].Expression)
+            })
+        } else if (routingConfig.length === 2) {
+            finalConfig.push({
+                version: routingConfig[0].Version,
+                value: parseRoutingConfigValue(routingConfig[0].Expression)
+            }, {
+                version: routingConfig[1].Version,
+                value: 100 - Number(parseRoutingConfigValue(routingConfig[0].Expression))
+            })
+        }
+
+        loading.stop()
+
+        const head: string[] = ['版本', '流量比例']
+
+        const tableData = finalConfig.map((item) => [
+            item.version,
+            item.value
+        ])
+
+        printHorizontalTable(head, tableData)
+
+    }
+}

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

@@ -1,2 +1,2 @@
-export * from './setRoute'
-export * from './getRoute'
+export * from './setRoute'
+export * from './getRoute'

package/src/commands/functions/alias/setRoute.ts

@@ -1,82 +1,82 @@
-
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { loadingFactory } from '../../../utils'
-import { setFunctionAliasConfig } from '../../../function'
-import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
-
-
-@ICommand()
-export class setFunctionRoutingConfig extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'config-route <name> <version1> <traffic1> [version2] [traffic2]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '设置函数版本流量配置'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params) {
-        const name = params?.[0]
-        const version1 = params?.[1]
-        const traffic1 = Number(params?.[2])
-
-        const version2 = params?.[3]
-        const traffic2 = Number(params?.[4])
-
-        // 校验
-
-        // 1. version2 及 traffic2 必须同时存在
-        if ((version2 === undefined && traffic2 !== undefined) || (version2 !== undefined && traffic2 === undefined)) {
-            throw new CloudBaseError('version2 和 traffic2 必须同时设置')
-        }
-
-        if (traffic1 !== undefined && traffic2 !== undefined) {
-            if (traffic1 + traffic2 !== 100) {
-                throw new CloudBaseError('traffic1 和 traffic2 同时设置时，需保证总和 100')
-            }
-        }
-
-        const {
-            envId
-        } = ctx
-
-        const loading = loadingFactory()
-        loading.start(`设置函数 [${name}] 版本流量配置中...`)
-
-        let routingConfigParams = {
-            AddtionVersionMatchs: [{
-                Expression: `[0,${traffic1})`,
-                Key: "invoke.headers.X-Tcb-Route-Key",
-                Method: "range",
-                Version: version1
-            }]
-        }
-
-        if (version2 !== undefined) {
-            routingConfigParams.AddtionVersionMatchs.push({
-                Expression: `[${traffic1},${100})`,
-                Key: "invoke.headers.X-Tcb-Route-Key",
-                Method: "range",
-                Version: version2
-            })
-        }
-
-        await setFunctionAliasConfig({
-            envId,
-            functionName: name,
-            name: '$DEFAULT',
-            functionVersion: '$LATEST',
-            routingConfig: routingConfigParams
-        })
-
-        loading.succeed(`设置函数 [${name}] 版本流量配置成功！`)
-    }
-}
+
+import { Command, ICommand } from '../../common'
+import { CloudBaseError } from '../../../error'
+import { loadingFactory } from '../../../utils'
+import { setFunctionAliasConfig } from '../../../function'
+import { InjectParams, CmdContext, ArgsParams, ArgsOptions } from '../../../decorators'
+
+
+@ICommand()
+export class setFunctionRoutingConfig extends Command {
+    get options() {
+        return {
+            cmd: 'fn',
+            childCmd: 'config-route <name> <version1> <traffic1> [version2] [traffic2]',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '设置函数版本流量配置'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx, @ArgsParams() params) {
+        const name = params?.[0]
+        const version1 = params?.[1]
+        const traffic1 = Number(params?.[2])
+
+        const version2 = params?.[3]
+        const traffic2 = Number(params?.[4])
+
+        // 校验
+
+        // 1. version2 及 traffic2 必须同时存在
+        if ((version2 === undefined && traffic2 !== undefined) || (version2 !== undefined && traffic2 === undefined)) {
+            throw new CloudBaseError('version2 和 traffic2 必须同时设置')
+        }
+
+        if (traffic1 !== undefined && traffic2 !== undefined) {
+            if (traffic1 + traffic2 !== 100) {
+                throw new CloudBaseError('traffic1 和 traffic2 同时设置时，需保证总和 100')
+            }
+        }
+
+        const {
+            envId
+        } = ctx
+
+        const loading = loadingFactory()
+        loading.start(`设置函数 [${name}] 版本流量配置中...`)
+
+        let routingConfigParams = {
+            AddtionVersionMatchs: [{
+                Expression: `[0,${traffic1})`,
+                Key: "invoke.headers.X-Tcb-Route-Key",
+                Method: "range",
+                Version: version1
+            }]
+        }
+
+        if (version2 !== undefined) {
+            routingConfigParams.AddtionVersionMatchs.push({
+                Expression: `[${traffic1},${100})`,
+                Key: "invoke.headers.X-Tcb-Route-Key",
+                Method: "range",
+                Version: version2
+            })
+        }
+
+        await setFunctionAliasConfig({
+            envId,
+            functionName: name,
+            name: '$DEFAULT',
+            functionVersion: '$LATEST',
+            routingConfig: routingConfigParams
+        })
+
+        loading.succeed(`设置函数 [${name}] 版本流量配置成功！`)
+    }
+}