@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

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/standalonegateway/common.ts

@@ -1,8 +1,8 @@
-export const standalonegatewayCommonOptions = (sub: string) => ({
-  cmd: 'run',
-  childCmd: {
-    cmd: 'standalonegateway',
-    desc: '云托管小租户网关管理'
-  },
-  childSubCmd: sub
+export const standalonegatewayCommonOptions = (sub: string) => ({
+  cmd: 'run',
+  childCmd: {
+    cmd: 'standalonegateway',
+    desc: '云托管小租户网关管理'
+  },
+  childSubCmd: sub
 })

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

@@ -1,85 +1,85 @@
-import { Command, ICommand } from '../../common'
-import { createStandaloneGateway } from '../../../run/'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class CreateStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('create'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gA, --gatewayAlias <gatewayAlias>',
-                    desc: '网关 alias'
-                },
-                {
-                    flags: '-gD, --gatewayDesc <gatewayDesc>',
-                    desc: '网关描述'
-                },
-                {
-                    flags: '-v --vpcId <vpcId>',
-                    desc: 'VPC'
-                },
-                {
-                    flags: '-s, --subnetIds <subnetIds...>',
-                    desc: '子网列表'
-                },
-                {
-                    flags: '-p, --packageVersion <packageVersion>',
-                    desc: '套餐版本'
-                }
-            ],
-            desc: '创建小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-
-        let { gatewayAlias = '', gatewayDesc = '', vpcId = '', subnetIds = [], packageVersion = '' } = options
-        gatewayAlias = String(gatewayAlias)
-        gatewayDesc = String(gatewayDesc)
-        vpcId = String(vpcId)
-        packageVersion = String(packageVersion)
-
-        if (vpcId === '') {
-            throw new CloudBaseError('请输入 VPC')
-        }
-
-        if (subnetIds.length === 0) {
-            throw new CloudBaseError('请输入子网列表')
-        }
-
-        if (gatewayDesc === '') {
-            throw new CloudBaseError('请输入网关描述')
-        }
-
-        if (packageVersion === '') {
-            throw new CloudBaseError('请输入套餐版本')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await createStandaloneGateway({
-            envId,
-            gatewayAlias,
-            gatewayDesc,
-            vpcId,
-            subnetIds,
-            packageVersion
-        })
-
-        loading.stop()
-
-        console.log('操作执行成功，网关名称：' + data)
-    }
-}
+import { Command, ICommand } from '../../common'
+import { createStandaloneGateway } from '../../../run/'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class CreateStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('create'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gA, --gatewayAlias <gatewayAlias>',
+                    desc: '网关 alias'
+                },
+                {
+                    flags: '-gD, --gatewayDesc <gatewayDesc>',
+                    desc: '网关描述'
+                },
+                {
+                    flags: '-v --vpcId <vpcId>',
+                    desc: 'VPC'
+                },
+                {
+                    flags: '-s, --subnetIds <subnetIds...>',
+                    desc: '子网列表'
+                },
+                {
+                    flags: '-p, --packageVersion <packageVersion>',
+                    desc: '套餐版本'
+                }
+            ],
+            desc: '创建小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+
+        let { gatewayAlias = '', gatewayDesc = '', vpcId = '', subnetIds = [], packageVersion = '' } = options
+        gatewayAlias = String(gatewayAlias)
+        gatewayDesc = String(gatewayDesc)
+        vpcId = String(vpcId)
+        packageVersion = String(packageVersion)
+
+        if (vpcId === '') {
+            throw new CloudBaseError('请输入 VPC')
+        }
+
+        if (subnetIds.length === 0) {
+            throw new CloudBaseError('请输入子网列表')
+        }
+
+        if (gatewayDesc === '') {
+            throw new CloudBaseError('请输入网关描述')
+        }
+
+        if (packageVersion === '') {
+            throw new CloudBaseError('请输入套餐版本')
+        }
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+
+        const data = await createStandaloneGateway({
+            envId,
+            gatewayAlias,
+            gatewayDesc,
+            vpcId,
+            subnetIds,
+            packageVersion
+        })
+
+        loading.stop()
+
+        console.log('操作执行成功，网关名称：' + data)
+    }
+}

