@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/.editorconfig

@@ -1,10 +1,10 @@
-root = true
-
-[!{node_modules}/**]
-end_of_line = lf
-charset = utf-8
-
-[{*.js,*.ts,*.html,*.json,*.gql,*.graqhql}]
-indent_style = space
-indent_size = 4
+root = true
+
+[!{node_modules}/**]
+end_of_line = lf
+charset = utf-8
+
+[{*.js,*.ts,*.html,*.json,*.gql,*.graqhql}]
+indent_style = space
+indent_size = 4
  

package/.eslintignore

@@ -1,8 +1,8 @@
-server_node_modules/
-deps/
-addons/
-lib/
-types/
-node_modules
-bin/
+server_node_modules/
+deps/
+addons/
+lib/
+types/
+node_modules
+bin/
 functions/

package/.eslintrc

@@ -1,35 +1,35 @@
-{
-    "extends": ["alloy", "alloy/typescript"],
-    "rules": {
-        "no-console": "off",
-        "no-unused-vars": "off",
-        "no-implicit-coercion": [2, { "number": false }],
-        "quotes": [
-            "error",
-            "single",
-            {
-                "avoidEscape": true
-            }
-        ],
-        "semi": ["error", "never"],
-        "max-params": "off",
-        "@typescript-eslint/explicit-member-accessibility": "off",
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/interface-name-prefix": "off",
-        "@typescript-eslint/no-explicit-any": "off"
-    },
-    "env": {
-        "es6": true,
-        "node": true,
-        "jest": true
-    },
-    "parser": "@typescript-eslint/parser",
-    "overrides": [
-        {
-            "files": ["*.js"],
-            "rules": {
-                "@typescript-eslint/no-var-requires": "off"
-            }
-        }
-    ]
-}
+{
+    "extends": ["alloy", "alloy/typescript"],
+    "rules": {
+        "no-console": "off",
+        "no-unused-vars": "off",
+        "no-implicit-coercion": [2, { "number": false }],
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": ["error", "never"],
+        "max-params": "off",
+        "@typescript-eslint/explicit-member-accessibility": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/interface-name-prefix": "off",
+        "@typescript-eslint/no-explicit-any": "off"
+    },
+    "env": {
+        "es6": true,
+        "node": true,
+        "jest": true
+    },
+    "parser": "@typescript-eslint/parser",
+    "overrides": [
+        {
+            "files": ["*.js"],
+            "rules": {
+                "@typescript-eslint/no-var-requires": "off"
+            }
+        }
+    ]
+}

package/.prettierrc.js

@@ -1,29 +1,29 @@
-module.exports = {
-    // 一行最多 100 字符
-    printWidth: 100,
-    // 使用 4 个空格缩进
-    tabWidth: 4,
-    // 不使用缩进符，而使用空格
-    useTabs: false,
-    // 行尾无分号
-    semi: false,
-    // 使用单引号
-    singleQuote: true,
-    // 对象的 key 仅在必要时用引号
-    quoteProps: 'as-needed',
-    // 末尾不需要逗号
-    trailingComma: 'none',
-    // 大括号内的首尾需要空格
-    bracketSpacing: true,
-    // 每个文件格式化的范围是文件的全部内容
-    rangeStart: 0,
-    rangeEnd: Infinity,
-    // 不需要写文件开头的 @prettier
-    requirePragma: false,
-    // 不需要自动在文件开头插入 @prettier
-    insertPragma: false,
-    // 使用默认的折行标准
-    proseWrap: 'preserve',
-    // 换行符使用 lf
-    endOfLine: 'lf'
-}
+module.exports = {
+    // 一行最多 100 字符
+    printWidth: 100,
+    // 使用 4 个空格缩进
+    tabWidth: 4,
+    // 不使用缩进符，而使用空格
+    useTabs: false,
+    // 行尾无分号
+    semi: false,
+    // 使用单引号
+    singleQuote: true,
+    // 对象的 key 仅在必要时用引号
+    quoteProps: 'as-needed',
+    // 末尾不需要逗号
+    trailingComma: 'none',
+    // 大括号内的首尾需要空格
+    bracketSpacing: true,
+    // 每个文件格式化的范围是文件的全部内容
+    rangeStart: 0,
+    rangeEnd: Infinity,
+    // 不需要写文件开头的 @prettier
+    requirePragma: false,
+    // 不需要自动在文件开头插入 @prettier
+    insertPragma: false,
+    // 使用默认的折行标准
+    proseWrap: 'preserve',
+    // 换行符使用 lf
+    endOfLine: 'lf'
+}

package/.vscode/launch.json

@@ -1,16 +1,16 @@
-{
-    // 使用 IntelliSense 了解相关属性。
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Debug: cloudbase logout",
-            "program": "${workspaceFolder}/bin/cloudbase.js",
-            "args": ["open"],
-            "outFiles": ["${workspaceFolder}/lib/**/*.js"]
-        }
-    ]
-}
+{
+    // 使用 IntelliSense 了解相关属性。
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug: cloudbase logout",
+            "program": "${workspaceFolder}/bin/cloudbase.js",
+            "args": ["open"],
+            "outFiles": ["${workspaceFolder}/lib/**/*.js"]
+        }
+    ]
+}

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/LICENSE

