@cloudbase/cli 1.12.7-alpha.3 → 2.0.1

package/src/commands/run/service/deploy.ts

@@ -0,0 +1,121 @@
+import { Command, ICommand } from '../../common'
+import { InjectParams, ArgsOptions } from '../../../decorators'
+import {
+    describeCloudRunServerDetail, 
+    createTcbrService,
+    updateTcbrService
+} from '../../../run'
+import { EnumEnvCheck } from '../../../constant'
+import { checkTcbrEnv, logEnvCheck } from '../../../utils'
+@ICommand()
+export class DeployServiceTcbr extends Command {
+    get options() {
+        return {
+            cmd: 'run',
+            childCmd: 'deploy',
+            options: [
+                {
+                    flags: '--noConfirm',
+                    desc: '发布前是否跳过二次确认'
+                },
+                {
+                    flags: '--override',
+                    desc: '缺省的参数是否沿用旧版本配置'
+                },
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id，必填'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名，必填'
+                },
+                {
+                    flags: '--path <path>',
+                    desc: '本地代码根目录'
+                },
+                // 服务有关
+                {
+                    flags: '--cpu <cpu>',
+                    desc: '单一实例cpu规格，默认0.5'
+                },
+                {
+                    flags: '--mem <mem>',
+                    desc: '单一实例内存规格，默认1'
+                },
+                {
+                    flags: '--minNum <minNum>',
+                    desc: '最小副本数，默认0'
+                },
+                {
+                    flags: '--maxNum <maxNum>',
+                    desc: '最大副本数，默认50，不能大于50'
+                },
+                {
+                    flags: '--policyDetails <policyDetails>',
+                    desc: '扩缩容配置，格式为条件类型=条件比例（%），多个条件之间用&隔开，内存条件为mem，cpu条件为cpu，默认内存>60% 或 CPU>60%，即cpu=60&mem=60'
+                },
+                {
+                    flags: '--customLogs <customLogs>',
+                    desc: '日志采集路径，默认stdout'
+                },
+                {
+                    flags: '--envParams <envParams>',
+                    desc: '环境变量，格式为xx=a&yy=b，默认为空'
+                },
+                // 版本有关
+                {
+                    flags: '--containerPort <containerPort>',
+                    desc: '监听端口，必填'
+                },
+                {
+                    flags: '--remark <remark>',
+                    desc: '版本备注，默认为空'
+                },
+                {
+                    flags: '--targetDir <targetDir>',
+                    desc: '目标目录'
+                },
+                {
+                    flags: '--dockerfile <dockerfile>',
+                    desc: 'Dockerfile文件名，默认为 Dockerfile'
+                },
+                {
+                    flags: '--library_image <library_image>',
+                    desc: '线上镜像仓库的 tag，仅在服务已存在时可用'
+                },
+                {
+                    flags: '--image <image>',
+                    desc: '镜像标签或ID'
+                },
+                {
+                    flags: '--json',
+                    desc: '以 JSON 形式展示结果'
+                }
+            ],
+            desc: '在指定的环境部署服务'
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsOptions() options) {
+
+        let envCheckType = await checkTcbrEnv(options.envId, true)
+        if (envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(options.envId, envCheckType)
+            return
+        }
+
+        const { data: serviceDetail } = await describeCloudRunServerDetail({
+            envId: options.envId,
+            serviceName: options.serviceName
+        })
+        
+        if (serviceDetail === undefined) {
+            // 服务不存在，创建新服务
+            await createTcbrService(options)
+        } else {
+            await updateTcbrService(options)
+        }
+    }
+}

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

@@ -0,0 +1,5 @@
+export * from './list'
+export * from './create'
+export * from './update'
+export * from './deploy'
+export * from './config'

package/src/commands/run/service/list.ts

