@cloudbase/cli 2.0.12 → 2.1.0

package/src/commands/lowcode/utils.ts

@@ -1,25 +0,0 @@
-import { CloudBaseError } from '@cloudbase/toolbox'
-import { ChildProcess } from 'child_process'
-
-export function promisifyProcess(p: ChildProcess, pipe = false) {
-  return new Promise((resolve, reject) => {
-      let stdout = ''
-      let stderr = ''
-
-      p.stdout.on('data', (data => {
-          stdout +=String(data)
-      }))
-      p.stderr.on('data', (data => {
-          stderr += String(data)
-      }))
-      p.on('error', reject)
-      p.on('exit', exitCode => {
-          exitCode === 0 ? resolve(stdout) : reject(new CloudBaseError(stderr || String(exitCode)))
-      })
-
-      if (pipe) {
-        p.stdout.pipe(process.stdout)
-        p.stderr.pipe(process.stderr)
-      }
-  })
-}

package/src/commands/run/create.ts

@@ -1,153 +0,0 @@
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { getImageRepo, createRun } from '../../run'
-import { getVpcs, getSubnets } from '../../function'
-import { checkTcbrEnv, loadingFactory, logEnvCheck } from '../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { validateIp } from '../../utils/validator'
-import { EnumEnvCheck } from '../../constant'
-
-const ZoneMap = {
-    shanghai: '上海',
-    guangzhou: '广州'
-}
-
-@ICommand()
-export class CreateRun extends Command {
-    get options() {
-        return {
-            cmd: 'run:deprecated',
-            childCmd: 'create',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-n, --name <name>',
-                    desc: '服务名称，必填'
-                },
-                {
-                    flags: '-c, --vpc <vpc>',
-                    desc: '云托管网络设置，默认系统创建，选择已有私有网络则填入格式为私有网络Id|子网Id1,...,子网Idn'
-                },
-                {
-                    flags: '-p, --repo <repo>',
-                    desc: '镜像仓库名，默认系统创建'
-                },
-                // {
-                //     flags: '-l, --log <log>',
-                //     desc: '日志管理设置，默认为系统默认cls，自定义ES则填入格式为Ip=xx&Port=xx&Index=xx&Account=xx&Password=xx'
-                // },
-                {
-                    flags: '-m, --remark <remark>',
-                    desc: '备注，默认为空'
-                },
-                {
-                    flags: '-a, --publicAccess <publicAccess>',
-                    desc: '是否允许公网访问(Y/N)，默认为允许'
-                }
-            ],
-            desc: '创建云托管服务'
-        }
-    }
-
-    @InjectParams()
-    /* eslint complexity: ["error", 40] */
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let envCheckType = await checkTcbrEnv(options.envId, false)
-        if(envCheckType !== EnumEnvCheck.EnvFit) {
-            logEnvCheck(envId, envCheckType)
-            return
-        }
-        
-        let {
-            name: _name = '',
-            vpc: _vpc = '',
-            repo: _repo = '',
-            log: _log = '',
-            remark: _remark = '',
-            publicAccess: _publicAccess = ''
-        } = options
-        let name: string
-        let remark: string
-        let vpcInfo: { VpcId: string; SubnetIds: string[]; CreateType: number }
-        let imageRepo: string
-        let logType: string
-        let esInfo: { Ip: string; Port: number; Index: string; Account: string; Password: string }
-        let publicAccess: number
-
-        const loading = loadingFactory()
-
-        // 服务名称
-        if (!_name) {
-            throw new CloudBaseError('请填入服务名')
-        } else {
-            name = _name
-        }
-
-        // 备注
-        remark = _remark
-
-        // 云托管网络配置
-        if (!_vpc) {
-            vpcInfo = {
-                VpcId: '',
-                SubnetIds: [],
-                CreateType: 1
-            }
-        } else {
-            vpcInfo = {
-                VpcId: _vpc.split('|')[0],
-                SubnetIds: _vpc.split('|')[1].split(','),
-                CreateType: 2
-            }
-        }
-
-        // 镜像仓库设置
-        if (!_repo) {
-            imageRepo = undefined
-        } else {
-            imageRepo = _repo
-        }
-
-        // 日志配置
-        if (!_log) {
-            logType = 'cls'
-        } else {
-            logType = 'es'
-
-            esInfo = _log.split('&').reduce((pre, item) => {
-                pre[item.split('=')[0]] = item.split('=')[0] === 'Port' ? Number(item.split('=')[1]) : item.split('=')[1]
-                return pre
-            }, {})
-        }
-
-        // 公网访问服务
-        if (!_publicAccess) {
-            publicAccess = 1
-        } else if (/[^nNyY]/.test(_publicAccess) || _publicAccess.length !== 1) {
-            throw new CloudBaseError('请输入符合规范的公网访问服务设置')
-        } else if (_publicAccess === 'N' || _publicAccess === 'n') {
-            publicAccess = 2
-        } else {
-            publicAccess = 1
-        }
-
-        const res = await createRun({
-            envId,
-            name,
-            remark,
-            vpcInfo,
-            imageRepo,
-            logType,
-            esInfo,
-            publicAccess,
-            isPublic: true
-        })
-
-        if (res === 'succ') loading.succeed(`云托管服务 ${name} 创建成功！`)
-        else throw new CloudBaseError('创建失败，请查看是否已经有同名服务')
-    }
-}