package/src/commands/run/standalonegateway/destroy.ts

@@ -1,59 +1,59 @@
-import { Command, ICommand } from '../../common'
-import { destroyStandalonegateway } from '../../../run'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class DestroyStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('destroy'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gN, --gatewayName <gatewayName>',
-                    desc: '网关 name'
-                },
-                {
-                    flags: '--isForce',
-                    desc: '强制确认删除资源'
-                }
-            ],
-            desc: '销毁小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-
-        let { isForce = false, gatewayName = '' } = options
-        isForce = Boolean(isForce)
-        gatewayName = String(gatewayName)
-
-        if (gatewayName === '') {
-            throw new CloudBaseError('请输入网关名称')
-        }
-
-        if (!isForce) {
-            throw new CloudBaseError('请使用 --isForce 选项确认销毁资源！')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-        
-        await destroyStandalonegateway({
-            envId,
-            gatewayName
-        })
-
-        loading.stop()
-
-        console.log('网关已销毁')
-    }
-}
+import { Command, ICommand } from '../../common'
+import { destroyStandalonegateway } from '../../../run'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class DestroyStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('destroy'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gN, --gatewayName <gatewayName>',
+                    desc: '网关 name'
+                },
+                {
+                    flags: '--isForce',
+                    desc: '强制确认删除资源'
+                }
+            ],
+            desc: '销毁小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+
+        let { isForce = false, gatewayName = '' } = options
+        isForce = Boolean(isForce)
+        gatewayName = String(gatewayName)
+
+        if (gatewayName === '') {
+            throw new CloudBaseError('请输入网关名称')
+        }
+
+        if (!isForce) {
+            throw new CloudBaseError('请使用 --isForce 选项确认销毁资源！')
+        }
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+        
+        await destroyStandalonegateway({
+            envId,
+            gatewayName
+        })
+
+        loading.stop()
+
+        console.log('网关已销毁')
+    }
+}

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

@@ -1,5 +1,5 @@
-export * from './list'
-export * from './create'
-export * from './destroy'
-export * from './package'
+export * from './list'
+export * from './create'
+export * from './destroy'
+export * from './package'
 export * from './turn'

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

@@ -1,53 +1,53 @@
-import { Command, ICommand } from '../../common'
-import { listStandalonegateway } from '../../../run/standalonegateway'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { printHorizontalTable } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class ListStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('list'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gN, --gatewayName <gatewayName>',
-                    desc: '网关 name'
-                },
-                {
-                    flags: '-gA, --gatewayAlias <gatewayAlias>',
-                    desc: '网关 alias'
-                }
-            ],
-            desc: '查询小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let { gatewayName = '', gatewayAlias = '' } = options
-        gatewayName = String(gatewayName)
-        gatewayAlias = String(gatewayAlias)
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        const data = await listStandalonegateway({
-            envId,
-            gatewayName,
-            gatewayAlias
-        })
-
-        loading.stop()
-
-        const head = ['名称', '状态', '别名', '套餐版本', '子网', '外网IP', '内网IP', '服务信息']
-        printHorizontalTable(head, data)
-    }
-}
+import { Command, ICommand } from '../../common'
+import { listStandalonegateway } from '../../../run/standalonegateway'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { printHorizontalTable } from '../../../utils'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class ListStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('list'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gN, --gatewayName <gatewayName>',
+                    desc: '网关 name'
+                },
+                {
+                    flags: '-gA, --gatewayAlias <gatewayAlias>',
+                    desc: '网关 alias'
+                }
+            ],
+            desc: '查询小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+        let { gatewayName = '', gatewayAlias = '' } = options
+        gatewayName = String(gatewayName)
+        gatewayAlias = String(gatewayAlias)
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+
+        const data = await listStandalonegateway({
+            envId,
+            gatewayName,
+            gatewayAlias
+        })
+
+        loading.stop()
+
+        const head = ['名称', '状态', '别名', '套餐版本', '子网', '外网IP', '内网IP', '服务信息']
+        printHorizontalTable(head, data)
+    }
+}