@cloudbase/cli 1.10.0 → 1.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "1.10.0",
+    "version": "1.11.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -27,7 +27,7 @@
         "@cloudbase/cloud-api": "^0.4.0",
         "@cloudbase/framework-core": "^1.6.1",
         "@cloudbase/lowcode-cli": "^0.12.2",
-        "@cloudbase/manager-node": "3.12.0",
+        "@cloudbase/manager-node": "3.11.1-beta",
         "@cloudbase/toolbox": "^0.7.2",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",

package/src/commands/functions/index.ts

@@ -11,6 +11,3 @@ export * from './trigger-create'
 export * from './trigger-delete'
 export * from './code-update'
 export * from './code-download'
-export * from './version'
-export * from './concurrency'
-export * from './alias'

package/src/commands/functions/list.ts

@@ -3,7 +3,14 @@ import { CloudBaseError } from '../../error'
 import { listFunction } from '../../function'
 import { printHorizontalTable, loadingFactory } from '../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { StatusMap } from '../../constant'
+
+const StatusMap = {
+    Active: '部署完成',
+    Creating: '创建中',
+    CreateFailed: '创建失败',
+    Updating: '更新中',
+    UpdateFailed: '更新失败'
+}
 
 @ICommand()
 export class ListFunction extends Command {

package/src/constant.ts

@@ -68,12 +68,6 @@ export const ALL_COMMANDS = [
     'fn trigger create',
     'fn trigger delete',
     'fn invoke',
-    'fn publish-version',
-    'fn list-function-versions',
-    'fn put-provisioned-concurrency',
-    'fn get-provisioned-concurrency',
-    'fn delete-provisioned-concurrency',
-    'fn config-route',
     'functions run',
     'storage upload',
     'storage download',
@@ -100,21 +94,3 @@ export const ALL_COMMANDS = [
     'run standalonegateway turn on',
     'run standalonegateway turn off',
 ]
-
-export const StatusMap = {
-    Active: '部署完成',
-    Creating: '创建中',
-    CreateFailed: '创建失败',
-    Updating: '更新中',
-    UpdateFailed: '更新失败',
-    Publishing: '函数版本发布中',
-    PublishFailed: '函数版本发布失败',
-    Deleting: '函数删除中',
-    DeleteFailed: '函数删除失败'
-}
-
-export const ConcurrencyTaskStatus = {
-    Done: '已完成',
-    InProgress: '进行中',
-    Failed: '失败'
-}

package/src/function/index.ts

@@ -5,7 +5,4 @@ export * from './base'
 export * from './delete'
 export * from './update'
 export * from './layer'
-export * from './vpc'
-export * from './version'
-export * from './concurrency'
-export * from './alias'
+export * from './vpc'

package/src/types.ts

@@ -435,99 +435,4 @@ export interface ITurnOffStandaloneGateway {
 export interface IDestroyStandaloneGateway {
     envId: string,
     gatewayName: string
-}
-
-export interface IPublishVersionParams {
-    envId: string
-    functionName: string
-    description?: string
-}
-export interface IListFunctionVersionParams {
-    envId: string
-    functionName: string
-    offset?: number
-    limit?: number
-    order?: string
-    orderBy?: string
-}
-
-export interface IFunctionVersion {
-    Version: string
-    Description: string
-    AddTime: string
-    ModTime: string
-    Status: string //
-}
-
-export interface IFunctionVersionsRes {
-    FunctionVersion: string[]
-    Versions: IFunctionVersion[]
-    TotalCount: number
-}
-
-export interface ISetProvisionedConcurrencyConfig {
-    envId: string
-    functionName: string
-    qualifier: string
-    versionProvisionedConcurrencyNum: number
-}
-
-export interface IGetProvisionedConcurrencyConfig {
-    functionName: string
-    qualifier?: string
-    envId: string
-}
-
-export interface IGetProvisionedConcurrencyRes {
-    UnallocatedConcurrencyNum: number
-    Allocated: IVersionProvisionedConcurrencyInfo[]
-}
-
-export interface IVersionProvisionedConcurrencyInfo {
-    AllocatedProvisionedConcurrencyNum: number // 设置的预置并发数。
-    AvailableProvisionedConcurrencyNum: number // 当前已完成预置的并发数。
-    Status: string // 预置任务状态，Done表示已完成，InProgress表示进行中，Failed表示部分或全部失败。
-    StatusReason: string // 对预置任务状态Status的说明。
-    Qualifier: string // 版本号
-}
-
-export interface IUpdateFunctionAliasConfig {
-    envId: string
-    functionName: string // 函数名
-    name: string // 函数别名 如$DEFAULT
-    functionVersion: string // 函数版本
-    description?: string // 别名描述
-    routingConfig?: IRoutingConfig
-}
-
-export interface IRoutingConfig {
-    AdditionalVersionWeights?: IVersionWeight[]
-    AddtionVersionMatchs?: IVersionMatch[]
-}
-
-export interface IVersionMatch {
-    Version: string // 函数版本名称
-    Key: string // 匹配规则的key，调用时通过传key来匹配规则路由到指定版本 header方式：key填写"invoke.headers.User"，并在 invoke 调用函数时传参 RoutingKey：{"User":"value"}规则匹配调用
-    Method: string // 匹配方式。取值范围：range：范围匹配 exact：字符串精确匹配
-    Expression: string //
-}
-
-export interface IVersionWeight {
-    Version: string
-    Weight: number
-}
-
-export interface IGetFunctionAlias {
-    envId: string
-    functionName: string // 函数名称
-    name: string // 别名
-}
-
-export interface IGetFunctionAliasRes {
-    FunctionVersion: string
-    Name: string
-    RoutingConfig: IRoutingConfig
-    Description: string
-    AddTime: string
-    ModTime: string
 }

package/lib/auth/index.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./login"), exports);
-__exportStar(require("./logout"), exports);

package/lib/auth/login.js

@@ -1,91 +0,0 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkLogin = exports.login = exports.loginWithKey = exports.loginByWebAuth = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../utils");
-const decorators_1 = require("../decorators");
-const env_1 = require("../env");
-const log = new decorators_1.Logger();
-const LoginRes = {
-    SUCCESS: {
-        code: 'SUCCESS',
-        msg: '登录成功！'
-    },
-    INVALID_TOKEN: {
-        code: 'INVALID_TOKEN',
-        msg: '无效的身份信息！'
-    },
-    CHECK_LOGIN_FAILED: {
-        code: 'CHECK_LOGIN_FAILED',
-        msg: '检查登录态失败'
-    },
-    INVALID_PARAM(msg) {
-        return {
-            code: 'INVALID_PARAM',
-            msg: `参数无效：${msg}`
-        };
-    }
-};
-function loginByWebAuth() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const credential = yield utils_1.authSupevisor.loginByWebAuth();
-        if (lodash_1.default.isEmpty(credential)) {
-            return LoginRes.INVALID_TOKEN;
-        }
-        return Object.assign({ credential }, LoginRes.SUCCESS);
-    });
-}
-exports.loginByWebAuth = loginByWebAuth;
-function loginWithKey(secretId, secretKey, token) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!secretId || !secretKey) {
-            return LoginRes.INVALID_PARAM('SecretID 或 SecretKey 不能为空');
-        }
-        const credential = yield utils_1.authSupevisor.loginByApiSecret(secretId, secretKey, token);
-        if (lodash_1.default.isEmpty(credential)) {
-            return LoginRes.INVALID_TOKEN;
-        }
-        return LoginRes.SUCCESS;
-    });
-}
-exports.loginWithKey = loginWithKey;
-function login(options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { secretId, secretKey, key, token } = options;
-        return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth();
-    });
-}
-exports.login = login;
-function checkLogin() {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const credential = yield (0, utils_1.checkAndGetCredential)();
-        if (lodash_1.default.isEmpty(credential)) {
-            log.info('你还没有登录，请在控制台中授权登录');
-            const res = yield (0, utils_1.execWithLoading)(() => login(), {
-                startTip: '获取授权中...',
-                successTip: '授权登录成功！'
-            });
-            const envId = (_a = res === null || res === void 0 ? void 0 : res.credential) === null || _a === void 0 ? void 0 : _a.envId;
-            if (envId) {
-                const env = yield (0, env_1.getEnvInfo)(envId);
-                if (env.Status === "UNAVAILABLE") {
-                    yield (0, utils_1.checkEnvAvaliable)(envId);
-                }
-            }
-        }
-    });
-}
-exports.checkLogin = checkLogin;