package/src/commands/run/delete.ts

@@ -1,77 +0,0 @@
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { describeImageRepo, listVersion, deleteImageRepo, deleteRun } from '../../run'
-import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp } from '../../utils'
-import { EnumEnvCheck } from '../../constant'
-
-@ICommand()
-export class DeleteRun extends Command {
-    get options() {
-        return {
-            cmd: 'run:deprecated',
-            childCmd: 'delete',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '云托管服务 name'
-                },
-            ],
-            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 = '' } = options
-
-        if (serviceName.length === 0) {
-            throw new CloudBaseError('必须输入服务名')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const versions = await listVersion({ envId, serverName: serviceName, limit: 1, offset: 0 })
-
-        if (versions.length > 0)
-            throw new CloudBaseError('服务下还有版本存在，请先清空版本列表')
-
-        const imageRepo = await describeImageRepo({ envId, serverName: serviceName })
-
-        loading.start('正在删除服务')
-        const res = await deleteRun({ envId, serverName: serviceName })
-        if (res === 'succ')
-            loading.succeed('服务删除完成')
-        else
-            throw new CloudBaseError('服务删除失败')
-
-        if ((await prompt<any>({
-            type: 'select',
-            name: 'flag',
-            message: `是否删除绑定的镜像仓库${imageRepo}`,
-            choices: ['是', '否']
-        })).flag === '是') {
-            loading.start('正在删除镜像仓库')
-            const res = await deleteImageRepo({ imageRepo })
-            if (res === '') {
-                loading.succeed('仓库删除完成')
-            }
-            else {
-                throw new CloudBaseError('仓库删除失败')
-            }
-        }
-    }
-}

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

@@ -1,8 +0,0 @@
-export const imageCommonOptions = (sub: string) => ({
-    cmd: 'run:deprecated',
-    childCmd: {
-        cmd: 'image',
-        desc: '云托管镜像管理'
-    },
-    childSubCmd: sub
-})

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

@@ -1,68 +0,0 @@
-import { Command, ICommand } from '../../common'
-import { CloudBaseError } from '../../../error'
-import { deleteImage, describeImageRepo } from '../../../run'
-import { checkTcbrEnv, loadingFactory, logEnvCheck } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { imageCommonOptions } from './common'
-import { EnumEnvCheck } from '../../../constant'
-
-@ICommand()
-export class DeleteImage extends Command {
-    get options() {
-        return {
-            ...imageCommonOptions('delete'),
-            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()
-
-        loading.start('数据加载中...')
-
-        const imageRepo = await describeImageRepo({ envId, serverName: serviceName })
-
-        const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`
-
-        try {
-            const res = await deleteImage({
-                envId,
-                imageUrl: imageUrl as string
-            })
-
-            if (res === 'success') loading.succeed(`成功删除 ${serviceName} 服务下的 ${imageUrl} 镜像`)
-            else throw new CloudBaseError('删除失败')
-        } catch (e) {
-            throw new CloudBaseError('删除失败')
-        }
-
-    }
-}

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)
-    }
-}