@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/function/trigger.js

@@ -1,13 +1,4 @@
 "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.batchDeleteTriggers = exports.deleteFunctionTrigger = exports.batchCreateTriggers = exports.createFunctionTriggers = void 0;
 const utils_1 = require("../utils");
@@ -15,92 +6,84 @@ const logger_1 = require("../logger");
 const error_1 = require("../error");
 const i18n_1 = require("../i18n");
 const scfService = utils_1.CloudApiService.getInstance('scf');
-function createFunctionTriggers(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionName, triggers = [], envId } = options;
-        const parsedTriggers = triggers.map(item => {
-            if (item.type !== 'timer') {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('不支持的触发器类型 [{{type}}]，目前仅支持定时触发器（timer）！', { type: item.type }));
-            }
-            return {
-                TriggerName: item.name,
-                Type: item.type,
-                TriggerDesc: item.config
-            };
+async function createFunctionTriggers(options) {
+    const { functionName, triggers = [], envId } = options;
+    const parsedTriggers = triggers.map(item => {
+        if (item.type !== 'timer') {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('不支持的触发器类型 [{{type}}]，目前仅支持定时触发器（timer）！', { type: item.type }));
+        }
+        return {
+            TriggerName: item.name,
+            Type: item.type,
+            TriggerDesc: item.config
+        };
+    });
+    try {
+        await scfService.request('BatchCreateTrigger', {
+            FunctionName: functionName,
+            Namespace: envId,
+            Triggers: JSON.stringify(parsedTriggers),
+            Count: parsedTriggers.length
         });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 创建触发器失败：{{error}}', { name: functionName, error: e.message }), {
+            action: e.action,
+            code: e.code
+        });
+    }
+}
+exports.createFunctionTriggers = createFunctionTriggers;
+async function batchCreateTriggers(options) {
+    const { functions, envId } = options;
+    const promises = functions.map(func => (async () => {
         try {
-            yield scfService.request('BatchCreateTrigger', {
-                FunctionName: functionName,
-                Namespace: envId,
-                Triggers: JSON.stringify(parsedTriggers),
-                Count: parsedTriggers.length
+            await createFunctionTriggers({
+                functionName: func.name,
+                triggers: func.triggers,
+                envId
             });
+            (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 创建云函数触发器成功！', { name: func.name }));
         }
         catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 创建触发器失败：{{error}}', { name: functionName, error: e.message }), {
-                action: e.action,
-                code: e.code
-            });
+            throw new error_1.CloudBaseError(e.message);
         }
-    });
+    })());
+    await Promise.all(promises);
 }
-exports.createFunctionTriggers = createFunctionTriggers;
-function batchCreateTriggers(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functions, envId } = options;
-        const promises = functions.map(func => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield createFunctionTriggers({
+exports.batchCreateTriggers = batchCreateTriggers;
+async function deleteFunctionTrigger(options) {
+    const { functionName, triggerName, envId } = options;
+    try {
+        await scfService.request('DeleteTrigger', {
+            FunctionName: functionName,
+            Namespace: envId,
+            TriggerName: triggerName,
+            Type: 'timer'
+        });
+        (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 删除云函数触发器 {{trigger}} 成功！', { name: functionName, trigger: triggerName }));
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 删除触发器失败：{{error}}', { name: functionName, error: e.message }));
+    }
+}
+exports.deleteFunctionTrigger = deleteFunctionTrigger;
+async function batchDeleteTriggers(options) {
+    const { functions, envId } = options;
+    const promises = functions.map(func => (async () => {
+        try {
+            func.triggers.forEach(async (trigger) => {
+                await deleteFunctionTrigger({
                     functionName: func.name,
-                    triggers: func.triggers,
+                    triggerName: trigger.name,
                     envId
                 });
-                (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 创建云函数触发器成功！', { name: func.name }));
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError(e.message);
-            }
-        }))());
-        yield Promise.all(promises);
-    });
-}
-exports.batchCreateTriggers = batchCreateTriggers;
-function deleteFunctionTrigger(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionName, triggerName, envId } = options;
-        try {
-            yield scfService.request('DeleteTrigger', {
-                FunctionName: functionName,
-                Namespace: envId,
-                TriggerName: triggerName,
-                Type: 'timer'
             });
-            (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 删除云函数触发器 {{trigger}} 成功！', { name: functionName, trigger: triggerName }));
         }
         catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 删除触发器失败：{{error}}', { name: functionName, error: e.message }));
+            throw new error_1.CloudBaseError(e.message);
         }
-    });
-}
-exports.deleteFunctionTrigger = deleteFunctionTrigger;
-function batchDeleteTriggers(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functions, envId } = options;
-        const promises = functions.map(func => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                func.triggers.forEach((trigger) => __awaiter(this, void 0, void 0, function* () {
-                    yield deleteFunctionTrigger({
-                        functionName: func.name,
-                        triggerName: trigger.name,
-                        envId
-                    });
-                }));
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError(e.message);
-            }
-        }))());
-        yield Promise.all(promises);
-    });
+    })());
+    await Promise.all(promises);
 }
 exports.batchDeleteTriggers = batchDeleteTriggers;

