@cloudbase/cli 1.12.7-alpha.4 → 2.0.2

package/package.json

@@ -1,88 +1,88 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "1.12.7-alpha.4",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "tsc": "tsc",
-        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build && git add ."
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.4.0",
-        "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.12.26-alpha.4",
-        "@cloudbase/manager-node": "3.12.1",
-        "@cloudbase/toolbox": "^0.7.2",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "axios": "^0.21.1",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.1",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^2.2.4",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.19",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.25",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.5",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0"
-    },
-    "devDependencies": {
-        "@types/jest": "^25.1.4",
-        "@types/koa__router": "^8.0.4",
-        "@types/lodash": "^4.14.149",
-        "@types/node": "^12.12.38",
-        "@types/node-fetch": "^2.5.4",
-        "@types/react": "^17.0.37",
-        "@types/semver": "^7.3.9",
-        "@types/webpack-dev-server": "^3.11.1",
-        "@typescript-eslint/eslint-plugin": "^4.8.1",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^25.1.0",
-        "rimraf": "^3.0.0",
-        "ts-jest": "^25.3.0",
-        "typescript": "^4.1.2"
-    }
-}
+{
+    "name": "@cloudbase/cli",
+    "version": "2.0.2",
+    "description": "cli tool for cloudbase",
+    "main": "lib/index.js",
+    "scripts": {
+        "build": "rimraf lib types && tsc",
+        "watch": "rimraf lib types && tsc -w",
+        "dev": "rimraf lib types && tsc -w",
+        "eslint": "eslint \"./**/*.ts\"",
+        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
+        "tsc": "tsc",
+        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
+        "postinstall": "node ./post-install.js || exit 0"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
+    },
+    "bin": {
+        "tcb": "bin/tcb.js",
+        "cloudbase": "bin/cloudbase.js"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "npm run build && git add ."
+        }
+    },
+    "author": "cwuyiqing@gmail.com",
+    "license": "ISC",
+    "dependencies": {
+        "@cloudbase/cloud-api": "^0.4.0",
+        "@cloudbase/framework-core": "^1.6.1",
+        "@cloudbase/lowcode-cli": "^0.12.28",
+        "@cloudbase/manager-node": "4.0.0",
+        "@cloudbase/toolbox": "^0.7.2",
+        "@sentry/node": "^5.10.2",
+        "address": "^1.1.2",
+        "chalk": "^2.4.2",
+        "cli-table3": "^0.5.1",
+        "commander": "7",
+        "del": "^5.1.0",
+        "didyoumean": "^1.2.2",
+        "enquirer": "^2.3.6",
+        "execa": "^4.0.3",
+        "fs-extra": "^8.1.0",
+        "https-proxy-agent": "^5.0.1",
+        "inquirer": "^6.5.0",
+        "lodash": "^4.17.21",
+        "log-symbols": "^3.0.0",
+        "lowdb": "^1.0.0",
+        "make-dir": "^3.0.0",
+        "node-fetch": "^2.6.0",
+        "open": "^7.0.0",
+        "ora": "^4.0.2",
+        "portfinder": "^1.0.28",
+        "progress": "^2.0.3",
+        "query-string": "^6.8.1",
+        "reflect-metadata": "^0.1.13",
+        "semver": "^7.3.7",
+        "tar-fs": "^2.0.1",
+        "terminal-link": "^2.1.1",
+        "unzipper": "^0.10.10",
+        "update-notifier": "^4.0.0",
+        "xdg-basedir": "^4.0.0",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^21.0.1"
+    },
+    "devDependencies": {
+        "@types/jest": "^27",
+        "@types/koa__router": "^8.0.11",
+        "@types/lodash": "^4.14.182",
+        "@types/node": "^12.12.38",
+        "@types/node-fetch": "^2.5.4",
+        "@types/react": "^17.0.37",
+        "@types/semver": "^7.3.9",
+        "@types/webpack-dev-server": "^3.11.1",
+        "@typescript-eslint/eslint-plugin": "^4.8.1",
+        "@typescript-eslint/parser": "^4.8.1",
+        "eslint": "^7.14.0",
+        "eslint-config-alloy": "^3.8.2",
+        "husky": "^3.0.9",
+        "jest": "^27",
+        "rimraf": "^3.0.2",
+        "ts-jest": "^27",
+        "typescript": "^4.7.2"
+    }
+}