@@ -0,0 +1,94 @@
+import { Command, ICommand } from '../../common'
+import { InjectParams, ArgsOptions } from '../../../decorators'
+import { listService } from '../../../run'
+import { printHorizontalTable, genClickableLink, loadingFactory } from '../../../utils'
+import { checkTcbrEnv, logEnvCheck } from '../../../utils/checkTcbrEnv'
+import { EnumEnvCheck } from '../../../constant'
+
+@ICommand()
+export class ListServiceTcbr extends Command {
+    get options() {
+        return {
+            cmd: 'run',
+            childCmd: 'service:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名'
+                },
+                {
+                    flags: '--json',
+                    desc: '以 JSON 形式展示结果'
+                }
+            ],
+            desc: '展示环境下服务信息'
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsOptions() options) {
+
+        let { envId, serviceName = '' } = options
+
+        let envCheckType = await checkTcbrEnv(envId, true)
+        if (envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+
+        const loading = loadingFactory()
+
+        const head = ['服务名称', '状态', '公网访问', '创建时间', '更新时间']
+        loading.start('正在获取服务列表')
+        const serverList = await listService({
+            envId: envId
+        })
+        loading.stop()
+        
+        const specificServer = serverList.filter(serverItem => serverItem.ServerName === serviceName)
+        
+        // 打印 JSON 形式结果
+        if (options.json) {
+            console.log(JSON.stringify({
+                code: 0,
+                errmsg: 'success',
+                data: specificServer.length ?
+                specificServer
+                : serverList
+            }, null, 2))
+            return
+        }
+        
+        if (!serverList.length) {
+            console.log('当前环境下没有服务')
+            return
+        }
+        
+        // 如有指定服务名，则只打印指定服务的信息
+        let tableData: (string | number)[][]
+        if (specificServer.length) {
+            tableData = [[
+                specificServer[0].ServerName,
+                specificServer[0].Status,
+                `是 ${genClickableLink(specificServer[0].DefaultDomainName)}`,
+                specificServer[0].CreatedTime,
+                specificServer[0].UpdateTime
+            ]]
+        } else {
+            tableData = serverList.map(serverItem => [
+                serverItem.ServerName,
+                serverItem.Status,
+                `是 ${genClickableLink(serverItem.DefaultDomainName)}`,
+                serverItem.CreatedTime,
+                serverItem.UpdateTime
+            ])
+        }
+
+        printHorizontalTable(head, tableData)
+
+    }
+}

package/src/commands/run/service/update.ts

@@ -0,0 +1,104 @@
+import { Command, ICommand } from '../../common'
+import { InjectParams, ArgsOptions } from '../../../decorators'
+import { updateTcbrService } from '../../../run'
+import { EnumEnvCheck } from '../../../constant'
+import { checkTcbrEnv, logEnvCheck } from '../../../utils'
+@ICommand()
+export class UpdateServiceTcbr extends Command {
+    get options() {
+        return {
+            cmd: 'run',
+            childCmd: 'service:deploy',
+            options: [
+                {
+                    flags: '--noConfirm',
+                    desc: '发布前是否跳过二次确认'
+                },
+                {
+                    flags: '--override',
+                    desc: '缺省的参数是否沿用旧版本配置'
+                },
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id，必填'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名，必填'
+                },
+                {
+                    flags: '--path <path>',
+                    desc: '本地代码根目录'
+                },
+                // 服务有关
+                {
+                    flags: '--cpu <cpu>',
+                    desc: '单一实例cpu规格，默认0.5'
+                },
+                {
+                    flags: '--mem <mem>',
+                    desc: '单一实例内存规格，默认1'
+                },
+                {
+                    flags: '--minNum <minNum>',
+                    desc: '最小副本数，默认0'
+                },
+                {
+                    flags: '--maxNum <maxNum>',
+                    desc: '最大副本数，默认50，不能大于50'
+                },
+                {
+                    flags: '--policyDetails <policyDetails>',
+                    desc: '扩缩容配置，格式为条件类型=条件比例（%），多个条件之间用&隔开，内存条件为mem，cpu条件为cpu，默认内存>60% 或 CPU>60%，即cpu=60&mem=60'
+                },
+                {
+                    flags: '--customLogs <customLogs>',
+                    desc: '日志采集路径，默认stdout'
+                },
+                {
+                    flags: '--envParams <envParams>',
+                    desc: '环境变量，格式为xx=a&yy=b，默认为空'
+                },
+                // 版本有关
+                {
+                    flags: '--containerPort <containerPort>',
+                    desc: '监听端口，必填'
+                },
+                {
+                    flags: '--remark <remark>',
+                    desc: '版本备注，默认为空'
+                },
+                {
+                    flags: '--dockerfile <dockerfile>',
+                    desc: 'Dockerfile文件名，默认为 Dockerfile'
+                },
+                {
+                    flags: '--library_image <library_image>',
+                    desc: '线上镜像仓库的 tag'
+                },
+                {
+                    flags: '--image <image>',
+                    desc: '镜像标签或ID'
+                },
+                {
+                    flags: '--json',
+                    desc: '以 JSON 形式展示结果'
+                }
+            ],
+            desc: '指定环境和已存在的服务，发布新的应用'
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsOptions() options) {
+
+        let envCheckType = await checkTcbrEnv(options.envId, true)
+        if (envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(options.envId, envCheckType)
+            return
+        }
+
+        await updateTcbrService(options)
+    }
+
+}

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