@@ -1,6 +1,6 @@
-ISC License (ISC)
-Copyright <2019> <Tencent Cloud Base>
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
+ISC License (ISC)
+Copyright <2019> <Tencent Cloud Base>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -1,35 +1,35 @@
-# CloudBase 命令行工具 ![npm (tag)](https://img.shields.io/npm/v/@cloudbase/cli)
-
-CloudBase CLI 是一个开源的命令行界面交互工具，用于帮助用户快速、方便的部署项目，管理云开发资源。
-
-## 安装 CloudBase CLI
-
-### npm
-
-```shell
-npm install -g @cloudbase/cli
-```
-
-### yarn
-
-```shell
-yarn global add @cloudbase/cli
-```
-
-安装完成后，你可以使用 `cloudbase -v` 验证是否安装成功，如果输出了类似下面的版本号，则表明 CloudBase CLI 被成功安装到您的计算机中。
-
-```text
-0.6.0
-```
-
-## CloudBase CLI 运行要求
-
-**Node.js 8.6.0+**
-
-## 文档
-
-请访问[教程与文档](https://docs.cloudbase.net/cli/intro.html)了解详细的使用方法。
-
-## 意见反馈
-
-您可以到 GitHub Repo 新建一个 [issue](https://github.com/TencentCloudBase/cloudbase-cli/issues) 反馈您在使用过程中遇到的问题或建议。
+# CloudBase 命令行工具 ![npm (tag)](https://img.shields.io/npm/v/@cloudbase/cli)
+
+CloudBase CLI 是一个开源的命令行界面交互工具，用于帮助用户快速、方便的部署项目，管理云开发资源。
+
+## 安装 CloudBase CLI
+
+### npm
+
+```shell
+npm install -g @cloudbase/cli
+```
+
+### yarn
+
+```shell
+yarn global add @cloudbase/cli
+```
+
+安装完成后，你可以使用 `cloudbase -v` 验证是否安装成功，如果输出了类似下面的版本号，则表明 CloudBase CLI 被成功安装到您的计算机中。
+
+```text
+0.6.0
+```
+
+## CloudBase CLI 运行要求
+
+**Node.js 8.6.0+**
+
+## 文档
+
+请访问[教程与文档](https://docs.cloudbase.net/cli/intro.html)了解详细的使用方法。
+
+## 意见反馈
+
+您可以到 GitHub Repo 新建一个 [issue](https://github.com/TencentCloudBase/cloudbase-cli/issues) 反馈您在使用过程中遇到的问题或建议。

package/bin/cloudbase.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const chalk = require('chalk')
-
-console.log(chalk.bold.yellowBright('\n', `Tip: cloudbase 命令可以简写为 tcb`), '\n')
-
-require('./tcb')
+const chalk = require('chalk')
+
+console.log(chalk.bold.yellowBright('\n', `Tip: cloudbase 命令可以简写为 tcb`), '\n')
+
+require('./tcb')

package/changelog.md

@@ -1,6 +1,6 @@
-# V1.0
-
-## 不兼容变更
-
-- 废弃编程式调用
-- 
+# V1.0
+
+## 不兼容变更
+
+- 废弃编程式调用
+- 

package/jest.config.js

@@ -1,17 +1,17 @@
-module.exports = {
-    roots: ['<rootDir>/test'],
-    globals: {
-        'ts-jest': {
-            tsConfig: 'tsconfig.test.json'
-        }
-    },
-    transform: {
-        '^.+\\.ts?$': 'ts-jest'
-    },
-    transformIgnorePatterns: ['node_modules'],
-    testEnvironment: 'node',
-    // https://github.com/facebook/jest/issues/5164
-    globalSetup: './test/global-setup-hook.js',
-    // globalTeardown: './test/global-teardown-hook.js',
-    coverageReporters: ['json', 'lcov', 'clover', 'text-summary']
-}
+module.exports = {
+    roots: ['<rootDir>/test'],
+    globals: {
+        'ts-jest': {
+            tsConfig: 'tsconfig.test.json'
+        }
+    },
+    transform: {
+        '^.+\\.ts?$': 'ts-jest'
+    },
+    transformIgnorePatterns: ['node_modules'],
+    testEnvironment: 'node',
+    // https://github.com/facebook/jest/issues/5164
+    globalSetup: './test/global-setup-hook.js',
+    // globalTeardown: './test/global-teardown-hook.js',
+    coverageReporters: ['json', 'lcov', 'clover', 'text-summary']
+}

package/lib/commands/account/login.js

@@ -35,24 +35,24 @@ const error_1 = require("../../error");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 function printSuggestion() {
-    const tips = `可使用下面命令继续操作：
-
-${chalk_1.default.gray('–')} 创建免费环境
-
-  ${chalk_1.default.cyan('$ tcb env create envName')}
-
-${chalk_1.default.gray('–')} 初始化云开发项目
-
-  ${chalk_1.default.cyan('$ tcb new')}
-
-${chalk_1.default.gray('–')} 部署云函数
-
-  ${chalk_1.default.cyan('$ tcb fn deploy')}
-
-${chalk_1.default.gray('–')} 查看命令使用介绍
-
-  ${chalk_1.default.cyan('$ tcb -h')}
-
+    const tips = `可使用下面命令继续操作：
+
+${chalk_1.default.gray('–')} 创建免费环境
+
+  ${chalk_1.default.cyan('$ tcb env create envName')}
+
+${chalk_1.default.gray('–')} 初始化云开发项目
+
+  ${chalk_1.default.cyan('$ tcb new')}
+
+${chalk_1.default.gray('–')} 部署云函数
+
+  ${chalk_1.default.cyan('$ tcb fn deploy')}
+
+${chalk_1.default.gray('–')} 查看命令使用介绍
+
+  ${chalk_1.default.cyan('$ tcb -h')}
+
 Tips：可以使用简写命令 tcb 代替 cloudbase`;
     console.log(tips);
 }

package/lib/commands/run/create.js

@@ -34,7 +34,7 @@ const ZoneMap = {
 let CreateRun = class CreateRun extends common_1.Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'create',
             options: [
                 {
@@ -67,6 +67,11 @@ let CreateRun = class CreateRun extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { name: _name = '', vpc: _vpc = '', repo: _repo = '', log: _log = '', remark: _remark = '', publicAccess: _publicAccess = '' } = options;
             let name;
             let remark;

package/lib/commands/run/delete.js

@@ -31,7 +31,7 @@ const utils_1 = require("../../utils");
 let DeleteRun = class DeleteRun extends common_1.Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'delete',
             options: [
                 {
@@ -48,6 +48,11 @@ let DeleteRun = class DeleteRun extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { serviceName = '' } = options;
             if (serviceName.length === 0) {
                 throw new error_1.CloudBaseError('必须输入服务名');

package/lib/commands/run/image/common.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageCommonOptions = void 0;
 const imageCommonOptions = (sub) => ({
-    cmd: 'run',
+    cmd: 'run:deprecated',
     childCmd: {
         cmd: 'image',
         desc: '云托管镜像管理'

package/lib/commands/run/image/delete.js

@@ -47,6 +47,11 @@ let DeleteImage = class DeleteImage extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { serviceName = '', imageTag = '' } = options;
             if (serviceName.length === 0 || imageTag.length === 0) {
                 throw new error_1.CloudBaseError('必须输入 serviceName 和 imageTag');

package/lib/commands/run/image/download.js

@@ -48,6 +48,11 @@ let DownLoadImage = class DownLoadImage extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { serviceName = '', imageTag = '' } = options;
             if (serviceName.length === 0 || imageTag.length === 0) {
                 throw new error_1.CloudBaseError('必须输入 serviceName 和 imageTag');

package/lib/commands/run/image/list.js

@@ -51,6 +51,11 @@ let ListImage = class ListImage extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { limit = 20, offset = 0, serviceName = '' } = options;
             limit = Number(limit);
             offset = Number(offset);

package/lib/commands/run/image/upload.js

@@ -76,6 +76,11 @@ let UploadImage = class UploadImage extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             const { serviceName = '', imageId = '', imageTag = '' } = options;
             if (serviceName.length === 0 || imageId.length === 0 || imageTag.length === 0) {
                 throw new error_1.CloudBaseError('必须输入 serviceName 和 imageId 和 imageTag');

package/lib/commands/run/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./version"), exports);
 __exportStar(require("./delete"), exports);
 __exportStar(require("./image"), exports);
 __exportStar(require("./standalonegateway"), exports);
+__exportStar(require("./service"), exports);

package/lib/commands/run/list.js

@@ -27,13 +27,14 @@ const error_1 = require("../../error");
 const run_1 = require("../../run");
 const utils_1 = require("../../utils");
 const decorators_1 = require("../../decorators");
+const utils_2 = require("../../utils");
 const StatusMap = {
     succ: '正常'
 };
 let ListRun = class ListRun extends common_1.Command {
     get options() {
         return {
-            cmd: 'run',
+            cmd: 'run:deprecated',
             childCmd: 'list',
             options: [
                 {
@@ -54,6 +55,11 @@ let ListRun = class ListRun extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_2.checkTcbrEnv)(options.envId, false);
+            if (envCheckType !== 0) {
+                (0, utils_2.logEnvCheck)(envId, envCheckType);
+                return;
+            }
             let { limit = 20, offset = 0 } = options;
             limit = Number(limit);
             offset = Number(offset);

package/lib/commands/run/service/config.js

@@ -0,0 +1,112 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigServiceTcbr = void 0;
+const common_1 = require("../../common");
+const decorators_1 = require("../../../decorators");
+const run_1 = require("../../../run");
+const utils_1 = require("../../../utils");
+let ConfigServiceTcbr = class ConfigServiceTcbr extends common_1.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: '指定环境和服务，更新服务的基础配置'
+        };
+    }
+    execute(options, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, true);
+            if (envCheckType !== 0) {
+                (0, utils_1.logEnvCheck)(options.envId, envCheckType);
+                return;
+            }
+            const newServiceConfig = yield (0, run_1.tcbrServiceConfigOptions)(options);
+            const configRes = yield (0, run_1.updateCloudRunServerConfig)({
+                envId: options.envId,
+                serviceName: options.serviceName,
+                ServerBaseConfig: newServiceConfig
+            });
+            if (options.json) {
+                console.log(JSON.stringify(configRes, null, 2));
+            }
+            else {
+                log.success('更新配置信息成功');
+            }
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.ArgsOptions)()),
+    __param(1, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], ConfigServiceTcbr.prototype, "execute", null);
+ConfigServiceTcbr = __decorate([
+    (0, common_1.ICommand)()
+], ConfigServiceTcbr);
+exports.ConfigServiceTcbr = ConfigServiceTcbr;