package/src/commands/run/create.ts

@@ -3,9 +3,10 @@ import { Command, ICommand } from '../common'
 import { CloudBaseError } from '../../error'
 import { getImageRepo, createRun } from '../../run'
 import { getVpcs, getSubnets } from '../../function'
-import { loadingFactory } from '../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck } from '../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
 import { validateIp } from '../../utils/validator'
+import { EnumEnvCheck } from '../../constant'
 
 const ZoneMap = {
     shanghai: '上海',
@@ -16,7 +17,7 @@ const ZoneMap = {
 export class CreateRun extends Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'create',
             options: [
                 {
@@ -55,6 +56,12 @@ export class CreateRun extends Command {
     @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 = '',

package/src/commands/run/delete.ts

@@ -3,13 +3,14 @@ import { Command, ICommand } from '../common'
 import { CloudBaseError } from '../../error'
 import { describeImageRepo, listVersion, deleteImageRepo, deleteRun } from '../../run'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { loadingFactory, pagingSelectPromp } from '../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp } from '../../utils'
+import { EnumEnvCheck } from '../../constant'
 
 @ICommand()
 export class DeleteRun extends Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'delete',
             options: [
                 {
@@ -27,6 +28,11 @@ export class DeleteRun 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 = '' } = options
 

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

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

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

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { deleteImage, describeImageRepo } from '../../../run'
-import { loadingFactory } from '../../../utils'
+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 {
@@ -31,6 +32,12 @@ export class DeleteImage 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 = '', imageTag = '' } = options
 
         if (serviceName.length === 0 || imageTag.length === 0) {

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

@@ -4,9 +4,10 @@ import { prompt } from 'enquirer'
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { describeImageRepo, getAuthFlag } from '../../../run'
-import { loadingFactory, getUin } from '../../../utils'
+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 {
@@ -33,6 +34,11 @@ export class DownLoadImage 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 = '', imageTag = '' } = options
 
         if (serviceName.length === 0 || imageTag.length === 0) {

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

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { listImage } from '../../../run'
-import { printHorizontalTable, loadingFactory } from '../../../utils'
+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 {
@@ -34,7 +35,11 @@ export class ListImage 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)
         offset = Number(offset)

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

@@ -4,9 +4,10 @@ import { prompt } from 'enquirer'
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { describeImageRepo, getAuthFlag } from '../../../run'
-import { loadingFactory, getUin } from '../../../utils'
+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 {
@@ -38,6 +39,12 @@ export class UploadImage extends Command {
     @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) {

package/src/commands/run/index.ts

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

package/src/commands/run/list.ts

@@ -1,8 +1,10 @@
 import { Command, ICommand } from '../common'
 import { CloudBaseError } from '../../error'
-import { listRun } from '../../run'
+import { listRun, logCreate } from '../../run'
 import { printHorizontalTable, loadingFactory } from '../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
+import { checkTcbrEnv, logEnvCheck } from '../../utils'
+import { EnumEnvCheck } from '../../constant'
 
 const StatusMap = {
     succ: '正常'
@@ -12,7 +14,7 @@ const StatusMap = {
 export class ListRun extends Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'list',
             options: [
                 {
@@ -33,9 +35,15 @@ export class ListRun 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 } = options
         limit = Number(limit)
         offset = Number(offset)

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

@@ -0,0 +1,81 @@
+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

@@ -0,0 +1,118 @@
+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: '--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)
+    }
+}