@@ -1,5 +1,5 @@
 export const versionCommonOptions = (sub: string) => ({
-    cmd: 'run',
+    cmd: 'run:deprecated',
     childCmd: {
         cmd: 'version',
         desc: '云托管版本管理'

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

@@ -13,9 +13,10 @@ import {
     basicOperate,
     logCreate
 } from '../../../run'
-import { loadingFactory, pagingSelectPromp, random } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp, random } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const uploadTypeMap = {
     本地代码: 'package',
@@ -111,6 +112,12 @@ export class CreateVersion extends Command {
     /* eslint complexity: ["error", 40] */
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let {
             serviceName = '',
             path: _path = '',

package/src/commands/run/version/delete.ts

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { deleteVersion } from '../../../run'
-import { loadingFactory } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 @ICommand()
 export class DeleteVersion extends Command {
@@ -30,7 +31,12 @@ export class DeleteVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
-
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let { serviceName = '', versionName = '' } = options
 
         if (versionName.length === 0 || serviceName.length === 0) {

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

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { listVersion } from '../../../run'
-import { printHorizontalTable, loadingFactory } from '../../../utils'
+import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const StatusMap = {
     normal: '正常',
@@ -39,6 +40,11 @@ export class ListVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
 
         let { limit = 20, offset = 0, serviceName = '' } = options
         limit = Number(limit)

package/src/commands/run/version/modify.ts

@@ -2,9 +2,10 @@ import { prompt } from 'enquirer'
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { listVersion, modifyVersion } from '../../../run'
-import { loadingFactory, pagingSelectPromp } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 // 按百分比配置
 const modifyByFlow = async (envId: any, serviceName: string, mode: string) => {
@@ -118,6 +119,12 @@ export class ModifyVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let { serviceName = '', traffic: _traffic = 'FLOW' } = options
         if (serviceName.length === 0) throw new CloudBaseError('请填入有效云托管服务名')
 

package/src/commands/run/version/update.ts

@@ -14,9 +14,10 @@ import {
     logCreate,
     describeRunVersion
 } from '../../../run'
-import { loadingFactory, pagingSelectPromp, random } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp, random } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const uploadTypeMap = {
     本地代码: 'package',
@@ -136,6 +137,12 @@ export class UpdateVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let {
             serviceName = '',
             versionName = '',

package/src/constant.ts

@@ -117,4 +117,38 @@ export const ConcurrencyTaskStatus = {
     Done: '已完成',
     InProgress: '进行中',
     Failed: '失败'
-}
+}
+
+export const enum EnumEnvCheck {
+    EnvFit = 0,
+    EnvNewCmdOld,
+    EnvOldCmdNew,
+}
+
+export const enum EnumDeployStatus {
+    Deploying = 'deploying',
+    DeploySuccess = 'running',
+    DeployFailed = 'deploy_failed'
+}
+
+// tcbr 服务配置 cpu 和 mem 的约束
+export const CPU_MEM_OPTS: { cpu: number; mems: number[] }[] = [
+    { cpu: 0.25, mems: [0.5] },
+    { cpu: 0.5, mems: [1] },
+    { cpu: 1, mems: [2] },
+    { cpu: 2, mems: [4] },
+    { cpu: 4, mems: [8] },
+    { cpu: 8, mems: [16] },
+    { cpu: 16, mems: [32] },
+]
+
+export const DEFAULT_CPU_MEM_SET: { PolicyType: 'mem' | 'cpu', PolicyThreshold: number }[] = [
+    {
+        PolicyType: 'mem',
+        PolicyThreshold: 60
+    },
+    {
+        PolicyType: 'cpu',
+        PolicyThreshold: 60
+    },
+]

package/src/help.ts

@@ -1,48 +1,50 @@
-import chalk from 'chalk'
-
-export const outputHelpInfo = () => {
-    const commands = `
-  命令
-
-    login           [options]                  登录腾讯云账号
-    logout                                     登出腾讯云账号
-    env             [cmd]                      环境管理操作
-    fn              [cmd]                      操作函数
-    framework       [cmd]                      云开发 Serverless 应用框架操作
-    hosting         [cmd]                      静态托管资源管理操作
-    new             [appName] [template]       创建新的云开发应用
-    open            [link]                     在浏览器中打开云开发相关连接
-    storage         [cmd]                      云存储资源管理操作
-    service         [cmd]                      HTTP 访问服务管理操作`
-
-    const options = `
-  选项
-
-    --verbose                                  打印出内部运行信息
-    -r, --region <region>                      指定环境地域
-    --mode <mode>                              指定加载 env 文件的环境
-    --config-file <path>                       指定配置文件路径
-    -v, --version                              输出当前版本
-    -h, --help                                 查看命令帮助信息`
-
-    const tips = `
-  Tips:
-
-    ${chalk.gray('–')} 登录
-
-      ${chalk.cyan('$ tcb login')}
-
-    ${chalk.gray('–')} 创建新的云开发应用
-
-      ${chalk.cyan('$ tcb new appName')}
-
-    ${chalk.gray('–')} 部署云函数
-
-      ${chalk.cyan('$ tcb fn deploy')}
-
-    ${chalk.gray('–')} 查看命令使用介绍
-
-      ${chalk.cyan('$ tcb fn -h')}`
-
-    console.log(commands, '\n', options, '\n', tips)
-}
+import chalk from 'chalk'
+
+export const outputHelpInfo = () => {
+    const commands = `
+  命令
+
+    login           [options]                  登录腾讯云账号
+    logout                                     登出腾讯云账号
+    env             [cmd]                      环境管理操作
+    fn              [cmd]                      操作函数
+    framework       [cmd]                      云开发 Serverless 应用框架操作
+    hosting         [cmd]                      静态托管资源管理操作
+    new             [appName] [template]       创建新的云开发应用
+    open            [link]                     在浏览器中打开云开发相关连接
+    storage         [cmd]                      云存储资源管理操作
+    service         [cmd]                      HTTP 访问服务管理操作
+    run:deprecated  [cmd]                      云托管环境管理操作 (BAAS 或 RUN 类型环境)
+    run             [cmd]                      云托管环境管理操作 (TCBR 类型环境)`
+
+    const options = `
+  选项
+
+    --verbose                                  打印出内部运行信息
+    -r, --region <region>                      指定环境地域
+    --mode <mode>                              指定加载 env 文件的环境
+    --config-file <path>                       指定配置文件路径
+    -v, --version                              输出当前版本
+    -h, --help                                 查看命令帮助信息`
+
+    const tips = `
+  Tips:
+
+    ${chalk.gray('–')} 登录
+
+      ${chalk.cyan('$ tcb login')}
+
+    ${chalk.gray('–')} 创建新的云开发应用
+
+      ${chalk.cyan('$ tcb new appName')}
+
+    ${chalk.gray('–')} 部署云函数
+
+      ${chalk.cyan('$ tcb fn deploy')}
+
+    ${chalk.gray('–')} 查看命令使用介绍
+
+      ${chalk.cyan('$ tcb fn -h')}`
+
+    console.log(commands, '\n', options, '\n', tips)
+}

package/src/run/index.ts

@@ -4,4 +4,5 @@ export * from './version'
 export * from './image'
 export * from './delete'
 export * from './repo'
-export * from './standalonegateway'
+export * from './standalonegateway'
+export * from './service'