@cloudbase/cli 2.0.12 → 2.0.13

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

@@ -1,68 +0,0 @@
-import { exec } from 'child_process'
-import * as util from 'util'
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { describeImageRepo, getAuthFlag } from '../../../run'
-import { loadingFactory, getUin, checkTcbrEnv, logEnvCheck } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { imageCommonOptions } from './common'
-import { EnumEnvCheck } from '../../../constant'
-
-@ICommand()
-export class DownLoadImage extends Command {
-    get options() {
-        return {
-            ...imageCommonOptions('download'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '托管服务 name'
-                },
-                {
-                    flags: '-t, --imageTag <imageTag>',
-                    desc: '镜像 tag'
-                }
-            ],
-            desc: '删除云开发环境下云托管服务的版本'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let envCheckType = await checkTcbrEnv(options.envId, false)
-        if(envCheckType !== EnumEnvCheck.EnvFit) {
-            logEnvCheck(envId, envCheckType)
-            return
-        }
-        let { serviceName = '', imageTag = '' } = options
-
-        if (serviceName.length === 0 || imageTag.length === 0) {
-            throw new CloudBaseError('必须输入 serviceName 和 imageTag')
-        }
-
-        const loading = loadingFactory()
-
-        const imageRepo = await describeImageRepo({ envId, serverName: serviceName })
-
-        const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`
-
-        if (!(await getAuthFlag())) {
-            throw new CloudBaseError('无法找到~/.docker/config.json或未登录，需要执行docker login')
-        }
-
-        let sh = new Promise<{ code: number; info: string }>((resolve, reject) => {
-            exec(`docker pull ${imageUrl}`, (err, stdout) =>
-                err ? reject(err) : resolve({ code: 0, info: stdout })
-            ).stdout.pipe(process.stdout)
-        })
-
-        await sh
-
-        loading.succeed('拉取成功')
-    }
-}

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

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

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

@@ -1,84 +0,0 @@
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { listImage } from '../../../run'
-import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { imageCommonOptions } from './common'
-import { EnumEnvCheck } from '../../../constant'
-
-@ICommand()
-export class ListImage extends Command {
-    get options() {
-        return {
-            ...imageCommonOptions('list'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '托管服务 name'
-                },
-                {
-                    flags: '-l, --limit <limit>',
-                    desc: '返回数据长度，默认值为 20'
-                },
-                {
-                    flags: '-o, --offset <offset>',
-                    desc: '数据偏移量，默认值为 0'
-                }
-            ],
-            desc: '展示选择的云托管服务的版本列表'
-        }
-    }
-
-    @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)
-        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 的整数')
-        }
-
-        if (serviceName.length === 0) {
-            throw new CloudBaseError('请输入查询的服务名')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await listImage({
-            envId,
-            limit: Number(limit),
-            offset: Number(offset),
-            serviceName: serviceName
-        })
-
-        loading.stop()
-
-        const head: string[] = ['镜像', '大小', '关联服务版本', '创建时间', '更新时间']
-
-        const tableData = data.map((item) => [
-            item.ImageUrl.split(':')[1],
-            item.Size,
-            item.ReferVersions.length > 0 ? item.ReferVersions.reduce((sum, item) => `${sum}|${item.VersionName}`, '') : '-',
-            item.CreateTime,
-            item.UpdateTime,
-        ])
-
-        printHorizontalTable(head, tableData)
-    }
-}

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

@@ -1,76 +0,0 @@
-import { exec } from 'child_process'
-import * as util from 'util'
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { describeImageRepo, getAuthFlag } from '../../../run'
-import { loadingFactory, getUin, checkTcbrEnv, logEnvCheck } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { imageCommonOptions } from './common'
-import { EnumEnvCheck } from '../../../constant'
-
-@ICommand()
-export class UploadImage extends Command {
-    get options() {
-        return {
-            ...imageCommonOptions('upload'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '托管服务 name'
-                },
-                {
-                    flags: '-i, --imageId <imageId>',
-                    desc: '本地镜像 id'
-                },
-                {
-                    flags: '-t, --imageTag <imageTag>',
-                    desc: '镜像 tag'
-                }
-            ],
-            desc: '删除云开发环境下云托管服务的版本'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-
-        let envCheckType = await checkTcbrEnv(options.envId, false)
-        if(envCheckType !== EnumEnvCheck.EnvFit) {
-            logEnvCheck(envId, envCheckType)
-            return
-        }
-        
-        const { serviceName = '', imageId = '', imageTag = '' } = options
-
-        if (serviceName.length === 0 || imageId.length === 0 || imageTag.length === 0) {
-            throw new CloudBaseError('必须输入 serviceName 和 imageId 和 imageTag')
-        }
-
-        const loading = loadingFactory()
-
-        if (!(await getAuthFlag())) {
-            throw new CloudBaseError('无法找到~/.docker/config.json或未登录，需要执行docker login')
-        }
-
-        const imageRepo = await describeImageRepo({ envId, serverName: serviceName })
-
-        await util.promisify(exec)(`docker tag ${imageId} ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`)
-
-        let sh = new Promise<{ code: number, info: string }>(
-            (resolve, reject) => {
-                exec(
-                    `docker push ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`,
-                    (stderr, stdout) => stderr ? reject(stderr) : resolve({ code: 0, info: stdout })
-                ).stdout.pipe(process.stdout)
-            })
-
-        await sh
-
-        loading.succeed('上传成功')
-    }
-}

package/src/commands/run/index.ts

@@ -1,7 +0,0 @@
-export * from './list'
-export * from './create'
-export * from './version'
-export * from './delete'
-export * from './image'
-export * from './standalonegateway'
-export * from './service'

package/src/commands/run/list.ts

@@ -1,83 +0,0 @@
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { listRun } from '../../run'
-import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck} from '../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { EnumEnvCheck } from '../../constant'
-
-const StatusMap = {
-    succ: '正常'
-}
-
-@ICommand()
-export class ListRun extends Command {
-    get options() {
-        return {
-            cmd: 'run:deprecated',
-            childCmd: 'list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-l, --limit <limit>',
-                    desc: '返回数据长度，默认值为 20'
-                },
-                {
-                    flags: '-o, --offset <offset>',
-                    desc: '数据偏移量，默认值为 0'
-                }
-            ],
-            desc: '展示云托管服务列表'
-        }
-    }
-
-    @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 } = 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 loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await listRun({
-            envId,
-            limit: Number(limit),
-            offset: Number(offset)
-        })
-
-        loading.stop()
-
-        const head: string[] = ['服务名称', '服务备注', '创建时间', '修改时间', '状态', '所在私有网络']
-
-        const tableData = data.map((item) => [
-            item.ServerName,
-            item.ServiceRemark ? item.ServiceRemark : '-',
-            item.CreatedTime,
-            item.UpdatedTime,
-            StatusMap[item.Status],
-            item.VpcId,
-        ])
-
-        printHorizontalTable(head, tableData)
-    }
-}

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

@@ -1,81 +0,0 @@
-import { Command, ICommand } from '../../common'
-import { InjectParams, ArgsOptions, Log, Logger } from '../../../decorators'
-import { tcbrServiceConfigOptions, updateCloudRunServerConfig } from '../../../run'
-import { EnumEnvCheck } from '../../../constant'
-import { checkTcbrEnv, logEnvCheck } from '../../../utils'
-
-@ICommand()
-export class ConfigServiceTcbr extends Command {
-    get options() {
-        return {
-            cmd: 'run',
-            childCmd: 'service:config',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id，必填'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    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: '--json',
-                    desc: '以 JSON 形式展示结果'
-                }
-            ],
-            desc: '指定环境和服务，更新服务的基础配置'
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsOptions() options, @Log() log: Logger) {
-        let envCheckType = await checkTcbrEnv(options.envId, true)
-        if (envCheckType !== EnumEnvCheck.EnvFit) {
-            logEnvCheck(options.envId, envCheckType)
-            return
-        }
-        const newServiceConfig = await tcbrServiceConfigOptions(options)
-
-        const configRes = await updateCloudRunServerConfig({
-            envId: options.envId,
-            serviceName: options.serviceName,
-            ServerBaseConfig: newServiceConfig
-        })
-
-        if (options.json) {
-            console.log(JSON.stringify(configRes, null, 2))
-        } else {
-            log.success('更新配置信息成功')
-        }
-    }
-}

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

@@ -1,122 +0,0 @@
-import { Command, ICommand } from '../../common'
-import { InjectParams, ArgsOptions } from '../../../decorators'
-import { CloudBaseError } from '../../../error'
-import { createTcbrService, describeCloudRunServerDetail } from '../../../run'
-import { EnumEnvCheck } from '../../../constant'
-import { checkTcbrEnv, logEnvCheck } from '../../../utils'
-
-@ICommand()
-export class CreateServiceTcbr extends Command {
-    get options() {
-        return {
-            cmd: 'run',
-            childCmd: 'service:create',
-            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: '--custom_image <custom_image>',
-                  desc: 'TCR 仓库镜像 URL'  
-                },
-                {
-                    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) {
-            // 服务已存在, 更新服务
-            throw new CloudBaseError('当前服务已存在，请使用 tcb run service:deploy 更新服务')
-        }
-
-        await createTcbrService(options)
-    }
-}

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

@@ -1,125 +0,0 @@
-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: '--custom_image <custom_image>',
-                    desc: 'TCR 仓库镜像 URL'  
-                  },
-                {
-                    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

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