package/lib/function/update.js

@@ -1,41 +1,33 @@
 "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.updateFunctionCode = void 0;
 const error_1 = require("../error");
 const base_1 = require("./base");
 const i18n_1 = require("../i18n");
-function updateFunctionCode(options) {
+async function updateFunctionCode(options) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionRootPath = '', envId, base64Code = '', codeSecret } = options;
-        const func = Object.assign(Object.assign({}, (_a = options === null || options === void 0 ? void 0 : options.func) === null || _a === void 0 ? void 0 : _a.config), options.func);
-        const funcName = func.name;
-        if (codeSecret && !/^[A-Za-z0-9+=/]{1,160}$/.test(codeSecret)) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('CodeSecret 格式错误，格式为 1-160 位大小字母，数字+=/'));
-        }
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            yield scfService.updateFunctionCode({
-                func,
-                functionRootPath,
-                base64Code,
-                codeSecret
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数代码更新失败： {{error}}', { name: funcName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+    const { functionRootPath = '', envId, base64Code = '', codeSecret } = options;
+    const func = {
+        ...(_a = options === null || options === void 0 ? void 0 : options.func) === null || _a === void 0 ? void 0 : _a.config,
+        ...options.func
+    };
+    const funcName = func.name;
+    if (codeSecret && !/^[A-Za-z0-9+=/]{1,160}$/.test(codeSecret)) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('CodeSecret 格式错误，格式为 1-160 位大小字母，数字+=/'));
+    }
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        await scfService.updateFunctionCode({
+            func,
+            functionRootPath,
+            base64Code,
+            codeSecret
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数代码更新失败： {{error}}', { name: funcName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.updateFunctionCode = updateFunctionCode;

package/lib/function/version.js

@@ -1,52 +1,39 @@
 "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.listFunctionVersions = exports.publishVersion = void 0;
 const error_1 = require("../error");
 const base_1 = require("./base");
 const i18n_1 = require("../i18n");
-function publishVersion(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, description = '' } = options;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            yield scfService.publishVersion({
-                functionName,
-                description
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数发布新版本失败： {{error}}', { name: functionName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+async function publishVersion(options) {
+    const { envId, functionName, description = '' } = options;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        await scfService.publishVersion({
+            functionName,
+            description
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数发布新版本失败： {{error}}', { name: functionName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.publishVersion = publishVersion;
-function listFunctionVersions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, offset = 0, limit = 20 } = options;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            return scfService.listVersionByFunction({
-                functionName,
-                offset,
-                limit
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 查看函数版本列表失败： {{error}}', { name: functionName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+async function listFunctionVersions(options) {
+    const { envId, functionName, offset = 0, limit = 20 } = options;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        return scfService.listVersionByFunction({
+            functionName,
+            offset,
+            limit
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 查看函数版本列表失败： {{error}}', { name: functionName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.listFunctionVersions = listFunctionVersions;

package/lib/function/vpc.js

@@ -1,35 +1,22 @@
 "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.getSubnets = exports.getVpcs = void 0;
 const utils_1 = require("../utils");
 const vpcService = utils_1.CloudApiService.getInstance('vpc');
-function getVpcs() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { VpcSet } = yield vpcService.request('DescribeVpcs');
-        return VpcSet;
-    });
+async function getVpcs() {
+    const { VpcSet } = await vpcService.request('DescribeVpcs');
+    return VpcSet;
 }
 exports.getVpcs = getVpcs;
-function getSubnets(vpcId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { SubnetSet } = yield vpcService.request('DescribeSubnets', {
-            Filters: [
-                {
-                    Name: 'vpc-id',
-                    Values: [vpcId]
-                }
-            ]
-        });
-        return SubnetSet;
+async function getSubnets(vpcId) {
+    const { SubnetSet } = await vpcService.request('DescribeSubnets', {
+        Filters: [
+            {
+                Name: 'vpc-id',
+                Values: [vpcId]
+            }
+        ]
     });
+    return SubnetSet;
 }
 exports.getSubnets = getSubnets;

package/lib/gateway/index.js

@@ -1,136 +1,109 @@
 "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.unbindGatewayDomain = exports.queryGatewayDomain = exports.bindGatewayDomain = exports.deleteGateway = exports.queryGateway = exports.createGateway = exports.getHttpServicePrivilege = exports.switchHttpServiceAuth = exports.switchHttpService = void 0;
 const utils_1 = require("../utils");
 const tcbService = utils_1.CloudApiService.getInstance('tcb');
-function switchHttpService(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, enable } = options;
-        const value = enable ? 'true' : 'false';
-        const res = yield tcbService.request('ModifyCloudBaseGWPrivilege', {
-            ServiceId: envId,
-            EnableService: enable,
-            Options: [
-                {
-                    Key: 'serviceswitch',
-                    Value: value
-                }
-            ]
-        });
-        return res;
+async function switchHttpService(options) {
+    const { envId, enable } = options;
+    const value = enable ? 'true' : 'false';
+    const res = await tcbService.request('ModifyCloudBaseGWPrivilege', {
+        ServiceId: envId,
+        EnableService: enable,
+        Options: [
+            {
+                Key: 'serviceswitch',
+                Value: value
+            }
+        ]
     });
+    return res;
 }
 exports.switchHttpService = switchHttpService;
-function switchHttpServiceAuth(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, enable } = options;
-        const value = enable ? 'true' : 'false';
-        const res = yield tcbService.request('ModifyCloudBaseGWPrivilege', {
-            ServiceId: envId,
-            EnableService: enable,
-            Options: [
-                {
-                    Key: 'authswitch',
-                    Value: value
-                }
-            ]
-        });
-        return res;
+async function switchHttpServiceAuth(options) {
+    const { envId, enable } = options;
+    const value = enable ? 'true' : 'false';
+    const res = await tcbService.request('ModifyCloudBaseGWPrivilege', {
+        ServiceId: envId,
+        EnableService: enable,
+        Options: [
+            {
+                Key: 'authswitch',
+                Value: value
+            }
+        ]
     });
+    return res;
 }
 exports.switchHttpServiceAuth = switchHttpServiceAuth;
-function getHttpServicePrivilege(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId } = options;
-        return tcbService.request('DescribeCloudBaseGWPrivilege', {
-            ServiceId: envId
-        });
+async function getHttpServicePrivilege(options) {
+    const { envId } = options;
+    return tcbService.request('DescribeCloudBaseGWPrivilege', {
+        ServiceId: envId
     });
 }
 exports.getHttpServicePrivilege = getHttpServicePrivilege;
-function createGateway(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, path, name } = options;
-        const res = yield tcbService.request('CreateCloudBaseGWAPI', {
-            Type: 1,
-            Path: path,
-            Name: name,
-            ServiceId: envId,
-            EnableUnion: true
-        });
-        return res;
+async function createGateway(options) {
+    const { envId, path, name } = options;
+    const res = await tcbService.request('CreateCloudBaseGWAPI', {
+        Type: 1,
+        Path: path,
+        Name: name,
+        ServiceId: envId,
+        EnableUnion: true
     });
+    return res;
 }
 exports.createGateway = createGateway;
-function queryGateway(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, domain, path, gatewayId, name } = options;
-        const res = yield tcbService.request('DescribeCloudBaseGWAPI', {
-            ServiceId: envId,
-            Domain: domain,
-            Path: path,
-            APIId: gatewayId,
-            Name: name,
-            EnableUnion: true
-        });
-        return res;
+async function queryGateway(options) {
+    const { envId, domain, path, gatewayId, name } = options;
+    const res = await tcbService.request('DescribeCloudBaseGWAPI', {
+        ServiceId: envId,
+        Domain: domain,
+        Path: path,
+        APIId: gatewayId,
+        Name: name,
+        EnableUnion: true
     });
+    return res;
 }
 exports.queryGateway = queryGateway;
-function deleteGateway(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, path, name, gatewayId } = options;
-        const res = yield tcbService.request('DeleteCloudBaseGWAPI', {
-            ServiceId: envId,
-            Path: path,
-            APIId: gatewayId,
-            Type: 1,
-            Name: name
-        });
-        return res;
+async function deleteGateway(options) {
+    const { envId, path, name, gatewayId } = options;
+    const res = await tcbService.request('DeleteCloudBaseGWAPI', {
+        ServiceId: envId,
+        Path: path,
+        APIId: gatewayId,
+        Type: 1,
+        Name: name
     });
+    return res;
 }
 exports.deleteGateway = deleteGateway;
-function bindGatewayDomain(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, domain } = options;
-        const res = yield tcbService.request('BindCloudBaseAccessDomain', {
-            ServiceId: envId,
-            Domain: domain
-        });
-        return res;
+async function bindGatewayDomain(options) {
+    const { envId, domain } = options;
+    const res = await tcbService.request('BindCloudBaseAccessDomain', {
+        ServiceId: envId,
+        Domain: domain
     });
+    return res;
 }
 exports.bindGatewayDomain = bindGatewayDomain;
-function queryGatewayDomain(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, domain } = options;
-        const res = yield tcbService.request('DescribeCloudBaseGWService', {
-            ServiceId: envId,
-            Domain: domain,
-            EnableUnion: true
-        });
-        return res;
+async function queryGatewayDomain(options) {
+    const { envId, domain } = options;
+    const res = await tcbService.request('DescribeCloudBaseGWService', {
+        ServiceId: envId,
+        Domain: domain,
+        EnableUnion: true
     });
+    return res;
 }
 exports.queryGatewayDomain = queryGatewayDomain;
-function unbindGatewayDomain(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, domain } = options;
-        const res = yield tcbService.request('DeleteCloudBaseGWDomain', {
-            ServiceId: envId,
-            Domain: domain
-        });
-        return res;
+async function unbindGatewayDomain(options) {
+    const { envId, domain } = options;
+    const res = await tcbService.request('DeleteCloudBaseGWDomain', {
+        ServiceId: envId,
+        Domain: domain
     });
+    return res;
 }
 exports.unbindGatewayDomain = unbindGatewayDomain;