package/lib/auth/logout.js

@@ -1,20 +0,0 @@
-"use strict";
-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.logout = void 0;
-const utils_1 = require("../utils");
-function logout() {
-    return __awaiter(this, void 0, void 0, function* () {
-        process.emit('logout');
-        yield utils_1.authSupevisor.logout();
-    });
-}
-exports.logout = logout;

package/lib/commands/account/index.js

@@ -1,14 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./login"), exports);
-__exportStar(require("./logout"), exports);

package/lib/commands/account/login.js

@@ -1,209 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoginCommand = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const chalk_1 = __importDefault(require("chalk"));
-const inquirer_1 = __importDefault(require("inquirer"));
-const common_1 = require("../common");
-const auth_1 = require("../../auth");
-const env_1 = require("../../env");
-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')}
-
-Tips：可以使用简写命令 tcb 代替 cloudbase`;
-    console.log(tips);
-}
-function askForCollectDataConfirm() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const agree = yield utils_1.usageStore.get('agreeCollect');
-        if (agree)
-            return;
-        const { confirm } = yield inquirer_1.default.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message: '是否同意 Cloudbase CLI 收集您的使用数据以改进产品？',
-            default: true
-        });
-        if (confirm) {
-            yield utils_1.usageStore.set('agreeCollect', true);
-        }
-        yield (0, utils_1.collectAgree)(confirm);
-    });
-}
-let LoginCommand = class LoginCommand extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'login',
-            options: [
-                {
-                    flags: '-k, --key',
-                    desc: '使用永久密钥登录'
-                },
-                {
-                    flags: '--apiKeyId <apiKeyId>',
-                    desc: '腾讯云 API 秘钥 Id'
-                },
-                {
-                    flags: '--apiKey <apiKey>',
-                    desc: '腾讯云 API 秘钥 Key'
-                },
-                {
-                    flags: '--token [token]',
-                    desc: '腾讯云 API 临时秘钥 Token'
-                }
-            ],
-            desc: '登录腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        };
-    }
-    execute(options, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.verbose(options);
-            const { apiKeyId, apiKey, token } = options;
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start('检验登录状态');
-            const credential = yield (0, utils_1.checkAndGetCredential)();
-            if (!lodash_1.default.isEmpty(credential)) {
-                loading.succeed('您已登录，无需再次登录！');
-                return;
-            }
-            else {
-                loading.stop();
-            }
-            if (apiKey && apiKeyId) {
-                loading.start('正在验证腾讯云密钥...');
-                const res = yield (0, auth_1.login)({
-                    token,
-                    key: true,
-                    secretKey: apiKey,
-                    secretId: apiKeyId
-                });
-                if (res.code === 'SUCCESS') {
-                    loading.succeed('登录成功！');
-                    printSuggestion();
-                }
-                else {
-                    loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！');
-                    return process.exit(1);
-                }
-            }
-            else if (options.key) {
-                const clickableLink = (0, utils_1.genClickableLink)('https://console.cloud.tencent.com/cam/capi');
-                console.log(`您可以访问 ${clickableLink} 获取 API 秘钥`);
-                const { secretId } = yield inquirer_1.default.prompt({
-                    type: 'input',
-                    name: 'secretId',
-                    message: '请输入腾讯云 SecretID：'
-                });
-                const { secretKey } = yield inquirer_1.default.prompt({
-                    type: 'input',
-                    name: 'secretKey',
-                    message: '请输入腾讯云 SecretKey：'
-                });
-                if (!secretId || !secretKey) {
-                    throw new error_1.CloudBaseError('SecretID 或 SecretKey 不能为空');
-                }
-                loading.start('正在验证腾讯云密钥...');
-                const res = yield (0, auth_1.login)({
-                    key: true,
-                    secretId,
-                    secretKey
-                });
-                if (res.code === 'SUCCESS') {
-                    loading.succeed('登录成功！');
-                    yield askForCollectDataConfirm();
-                    printSuggestion();
-                }
-                else {
-                    loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！');
-                    return process.exit(1);
-                }
-            }
-            else {
-                loading.start('获取授权中...');
-                const res = yield (0, auth_1.login)();
-                if (res.code === 'SUCCESS') {
-                    loading.succeed('登录成功！');
-                    yield askForCollectDataConfirm();
-                    printSuggestion();
-                }
-                else {
-                    loading.fail(res.msg);
-                    console.log('Web 授权登录失败，秘钥校验失败！');
-                    return process.exit(1);
-                }
-            }
-            try {
-                const envs = yield (0, env_1.listEnvs)();
-                if (!envs.length) {
-                    log.warn('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境');
-                }
-            }
-            catch (e) {
-                if (e.code === 'ResourceNotFound.UserNotExists') {
-                    log.error('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境！');
-                }
-                else {
-                    console.error(e);
-                    throw e;
-                }
-            }
-        });
-    }
-};
-__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)
-], LoginCommand.prototype, "execute", null);
-LoginCommand = __decorate([
-    (0, common_1.ICommand)()
-], LoginCommand);
-exports.LoginCommand = LoginCommand;

package/lib/commands/account/logout.js

@@ -1,55 +0,0 @@
-"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.LogoutCommand = void 0;
-const common_1 = require("../common");
-const auth_1 = require("../../auth");
-const decorators_1 = require("../../decorators");
-let LogoutCommand = class LogoutCommand extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'logout',
-            options: [],
-            desc: '登出腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        };
-    }
-    execute(log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield (0, auth_1.logout)();
-            log.success('注销登录成功！');
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.Log)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [decorators_1.Logger]),
-    __metadata("design:returntype", Promise)
-], LogoutCommand.prototype, "execute", null);
-LogoutCommand = __decorate([
-    (0, common_1.ICommand)()
-], LogoutCommand);
-exports.LogoutCommand = LogoutCommand;