From 6ef4cf2fb30b6ef1b231c3cd67b4a4e6ef0024e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=83=E9=A3=8E?= Date: Wed, 16 Jun 2021 17:39:31 +0800 Subject: [PATCH] feat: upgrade version from 0.0.28 to 0.0.29 --- dist/index.js | 108 +++++++++++------------ dist/lib/component/stdout-formatter.d.ts | 4 + dist/lib/component/stdout-formatter.js | 61 +++++++++++++ dist/lib/fc/custom-domain.js | 10 ++- dist/lib/fc/fc-deploy.js | 34 +++---- dist/lib/fc/function.d.ts | 4 +- dist/lib/fc/function.js | 65 ++++++++------ dist/lib/fc/service.js | 44 ++++++--- dist/lib/fc/trigger.js | 5 +- dist/lib/resource/acr.js | 10 ++- dist/lib/resource/ram.d.ts | 1 + dist/lib/resource/ram.js | 14 +-- dist/lib/utils/utils.d.ts | 1 + dist/lib/utils/utils.js | 8 +- package.json | 2 +- publish.yaml | 2 +- 16 files changed, 241 insertions(+), 132 deletions(-) create mode 100644 dist/lib/component/stdout-formatter.d.ts create mode 100644 dist/lib/component/stdout-formatter.js diff --git a/dist/index.js b/dist/index.js index 5cece36..37b4cf5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -63,6 +63,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); var core = __importStar(require("@serverless-devs/core")); var service_1 = require("./lib/fc/service"); @@ -79,12 +82,14 @@ var path = __importStar(require("path")); var utils_1 = require("./lib/utils/utils"); var retry_1 = require("./lib/retry"); var error_1 = require("./lib/error"); +var stdout_formatter_1 = __importDefault(require("./lib/component/stdout-formatter")); var FcDeployComponent = /** @class */ (function () { function FcDeployComponent() { } FcDeployComponent.prototype.report = function (componentName, command, accountID, access) { return __awaiter(this, void 0, void 0, function () { var uid, credentials; + var _this = this; return __generator(this, function (_a) { switch (_a.label) { case 0: @@ -96,15 +101,12 @@ var FcDeployComponent = /** @class */ (function () { uid = credentials.AccountID; _a.label = 2; case 2: - try { - core.reportComponent(componentName, { - command: command, - uid: uid, - }); - } - catch (e) { - this.logger.warn("Component " + componentName + " report error: " + e.message); - } + core.reportComponent(componentName, { + command: command, + uid: uid, + }).catch(function (e) { + _this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn('component report', "component name: " + componentName + ", method: " + command, e.message)); + }); return [2 /*return*/]; } }); @@ -143,20 +145,22 @@ var FcDeployComponent = /** @class */ (function () { FcDeployComponent.prototype.handlerInputs = function (inputs) { var _a, _b; return __awaiter(this, void 0, void 0, function () { - var project, access, properties, appName, credentials, args, curPath, projectName, region, parsedArgs, argsData, serverlessProfile, serviceConf, functionConf, triggerConfs, customDomainConfs, fcFunction, fcTriggers, fcCustomDomains, fcService, _i, triggerConfs_1, triggerConf, fcTrigger, _c, customDomainConfs_1, customDomainConf, fcCustomDomain; + var project, access, credentials, properties, appName, args, curPath, projectName, region, parsedArgs, argsData, serverlessProfile, serviceConf, functionConf, triggerConfs, customDomainConfs, fcFunction, fcTriggers, fcCustomDomains, fcService, _i, triggerConfs_1, triggerConf, fcTrigger, _c, customDomainConfs_1, customDomainConf, fcCustomDomain; return __generator(this, function (_d) { switch (_d.label) { - case 0: - project = inputs === null || inputs === void 0 ? void 0 : inputs.project; - access = project === null || project === void 0 ? void 0 : project.access; - return [4 /*yield*/, this.report('fc-deploy', inputs === null || inputs === void 0 ? void 0 : inputs.command, null, (_a = inputs === null || inputs === void 0 ? void 0 : inputs.project) === null || _a === void 0 ? void 0 : _a.access)]; + case 0: return [4 /*yield*/, stdout_formatter_1.default.initStdout()]; case 1: _d.sent(); - properties = inputs === null || inputs === void 0 ? void 0 : inputs.props; - appName = inputs === null || inputs === void 0 ? void 0 : inputs.appName; + project = inputs === null || inputs === void 0 ? void 0 : inputs.project; + access = project === null || project === void 0 ? void 0 : project.access; return [4 /*yield*/, core.getCredential(access)]; case 2: credentials = _d.sent(); + return [4 /*yield*/, this.report('fc-deploy', inputs === null || inputs === void 0 ? void 0 : inputs.command, credentials.AccountID, (_a = inputs === null || inputs === void 0 ? void 0 : inputs.project) === null || _a === void 0 ? void 0 : _a.access)]; + case 3: + _d.sent(); + properties = inputs === null || inputs === void 0 ? void 0 : inputs.props; + appName = inputs === null || inputs === void 0 ? void 0 : inputs.appName; args = inputs === null || inputs === void 0 ? void 0 : inputs.args.replace(/(^\s*)|(\s*$)/g, ''); curPath = (_b = inputs === null || inputs === void 0 ? void 0 : inputs.path) === null || _b === void 0 ? void 0 : _b.configPath; projectName = project === null || project === void 0 ? void 0 : project.projectName; @@ -176,10 +180,10 @@ var FcDeployComponent = /** @class */ (function () { isHelp: true, }]; } - this.logger.info("Using region: " + region); - this.logger.info("Using access alias: " + access); - this.logger.info("Using accountId: " + profile_1.mark(String(credentials.AccountID))); - this.logger.info("Using accessKeyId: " + profile_1.mark(credentials.AccessKeyID)); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('region', region)); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('access alias', access)); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('accountID', profile_1.mark(String(credentials.AccountID)))); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('accountID', profile_1.mark(String(credentials.AccessKeyID)))); serverlessProfile = { project: { access: access, @@ -196,33 +200,33 @@ var FcDeployComponent = /** @class */ (function () { this.logger.debug("instantiate serviceConfig with : \n" + JSON.stringify(serviceConf, null, ' ')); fcService = new service_1.FcService(serviceConf, functionConf, serverlessProfile, region, credentials, curPath, args); return [4 /*yield*/, fcService.initRemote('service', fcService.name)]; - case 3: + case 4: _d.sent(); - if (!!_.isEmpty(functionConf)) return [3 /*break*/, 5]; + if (!!_.isEmpty(functionConf)) return [3 /*break*/, 6]; this.logger.debug("functionConfig not empty: \n" + JSON.stringify(functionConf, null, ' ') + ", instantiate it."); fcFunction = new function_1.FcFunction(functionConf, serviceConf === null || serviceConf === void 0 ? void 0 : serviceConf.name, serverlessProfile, region, credentials, curPath, args); return [4 /*yield*/, fcFunction.initRemote('function', fcFunction.serviceName, fcFunction.name)]; - case 4: - _d.sent(); - _d.label = 5; case 5: - if (!!_.isEmpty(triggerConfs)) return [3 /*break*/, 9]; - this.logger.debug("triggersConfig not empty: \n" + JSON.stringify(triggerConfs, null, ' ') + ", instantiate them."); - _i = 0, triggerConfs_1 = triggerConfs; + _d.sent(); _d.label = 6; case 6: - if (!(_i < triggerConfs_1.length)) return [3 /*break*/, 9]; + if (!!_.isEmpty(triggerConfs)) return [3 /*break*/, 10]; + this.logger.debug("triggersConfig not empty: \n" + JSON.stringify(triggerConfs, null, ' ') + ", instantiate them."); + _i = 0, triggerConfs_1 = triggerConfs; + _d.label = 7; + case 7: + if (!(_i < triggerConfs_1.length)) return [3 /*break*/, 10]; triggerConf = triggerConfs_1[_i]; fcTrigger = new trigger_1.FcTrigger(triggerConf, serviceConf === null || serviceConf === void 0 ? void 0 : serviceConf.name, functionConf === null || functionConf === void 0 ? void 0 : functionConf.name, serverlessProfile, region, credentials, curPath, args); return [4 /*yield*/, fcTrigger.initRemote('trigger', fcTrigger.serviceName, fcTrigger.functionName, fcTrigger.name)]; - case 7: + case 8: _d.sent(); fcTriggers.push(fcTrigger); - _d.label = 8; - case 8: - _i++; - return [3 /*break*/, 6]; + _d.label = 9; case 9: + _i++; + return [3 /*break*/, 7]; + case 10: if (!_.isEmpty(customDomainConfs)) { this.logger.debug("customDomains not empty: \n" + JSON.stringify(customDomainConfs, null, ' ') + ", instantiate them."); for (_c = 0, customDomainConfs_1 = customDomainConfs; _c < customDomainConfs_1.length; _c++) { @@ -249,7 +253,7 @@ var FcDeployComponent = /** @class */ (function () { FcDeployComponent.prototype.deploy = function (inputs) { var _a, _b, _c; return __awaiter(this, void 0, void 0, function () { - var _d, serverlessProfile, fcService, fcFunction, fcTriggers, fcCustomDomains, region, credentials, curPath, args, isHelp, parsedArgs, argsData, assumeYes, useRemote, useLocal, resolvedServiceConf, resolvedFunctionConf, baseDir, pushRegistry, resolvedTriggerConfs, hasAutoTriggerRole, i, resolvedTriggerConf, _e, fcBaseComponentIns, componentName, BaseComponent, profileOfFcBase, fcBaseComponent, fcBaseComponentInputs, deployedInfo, hasAutoCustomDomainNameInDomains, resolvedCustomDomainConfs, i, resolvedCustomDomainConf, profileOfFcDomain, _i, resolvedCustomDomainConfs_1, resolvedCustomDomainConf, fcDomainComponent, fcDomainComponentInputs, fcDoaminComponentIns, i, res, returnedFunctionConf, _f, fcTriggers_1, fcTrigger, i; + var _d, serverlessProfile, fcService, fcFunction, fcTriggers, fcCustomDomains, region, credentials, curPath, args, isHelp, parsedArgs, argsData, assumeYes, useRemote, useLocal, resolvedServiceConf, resolvedFunctionConf, baseDir, pushRegistry, resolvedTriggerConfs, hasAutoTriggerRole, i, resolvedTriggerConf, _e, fcBaseComponentIns, componentName, BaseComponent, profileOfFcBase, fcBaseComponent, fcBaseComponentInputs, hasAutoCustomDomainNameInDomains, resolvedCustomDomainConfs, i, resolvedCustomDomainConf, profileOfFcDomain, _i, resolvedCustomDomainConfs_1, resolvedCustomDomainConf, fcDomainComponent, fcDomainComponentInputs, fcDoaminComponentIns, i, res, returnedFunctionConf, _f, fcTriggers_1, fcTrigger, i; var _this = this; return __generator(this, function (_g) { switch (_g.label) { @@ -327,12 +331,12 @@ var FcDeployComponent = /** @class */ (function () { profileOfFcBase = profile_1.replaceProjectName(serverlessProfile, (serverlessProfile === null || serverlessProfile === void 0 ? void 0 : serverlessProfile.project.projectName) + "-fc-base-project"); fcBaseComponent = new BaseComponent(profileOfFcBase, resolvedServiceConf, region, credentials, curPath, args, resolvedFunctionConf, resolvedTriggerConfs); fcBaseComponentInputs = fcBaseComponent.genComponentInputs(componentName); - this.logger.info("Waiting for service " + resolvedServiceConf.name + " to be deployed"); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.create('service', resolvedServiceConf.name)); if (!_.isEmpty(resolvedFunctionConf)) { - this.logger.info("Waiting for function " + resolvedFunctionConf.name + " to be deployed"); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.create('function', resolvedFunctionConf.name)); } if (!_.isEmpty(resolvedTriggerConfs)) { - this.logger.info("Waiting for triggers " + resolvedTriggerConfs.map(function (t) { return t.name; }) + " to be deployed"); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.create('triggers', JSON.stringify(resolvedTriggerConfs.map(function (t) { return t.name; })))); } return [4 /*yield*/, retry_1.promiseRetry(function (retry, times) { return __awaiter(_this, void 0, void 0, function () { var ex_1; @@ -350,7 +354,7 @@ var FcDeployComponent = /** @class */ (function () { throw ex_1; } this.logger.debug("error when createService or updateService, serviceName is " + fcService.name + ", error is: \n" + ex_1); - this.logger.log("\tretry " + times + " times", 'red'); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.retry('service', "create " + resolvedServiceConf.name, '', times)); retry(ex_1); return [3 /*break*/, 3]; case 3: return [2 /*return*/]; @@ -359,14 +363,6 @@ var FcDeployComponent = /** @class */ (function () { }); })]; case 16: _g.sent(); - deployedInfo = "\nService: " + resolvedServiceConf.name; - if (!_.isEmpty(resolvedFunctionConf)) { - deployedInfo += "\nFunction: " + resolvedFunctionConf.name; - } - if (!_.isEmpty(resolvedTriggerConfs)) { - deployedInfo += "\nTriggers " + resolvedTriggerConfs.map(function (t) { return t.name; }); - } - this.logger.info("Deployed:" + deployedInfo); hasAutoCustomDomainNameInDomains = false; resolvedCustomDomainConfs = []; if (!!_.isEmpty(fcCustomDomains)) return [3 /*break*/, 21]; @@ -388,15 +384,14 @@ var FcDeployComponent = /** @class */ (function () { i++; return [3 /*break*/, 17]; case 21: - if (!!_.isEmpty(resolvedCustomDomainConfs)) return [3 /*break*/, 27]; - this.logger.info("Waiting for custom domains " + resolvedCustomDomainConfs.map(function (d) { return d.domainName; }) + " to be deployed"); + if (!!_.isEmpty(resolvedCustomDomainConfs)) return [3 /*break*/, 26]; profileOfFcDomain = profile_1.replaceProjectName(serverlessProfile, (serverlessProfile === null || serverlessProfile === void 0 ? void 0 : serverlessProfile.project.projectName) + "-fc-domain-project"); _i = 0, resolvedCustomDomainConfs_1 = resolvedCustomDomainConfs; _g.label = 22; case 22: if (!(_i < resolvedCustomDomainConfs_1.length)) return [3 /*break*/, 26]; resolvedCustomDomainConf = resolvedCustomDomainConfs_1[_i]; - this.logger.debug("waiting for custom domain " + resolvedCustomDomainConf.domainName + " to be deployed"); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.create('custom domain', resolvedCustomDomainConf.domainName)); fcDomainComponent = new fc_domain_1.FcDomainComponent(profileOfFcDomain, resolvedCustomDomainConf, region, credentials, curPath, args); fcDomainComponentInputs = fcDomainComponent.genComponentInputs(); return [4 /*yield*/, core.load('devsapp/fc-domain')]; @@ -410,15 +405,12 @@ var FcDeployComponent = /** @class */ (function () { _i++; return [3 /*break*/, 22]; case 26: - this.logger.info("Deployed:\ncustom domains " + resolvedCustomDomainConfs.map(function (d) { return d.domainName; })); - _g.label = 27; - case 27: - if (!!_.isEmpty(resolvedFunctionConf)) return [3 /*break*/, 29]; + if (!!_.isEmpty(resolvedFunctionConf)) return [3 /*break*/, 28]; return [4 /*yield*/, fcFunction.removeZipCode(resolvedFunctionConf === null || resolvedFunctionConf === void 0 ? void 0 : resolvedFunctionConf.codeUri)]; - case 28: + case 27: _g.sent(); - _g.label = 29; - case 29: + _g.label = 28; + case 28: if (hasAutoCustomDomainNameInDomains) { for (i = 0; i < fcCustomDomains.length; i++) { fcCustomDomains[i].setStatedCustomDomainConf(resolvedCustomDomainConfs[i]); @@ -618,4 +610,4 @@ var FcDeployComponent = /** @class */ (function () { return FcDeployComponent; }()); exports.default = FcDeployComponent; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lib/component/stdout-formatter.d.ts b/dist/lib/component/stdout-formatter.d.ts new file mode 100644 index 0000000..5fa1786 --- /dev/null +++ b/dist/lib/component/stdout-formatter.d.ts @@ -0,0 +1,4 @@ +export default class StdoutFormatter { + static stdoutFormatter: any; + static initStdout(): Promise; +} diff --git a/dist/lib/component/stdout-formatter.js b/dist/lib/component/stdout-formatter.js new file mode 100644 index 0000000..e4f52e9 --- /dev/null +++ b/dist/lib/component/stdout-formatter.js @@ -0,0 +1,61 @@ +"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 __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +Object.defineProperty(exports, "__esModule", { value: true }); +var core_1 = require("@serverless-devs/core"); +var StdoutFormatter = /** @class */ (function () { + function StdoutFormatter() { + } + StdoutFormatter.initStdout = function () { + return __awaiter(this, void 0, void 0, function () { + var _a; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + _a = this; + return [4 /*yield*/, core_1.loadComponent('devsapp/stdout-formatter')]; + case 1: + _a.stdoutFormatter = _b.sent(); + return [2 /*return*/]; + } + }); + }); + }; + return StdoutFormatter; +}()); +exports.default = StdoutFormatter; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rkb3V0LWZvcm1hdHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvY29tcG9uZW50L3N0ZG91dC1mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBc0Q7QUFFdEQ7SUFBQTtJQU1BLENBQUM7SUFIYywwQkFBVSxHQUF2Qjs7Ozs7O3dCQUNFLEtBQUEsSUFBSSxDQUFBO3dCQUFtQixxQkFBTSxvQkFBYSxDQUFDLDBCQUEwQixDQUFDLEVBQUE7O3dCQUF0RSxHQUFLLGVBQWUsR0FBRyxTQUErQyxDQUFDOzs7OztLQUN4RTtJQUNILHNCQUFDO0FBQUQsQ0FBQyxBQU5ELElBTUMifQ== \ No newline at end of file diff --git a/dist/lib/fc/custom-domain.js b/dist/lib/fc/custom-domain.js index 92520e1..ac67a38 100644 --- a/dist/lib/fc/custom-domain.js +++ b/dist/lib/fc/custom-domain.js @@ -67,6 +67,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.FcCustomDomain = void 0; var profile_1 = require("../profile"); @@ -75,6 +78,7 @@ var definition_1 = require("../definition"); var core = __importStar(require("@serverless-devs/core")); var domain_1 = require("../component/domain"); var fse = __importStar(require("fs-extra")); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); function instanceOfCustomDomainConfig(data) { return 'domainName' in data && 'protocol' in data && 'routeConfigs' in data; } @@ -268,7 +272,7 @@ var FcCustomDomain = /** @class */ (function (_super) { if (!this.isDomainNameAuto) return [3 /*break*/, 7]; // generate domain via domain component this.logger.debug('Auto domain name'); - this.logger.info('Using \'customDomain: auto\', FC-DEPLOY will try to generate related custom domain resources automatically'); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('customDomain: auto', 'fc will try to generate related custom domain resources automatically')); profileOfDomain = profile_1.replaceProjectName(this.serverlessProfile, ((_a = this.serverlessProfile) === null || _a === void 0 ? void 0 : _a.project.projectName) + "-domain-project"); domainComponent = new domain_1.DomainComponent(profileOfDomain, this.serviceName, this.functionName, this.region, this.credentials, this.curPath, this.args); domainComponentInputs = domainComponent.genComponentInputs('domain'); @@ -278,7 +282,7 @@ var FcCustomDomain = /** @class */ (function (_super) { return [4 /*yield*/, domainComponentIns.get(domainComponentInputs)]; case 6: generatedDomain = _e.sent(); - this.logger.info("Generated auto custom domain done: " + generatedDomain); + this.logger.info("Generated auto custom domain: " + generatedDomain); Object.assign(resolvedCustomDomainConf, { domainName: generatedDomain, }); @@ -291,4 +295,4 @@ var FcCustomDomain = /** @class */ (function (_super) { return FcCustomDomain; }(profile_1.IInputsBase)); exports.FcCustomDomain = FcCustomDomain; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tLWRvbWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvZmMvY3VzdG9tLWRvbWFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUE4RjtBQUM5Rix3Q0FBNEI7QUFFNUIsNENBQTZDO0FBQzdDLDBEQUE4QztBQUM5Qyw4Q0FBc0Q7QUFDdEQsNENBQWdDO0FBU2hDLFNBQVMsNEJBQTRCLENBQUMsSUFBUztJQUM3QyxPQUFPLFlBQVksSUFBSSxJQUFJLElBQUksVUFBVSxJQUFJLElBQUksSUFBSSxjQUFjLElBQUksSUFBSSxDQUFDO0FBQzlFLENBQUM7QUFnQkQ7SUFBb0Msa0NBQVc7SUFRN0Msd0JBQVksZ0JBQW9DLEVBQUUsV0FBbUIsRUFBRSxZQUFvQixFQUFFLFlBQTZCLEVBQUUsaUJBQW9DLEVBQUUsTUFBYyxFQUFFLFdBQXlCLEVBQUUsT0FBZ0IsRUFBRSxJQUFhO1FBQTVPLFlBQ0Usa0JBQU0saUJBQWlCLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLFNBZ0I3RDtRQWZDLEtBQUksQ0FBQyxnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQztRQUN6QyxLQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQztRQUMvQixLQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztRQUNqQyxLQUFJLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQztRQUM1QixLQUFJLENBQUMsZ0JBQWdCLEdBQUcseUJBQVksQ0FBQyxLQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLEVBQUU7WUFDNUIsS0FBc0IsVUFBWSxFQUFaLDZCQUFZLEVBQVosMEJBQVks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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"custom-domain.js","sourceRoot":"","sources":["../../../src/lib/fc/custom-domain.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lib/fc/fc-deploy.js b/dist/lib/fc/fc-deploy.js index 6a1e61f..d566910 100644 --- a/dist/lib/fc/fc-deploy.js +++ b/dist/lib/fc/fc-deploy.js @@ -76,6 +76,8 @@ var core = __importStar(require("@serverless-devs/core")); var _ = __importStar(require("lodash")); var prompt_1 = require("../utils/prompt"); var fc_info_1 = __importDefault(require("../component/fc-info")); +var utils_1 = require("../utils/utils"); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); var FcDeploy = /** @class */ (function (_super) { __extends(FcDeploy, _super); function FcDeploy(localConfig, serverlessProfile, region, credentials, curPath, args) { @@ -134,10 +136,19 @@ var FcDeploy = /** @class */ (function (_super) { FcDeploy.prototype.initRemote = function (type, serviceName, functionName, triggerName) { var _a; return __awaiter(this, void 0, void 0, function () { - var profileOfFcInfo, fcInfo, fcInfoComponentInputs, fcInfoComponentIns, remoteConfig, info, e_1, resourceName; + var resourceName, profileOfFcInfo, fcInfo, fcInfoComponentInputs, fcInfoComponentIns, remoteConfig, info, e_1; return __generator(this, function (_b) { switch (_b.label) { case 0: + if (type === 'service') { + resourceName = serviceName; + } + else if (type === 'function') { + resourceName = functionName; + } + else if (type === 'trigger') { + resourceName = triggerName; + } profileOfFcInfo = profile_1.replaceProjectName(this.serverlessProfile, ((_a = this.serverlessProfile) === null || _a === void 0 ? void 0 : _a.project.projectName) + "-fc-info-project"); fcInfo = new fc_info_1.default(serviceName, profileOfFcInfo, this.region, this.credentials, this.curPath, null, functionName, triggerName ? [triggerName] : null); return [4 /*yield*/, fcInfo.genComponentInputs('fc-info')]; @@ -146,6 +157,7 @@ var FcDeploy = /** @class */ (function (_super) { return [4 /*yield*/, core.load('devsapp/fc-info')]; case 2: fcInfoComponentIns = _b.sent(); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.check(type, resourceName)); _b.label = 3; case 3: _b.trys.push([3, 5, , 6]); @@ -162,22 +174,12 @@ var FcDeploy = /** @class */ (function (_super) { case 5: e_1 = _b.sent(); if (!e_1.toString().includes('NotFoundError')) { - this.logger.warn("Get remote " + type + " failed, error is: " + e_1.message + ".Fc will use local config from now on."); + this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn("remote " + type, "error is: " + e_1.message, 'Fc will use local config from now on')); } return [3 /*break*/, 6]; case 6: if (!_.isEmpty(remoteConfig)) { - resourceName = void 0; - if (type === 'service') { - resourceName = serviceName; - } - else if (type === 'function') { - resourceName = functionName; - } - else if (type === 'trigger') { - resourceName = triggerName; - } - this.logger.info(type + ": " + resourceName + " exists online."); + this.logger.info(utils_1.capitalizeFirstLetter(type) + ": " + resourceName + " already exists online."); this.logger.debug("online config of " + type + ": " + resourceName + " is " + JSON.stringify(remoteConfig, null, ' ')); this.existOnline = true; this.remoteConfig = remoteConfig; @@ -227,7 +229,7 @@ var FcDeploy = /** @class */ (function (_super) { throw new Error(type + ": " + name + " dose not exist online, please make sure the " + type + " exists or you have permission to access remote " + type + " when use --use-remote flag."); } // --use-remote 参数为假，且线上资源不存在，则默认使用线下配置，且之后不再询问 - this.logger.info(type + ": " + name + " dose not exist online, fc will use local config from now on."); + this.logger.info(utils_1.capitalizeFirstLetter(type) + ": " + name + " dose not exist online, fc will use local config from now on."); this.useRemote = false; return [3 /*break*/, 7]; case 1: @@ -247,7 +249,7 @@ var FcDeploy = /** @class */ (function (_super) { return [4 /*yield*/, prompt_1.promptForConfirmOrDetails(msg, details)]; case 4: _a.useRemote = _b.sent(); - this.logger.log("The deployment will use " + (this.useRemote ? 'remote config' : 'local config') + " from now on.\nYou can change it by setting --use-remote/--use-local flag in deploy command.", 'yellow'); + this.logger.log("Using " + (this.useRemote ? 'remote config' : 'local config') + " from now on.\nYou can change it by setting --use-remote/--use-local flag in deploy command.", 'yellow'); _b.label = 5; case 5: return [3 /*break*/, 7]; case 6: @@ -271,4 +273,4 @@ var FcDeploy = /** @class */ (function (_super) { return FcDeploy; }(profile_1.IInputsBase)); exports.default = FcDeploy; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmMtZGVwbG95LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9mYy9mYy1kZXBsb3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUE4RjtBQUM5RiwwREFBOEM7QUFDOUMsd0NBQTRCO0FBQzVCLDBDQUE0RDtBQUM1RCxpRUFBMEM7QUFHMUM7SUFBa0QsNEJBQVc7SUFNM0Qsa0JBQVksV0FBYyxFQUFFLGlCQUFvQyxFQUFFLE1BQWMsRUFBRSxXQUF5QixFQUFFLE9BQWdCLEVBQUUsSUFBYTtRQUE1SSxZQUNFLGtCQUFNLGlCQUFpQixFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxTQUc3RDtRQUZDLEtBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBQy9CLEtBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDOztJQUMzQixDQUFDO0lBRUssK0JBQVksR0FBbEIsVUFBbUIsT0FBZSxFQUFFLEdBQVcsRUFBRSxLQUFVOzs7Ozs7NEJBQ3RDLHFCQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUE7O3dCQUF6QyxLQUFLLEdBQVEsU0FBNEI7NkJBQzNDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQWhCLHdCQUFnQjt3QkFDbEIscUJBQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLFlBQUksR0FBQyxHQUFHLElBQUcsS0FBSyxNQUFHLEVBQUE7O3dCQUE5QyxTQUE4QyxDQUFDOzs7d0JBRS9DLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSzs0QkFDakIsR0FBQyxHQUFHLElBQUcsS0FBSztnQ0FDWixDQUFDO3dCQUNILHFCQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmMtZGVwbG95LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9mYy9mYy1kZXBsb3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUE4RjtBQUM5RiwwREFBOEM7QUFDOUMsd0NBQTRCO0FBQzVCLDBDQUE0RDtBQUM1RCxpRUFBMEM7QUFDMUMsd0NBQXVEO0FBQ3ZELG1GQUE0RDtBQUU1RDtJQUFrRCw0QkFBVztJQU0zRCxrQkFBWSxXQUFjLEVBQUUsaUJBQW9DLEVBQUUsTUFBYyxFQUFFLFdBQXlCLEVBQUUsT0FBZ0IsRUFBRSxJQUFhO1FBQTVJLFlBQ0Usa0JBQU0saUJBQWlCLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLFNBRzdEO1FBRkMsS0FBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7UUFDL0IsS0FBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUM7O0lBQzNCLENBQUM7SUFFSywrQkFBWSxHQUFsQixVQUFtQixPQUFlLEVBQUUsR0FBVyxFQUFFLEtBQVU7Ozs7Ozs0QkFDdEMscUJBQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBQTs7d0JBQXpDLEtBQUssR0FBUSxTQUE0Qjs2QkFDM0MsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBaEIsd0JBQWdCO3dCQUNsQixxQkFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sWUFBSSxHQUFDLEdBQUcsSUFBRyxLQUFLLE1BQUcsRUFBQTs7d0JBQTlDLFNBQThDLENBQUM7Ozt3QkFFL0MsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLOzRCQUNqQixHQUFDLEdBQUcsSUFBRyxLQUFLO2dDQUNaLENBQUM7d0JBQ0gscUJBQU0sSUFBSSxDQUFDLFFBQVEsQ0FB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 \ No newline at end of file diff --git a/dist/lib/fc/function.d.ts b/dist/lib/fc/function.d.ts index 3e5990d..ec72cdb 100644 --- a/dist/lib/fc/function.d.ts +++ b/dist/lib/fc/function.d.ts @@ -37,13 +37,13 @@ export declare class FcFunction extends FcDeploy { static readonly DEFAULT_SYNC_CODE_PATH: string; constructor(functionConf: FunctionConfig, serviceName: string, serverlessProfile: ServerlessProfile, region: string, credentials: ICredentials, curPath?: string, args?: string); initLocal(assumeYes?: boolean): Promise; - getCodeUriWithBuildPath(): any; + getCodeUriWithBuildPath(): Promise; initLocalConfig(assumeYes?: boolean): Promise; syncRemoteCode(): Promise; genStateID(): string; validateConfig(): void; makeFunctionConfig(): FunctionConfig; - generateCodeIngore(baseDir: string): Promise; + generateCodeIngore(baseDir: string): Promise; zipCode(baseDir: any): Promise; removeZipCode(codeZipPath: string): Promise; packRemoteCode(): Promise; diff --git a/dist/lib/fc/function.js b/dist/lib/fc/function.js index 7fe41f1..29ec227 100644 --- a/dist/lib/fc/function.js +++ b/dist/lib/fc/function.js @@ -87,6 +87,7 @@ var os_1 = __importDefault(require("os")); var env_1 = require("../env"); var deep_object_diff_1 = require("deep-object-diff"); var prompt_1 = require("../utils/prompt"); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); function isCustomContainerRuntime(runtime) { return runtime === 'custom-container'; } @@ -114,20 +115,26 @@ var FcFunction = /** @class */ (function (_super) { }); }; FcFunction.prototype.getCodeUriWithBuildPath = function () { - var baseDir = path_1.default.dirname(this.curPath); - var buildBasePath = path_1.default.join(baseDir, FcFunction.DEFAULT_BUILD_ARTIFACTS_PATH_SUFFIX); - if (!fse.pathExistsSync(buildBasePath) || fse.lstatSync(buildBasePath).isFile() || isCustomContainerRuntime(this.localConfig.runtime)) { - return { - codeUri: this.localConfig.codeUri, - isBuild: false, - }; - } - var buildCodeUri = path_1.default.join(buildBasePath, this.serviceName, this.name); - this.logger.info("Fc detects that you have run build command for function: " + this.name + ", use build codeUri: " + buildCodeUri + " instead of your codeUri: " + this.localConfig.codeUri); - return { - codeUri: buildCodeUri, - isBuild: true, - }; + return __awaiter(this, void 0, void 0, function () { + var baseDir, buildBasePath, buildCodeUri; + return __generator(this, function (_a) { + baseDir = path_1.default.dirname(this.curPath); + buildBasePath = path_1.default.join(baseDir, FcFunction.DEFAULT_BUILD_ARTIFACTS_PATH_SUFFIX); + if (!fse.pathExistsSync(buildBasePath) || fse.lstatSync(buildBasePath).isFile() || isCustomContainerRuntime(this.localConfig.runtime)) { + return [2 /*return*/, { + codeUri: this.localConfig.codeUri, + isBuild: false, + }]; + } + buildCodeUri = path_1.default.join(buildBasePath, this.serviceName, this.name); + this.logger.info("Fc detects that you have run build command for function: " + this.name + "."); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('codeUri', buildCodeUri)); + return [2 /*return*/, { + codeUri: buildCodeUri, + isBuild: true, + }]; + }); + }); }; FcFunction.prototype.initLocalConfig = function (assumeYes) { return __awaiter(this, void 0, void 0, function () { @@ -141,29 +148,31 @@ var FcFunction = /** @class */ (function (_super) { protect: false, }); } - _a = this.getCodeUriWithBuildPath(), codeUri = _a.codeUri, isBuild = _a.isBuild; - if (!isBuild) return [3 /*break*/, 3]; + return [4 /*yield*/, this.getCodeUriWithBuildPath()]; + case 1: + _a = _c.sent(), codeUri = _a.codeUri, isBuild = _a.isBuild; + if (!isBuild) return [3 /*break*/, 4]; this.originalCodeUri = this.localConfig.codeUri; this.localConfig.codeUri = codeUri; resolvedEnvs = env_1.addEnv(this.localConfig.environmentVariables); - message = 'Fc add/append some content to your origin environment variables for finding dependencies generated by build command. Are you sure to continue?'; + message = 'Fc want to add/append some content to your origin environment variables for finding dependencies generated by build command. \nDo you agree with the behavior?'; details = deep_object_diff_1.detailedDiff(this.localConfig.environmentVariables, resolvedEnvs); _b = assumeYes; - if (_b) return [3 /*break*/, 2]; + if (_b) return [3 /*break*/, 3]; return [4 /*yield*/, prompt_1.promptForConfirmOrDetails(message, details)]; - case 1: - _b = (_c.sent()); - _c.label = 2; case 2: + _b = (_c.sent()); + _c.label = 3; + case 3: if (_b) { if (assumeYes) { this.logger.info('Fc add/append some content to your origin environment variables for finding dependencies generated by build command.'); - this.logger.log(JSON.stringify(resolvedEnvs, null, ' ')); + this.logger.log(JSON.stringify(resolvedEnvs, null, ' '), 'yellow'); } this.localConfig.environmentVariables = resolvedEnvs; } - _c.label = 3; - case 3: return [2 /*return*/]; + _c.label = 4; + case 4: return [2 /*return*/]; } }); }); @@ -280,7 +289,7 @@ var FcFunction = /** @class */ (function (_super) { absBaseDir = path_1.default.resolve(baseDir); relative = path_1.default.relative(absBaseDir, absCodeUri); if (codeUri.startsWith('..') || relative.startsWith('..')) { - this.logger.warn("\twarning: fcignore is not supported for your codeUri: " + codeUri); + this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn('.fcignore', "not supported for the codeUri: " + codeUri)); return [2 /*return*/, null]; } return [4 /*yield*/, ignore_1.isIgnored(baseDir, runtime, this.originalCodeUri)]; @@ -339,7 +348,7 @@ var FcFunction = /** @class */ (function (_super) { return [3 /*break*/, 4]; case 3: e_1 = _g.sent(); - this.logger.warn("Removing zip code: " + codeZipPath + " error: " + e_1.message); + this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn('remove sync code', "path: " + codeZipPath + ", error: " + e_1.message)); return [3 /*break*/, 4]; case 4: return [2 /*return*/]; case 5: @@ -356,7 +365,7 @@ var FcFunction = /** @class */ (function (_super) { return [3 /*break*/, 9]; case 8: e_2 = _g.sent(); - this.logger.warn("Removing zip code: " + codeZipPath + " error: " + e_2.message); + this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn('remove zipped code', "path: " + codeZipPath + ", error: " + e_2.message)); return [3 /*break*/, 9]; case 9: return [2 /*return*/]; } @@ -459,4 +468,4 @@ var FcFunction = /** @class */ (function (_super) { return FcFunction; }(fc_deploy_1.default)); exports.FcFunction = FcFunction; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/lib/fc/function.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/lib/fc/function.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lib/fc/service.js b/dist/lib/fc/service.js index 8451ec2..3e63672 100644 --- a/dist/lib/fc/service.js +++ b/dist/lib/fc/service.js @@ -82,6 +82,8 @@ var static_1 = require("../static"); var fc_deploy_1 = __importDefault(require("./fc-deploy")); var definition_1 = require("../definition"); var core = __importStar(require("@serverless-devs/core")); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); +var yaml = __importStar(require("js-yaml")); var FcService = /** @class */ (function (_super) { __extends(FcService, _super); function FcService(serviceConf, functionConf, serverlessProfile, region, credentials, curPath, args) { @@ -169,12 +171,17 @@ var FcService = /** @class */ (function (_super) { FcService.prototype.generateServiceRole = function () { var _a, _b; return __awaiter(this, void 0, void 0, function () { - var attachedPolicies, serviceRole, assumeRolePolicy, roleName, mnsPolicyName, mnsPolicyStatement, mnsPolicy, logConfig, logPolicyName, logPolicyStatement, logPolicy, alicloudRam, roleArn; + var serviceRole, roleName_1, attachedPolicies, assumeRolePolicy, roleName, mnsPolicyName, mnsPolicyStatement, mnsPolicy, logConfig, logPolicyName, logPolicyStatement, logPolicy, alicloudRam, roleArn; return __generator(this, function (_c) { switch (_c.label) { case 0: - attachedPolicies = []; serviceRole = this.localConfig.role; + if (_.isString(serviceRole)) { + roleName_1 = ram_1.extractRoleNameFromArn(serviceRole); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('role', "extracted name is " + roleName_1)); + return [2 /*return*/, serviceRole]; + } + attachedPolicies = []; assumeRolePolicy = [ { Action: 'sts:AssumeRole', @@ -189,7 +196,7 @@ var FcService = /** @class */ (function (_super) { roleName = ram_1.normalizeRoleOrPoliceName(roleName); } else { - roleName = _.isString(serviceRole) ? ram_1.extractRoleNameFromArn(serviceRole) : serviceRole.name; + roleName = serviceRole.name; } if (serviceRole && !_.isString(serviceRole)) { if (serviceRole === null || serviceRole === void 0 ? void 0 : serviceRole.policies) { @@ -249,7 +256,7 @@ var FcService = /** @class */ (function (_super) { if (_.isEmpty(attachedPolicies) && _.isEmpty(serviceRole)) { return [2 /*return*/, undefined]; } - this.logger.info("Wating for role: " + roleName + " to be deployed"); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.set('role', roleName)); this.hasAutoConfig = true; alicloudRam = new ram_1.AlicloudRam(this.serverlessProfile, this.credentials, this.region); return [4 /*yield*/, alicloudRam.makeRole(roleName, undefined, undefined, undefined, assumeRolePolicy, attachedPolicies)]; @@ -274,11 +281,16 @@ var FcService = /** @class */ (function (_super) { if (!definition.isAutoConfig(logConfig)) return [3 /*break*/, 2]; this.hasAutoConfig = true; aliyunSls = new sls_1.AlicloudSls(this.serverlessProfile, this.credentials, this.region); - this.logger.info('Using \'logConfig: auto\', FC-DEPLOY will try to generate default sls project.'); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('logConfig: auto', 'fc will try to generate default sls project')); return [4 /*yield*/, aliyunSls.createDefaultSls(this.name)]; case 1: resolvedLogConfig = _a.sent(); - this.logger.info("Generated auto LogConfig done: \n" + JSON.stringify(resolvedLogConfig, null, ' ')); + this.logger.info("Generated logConfig: \n" + yaml.dump(resolvedLogConfig, { + styles: { + '!!null': 'canonical', + }, + sortKeys: true, + })); return [3 /*break*/, 3]; case 2: throw new Error('logConfig only support auto/Auto when set to string.'); case 3: return [3 /*break*/, 5]; @@ -308,12 +320,17 @@ var FcService = /** @class */ (function (_super) { } this.hasAutoConfig = true; // vpc auto - this.logger.info('Using \'vpcConfig: auto\', FC-DEPLOY will try to generate related vpc resources automatically'); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('vpcConfig: auto', 'fc will try to generate related vpc resources automatically')); alicloudVpc = new vpc_1.AlicloudVpc(this.serverlessProfile, this.credentials, this.region); return [4 /*yield*/, alicloudVpc.createDefaultVpc()]; case 1: vpcDeployRes = _a.sent(); - this.logger.info("Generated auto VpcConfig done: \n" + JSON.stringify(vpcDeployRes, null, ' ')); + this.logger.info("Generated vpcConfig: \n" + yaml.dump(vpcDeployRes, { + styles: { + '!!null': 'canonical', + }, + sortKeys: true, + })); return [2 /*return*/, { vpcId: vpcDeployRes.vpcId, securityGroupId: vpcDeployRes.securityGroupId, @@ -335,11 +352,16 @@ var FcService = /** @class */ (function (_super) { if (!definition.isAutoConfig(nasConfig)) return [3 /*break*/, 2]; this.hasAutoConfig = true; alicloudNas = new nas_1.AlicloudNas(this.serverlessProfile, this.credentials, this.region); - this.logger.info('Using \'nasConfig: auto\', FC-DEPLOY will try to generate related nas file system automatically'); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.using('nasConfig: auto', 'fc will try to generate related nas file system automatically')); return [4 /*yield*/, alicloudNas.createDefaultNas("" + static_1.FC_NAS_SERVICE_PREFIX + this.name, vpcConfig, "/" + this.name, roleArn, assumeYes)]; case 1: nasDefaultConfig = _a.sent(); - this.logger.info("Generated auto NasConfig done: \n" + JSON.stringify(nasDefaultConfig, null, ' ')); + this.logger.info("Generated nasConfig: \n" + yaml.dump(nasDefaultConfig, { + styles: { + '!!null': 'canonical', + }, + sortKeys: true, + })); return [2 /*return*/, nasDefaultConfig]; case 2: throw new Error('nasConfig only support auto/Auto when set to string.'); case 3: return [2 /*return*/, nasConfig]; @@ -414,4 +436,4 @@ var FcService = /** @class */ (function (_super) { return FcService; }(fc_deploy_1.default)); exports.FcService = FcService; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/lib/fc/service.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/lib/fc/service.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lib/fc/trigger.js b/dist/lib/fc/trigger.js index 4dd856d..52153b3 100644 --- a/dist/lib/fc/trigger.js +++ b/dist/lib/fc/trigger.js @@ -88,6 +88,7 @@ var ram_1 = require("../resource/ram"); var static_1 = require("../static"); var core = __importStar(require("@serverless-devs/core")); var fc_deploy_1 = __importDefault(require("./fc-deploy")); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); function instanceOfTablestoreTriggerConfig(data) { return 'instanceName' in data && 'tableName' in data; } @@ -204,8 +205,8 @@ var FcTrigger = /** @class */ (function (_super) { return __generator(this, function (_a) { switch (_a.label) { case 0: - this.logger.info("Waiting for making invocation role for trigger: " + this.name); roleName = ram_1.normalizeRoleOrPoliceName("FcDeployCreateRole-" + this.serviceName + "-" + this.functionName); + this.logger.info(stdout_formatter_1.default.stdoutFormatter.set("invocation role for trigger: " + this.name, roleName)); config = this.localConfig.config; if (instanceOfLogTriggerConfig(config)) { // log trigger @@ -405,4 +406,4 @@ var FcTrigger = /** @class */ (function (_super) { return FcTrigger; }(fc_deploy_1.default)); exports.FcTrigger = FcTrigger; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/lib/fc/trigger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/lib/fc/trigger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lib/resource/acr.js b/dist/lib/resource/acr.js index 5586985..f4106eb 100644 --- a/dist/lib/resource/acr.js +++ b/dist/lib/resource/acr.js @@ -48,10 +48,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.AlicloudAcr = void 0; var client_1 = require("./client"); var child_process_1 = require("child_process"); +var stdout_formatter_1 = __importDefault(require("../component/stdout-formatter")); var AlicloudAcr = /** @class */ (function (_super) { __extends(AlicloudAcr, _super); function AlicloudAcr(pushRegistry, serverlessProfile, credentials, region, curPath, args, timeout) { @@ -106,7 +110,7 @@ var AlicloudAcr = /** @class */ (function (_super) { this.logger.log("Login to registry: " + this.registry + " with user: " + dockerTmpUser, 'green'); } catch (e) { - this.logger.warn("Login to registry: " + this.registry + " failed with temporary token."); + this.logger.warn(stdout_formatter_1.default.stdoutFormatter.warn('registry', "login to " + this.registry + " failed with temporary token")); } return [2 /*return*/]; } @@ -124,7 +128,7 @@ var AlicloudAcr = /** @class */ (function (_super) { imageArr = image.split('/'); imageArr[0] = this.registry; resolvedImage = imageArr.join('/'); - this.logger.log("Docker push " + resolvedImage + "...", 'yellow'); + this.logger.log("Pushing docker image: " + resolvedImage + "...", 'yellow'); child_process_1.execSync("docker push " + resolvedImage, { stdio: 'inherit' }); return [2 /*return*/]; } @@ -134,4 +138,4 @@ var AlicloudAcr = /** @class */ (function (_super) { return AlicloudAcr; }(client_1.AlicloudClient)); exports.AlicloudAcr = AlicloudAcr; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9yZXNvdXJjZS9hY3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1DQUEwQztBQUMxQywrQ0FBeUM7QUFHekM7SUFBaUMsK0JBQWM7SUFFN0MscUJBQVksWUFBb0IsRUFBRSxpQkFBb0MsRUFBRSxXQUF5QixFQUFFLE1BQWMsRUFBRSxPQUFnQixFQUFFLElBQWEsRUFBRSxPQUFnQjtRQUFwSyxZQUNFLGtCQUFNLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsU0FRdEU7UUFQQyxJQUFJLFlBQVksS0FBSyxjQUFjLEVBQUU7WUFDbkMsS0FBSSxDQUFDLFFBQVEsR0FBRyxjQUFZLEtBQUksQ0FBQyxNQUFNLGtCQUFlLENBQUM7U0FDeEQ7YUFBTSxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7WUFDckMsS0FBSSxDQUFDLFFBQVEsR0FBRyxrQkFBZ0IsS0FBSSxDQUFDLE1BQU0sa0JBQWUsQ0FBQztTQUM1RDthQUFNLElBQUksWUFBWSxFQUFFO1lBQ3ZCLEtBQUksQ0FBQyxRQUFRLEdBQUcsWUFBWSxDQUFDO1NBQzlCOztJQUNILENBQUM7SUFFSyxxQ0FBZSxHQUFyQjs7Ozs0QkFDUyxxQkFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLGdCQUFjLElBQUksQ0FBQyxNQUFNLGtCQUFlLEVBQUUsWUFBWSxDQUFDLEVBQUE7NEJBQXRGLHNCQUFPLFNBQStFLEVBQUM7Ozs7S0FDeEY7SUFFSyxxQ0FBZSxHQUFyQjs7Ozs7NEJBQ29CLHFCQUFNLElBQUksQ0FBQyxlQUFlLEVBQUUsRUFBQTs7d0JBQXhDLFNBQVMsR0FBRyxTQUE0Qjt3QkFDeEMsVUFBVSxHQUFHLEtBQUssQ0FBQzt3QkFDbkIsT0FBTyxHQUFHLFNBQVMsQ0FBQzt3QkFDcEIsT0FBTyxHQUFHLEVBQUUsQ0FBQzt3QkFDYixJQUFJLEdBQUcsSUFBSSxDQUFDO3dCQUNaLE9BQU8sR0FBRzs0QkFDZCxjQUFjLEVBQUUsa0JBQWtCO3lCQUNuQyxDQUFDO3dCQUNJLGFBQWEsR0FBRyxFQUFFLENBQUM7d0JBQ1IscUJBQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLGFBQWEsQ0FBQyxFQUFBOzt3QkFBOUYsUUFBUSxHQUFHLFNBQW1GO3dCQUU5RixhQUFhLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUM7d0JBQzNDLGNBQWMsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDO3dCQUV4RCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQywrQ0FBK0MsQ0FBQyxDQUFDO3dCQUNsRSxJQUFJOzRCQUNGLHdCQUFRLENBQUMsNkJBQTJCLGFBQWEsU0FBSSxJQUFJLENBQUMsUUFBUSxzQkFBbUIsRUFBRTtnQ0FDckYsS0FBSyxFQUFFLGNBQWM7NkJBQ3RCLENBQUMsQ0FBQzs0QkFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyx3QkFBc0IsSUFBSSxDQUFDLFFBQVEsb0JBQWUsYUFBZSxFQUFFLE9BQU8sQ0FBQyxDQUFDO3lCQUM3Rjt3QkFBQyxPQUFPLENBQUMsRUFBRTs0QkFDVixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx3QkFBc0IsSUFBSSxDQUFDLFFBQVEsa0NBQStCLENBQUMsQ0FBQzt5QkFDdEY7Ozs7O0tBQ0Y7SUFFSywrQkFBUyxHQUFmLFVBQWdCLEtBQWE7Ozs7OzRCQUMzQixxQkFBTSxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUE7O3dCQUE1QixTQUE0QixDQUFDO3dCQUN2QixRQUFRLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQzt3QkFDbEMsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7d0JBRXRCLGFBQWEsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3dCQUN6QyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxpQkFBZSxhQUFhLFFBQUssRUFBRSxRQUFRLENBQUMsQ0FBQzt3QkFDN0Qsd0JBQVEsQ0FBQyxpQkFBZSxhQUFlLEVBQUUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQzs7Ozs7S0FDaEU7SUFDSCxrQkFBQztBQUFELENBQUMsQUFwREQsQ0FBaUMsdUJBQWMsR0FvRDlDO0FBcERZLGtDQUFXIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9yZXNvdXJjZS9hY3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1DQUEwQztBQUMxQywrQ0FBeUM7QUFFekMsbUZBQTREO0FBRTVEO0lBQWlDLCtCQUFjO0lBRTdDLHFCQUFZLFlBQW9CLEVBQUUsaUJBQW9DLEVBQUUsV0FBeUIsRUFBRSxNQUFjLEVBQUUsT0FBZ0IsRUFBRSxJQUFhLEVBQUUsT0FBZ0I7UUFBcEssWUFDRSxrQkFBTSxpQkFBaUIsRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLFNBUXRFO1FBUEMsSUFBSSxZQUFZLEtBQUssY0FBYyxFQUFFO1lBQ25DLEtBQUksQ0FBQyxRQUFRLEdBQUcsY0FBWSxLQUFJLENBQUMsTUFBTSxrQkFBZSxDQUFDO1NBQ3hEO2FBQU0sSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFO1lBQ3JDLEtBQUksQ0FBQyxRQUFRLEdBQUcsa0JBQWdCLEtBQUksQ0FBQyxNQUFNLGtCQUFlLENBQUM7U0FDNUQ7YUFBTSxJQUFJLFlBQVksRUFBRTtZQUN2QixLQUFJLENBQUMsUUFBUSxHQUFHLFlBQVksQ0FBQztTQUM5Qjs7SUFDSCxDQUFDO0lBRUsscUNBQWUsR0FBckI7Ozs7NEJBQ1MscUJBQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxnQkFBYyxJQUFJLENBQUMsTUFBTSxrQkFBZSxFQUFFLFlBQVksQ0FBQyxFQUFBOzRCQUF0RixzQkFBTyxTQUErRSxFQUFDOzs7O0tBQ3hGO0lBRUsscUNBQWUsR0FBckI7Ozs7OzRCQUNvQixxQkFBTSxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUE7O3dCQUF4QyxTQUFTLEdBQUcsU0FBNEI7d0JBQ3hDLFVBQVUsR0FBRyxLQUFLLENBQUM7d0JBQ25CLE9BQU8sR0FBRyxTQUFTLENBQUM7d0JBQ3BCLE9BQU8sR0FBRyxFQUFFLENBQUM7d0JBQ2IsSUFBSSxHQUFHLElBQUksQ0FBQzt3QkFDWixPQUFPLEdBQUc7NEJBQ2QsY0FBYyxFQUFFLGtCQUFrQjt5QkFDbkMsQ0FBQzt3QkFDSSxhQUFhLEdBQUcsRUFBRSxDQUFDO3dCQUNSLHFCQUFNLFNBQVMsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxhQUFhLENBQUMsRUFBQTs7d0JBQTlGLFFBQVEsR0FBRyxTQUFtRjt3QkFFOUYsYUFBYSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDO3dCQUMzQyxjQUFjLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQzt3QkFFeEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsK0NBQStDLENBQUMsQ0FBQzt3QkFDbEUsSUFBSTs0QkFDRix3QkFBUSxDQUFDLDZCQUEyQixhQUFhLFNBQUksSUFBSSxDQUFDLFFBQVEsc0JBQW1CLEVBQUU7Z0NBQ3JGLEtBQUssRUFBRSxjQUFjOzZCQUN0QixDQUFDLENBQUM7NEJBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsd0JBQXNCLElBQUksQ0FBQyxRQUFRLG9CQUFlLGFBQWUsRUFBRSxPQUFPLENBQUMsQ0FBQzt5QkFDN0Y7d0JBQUMsT0FBTyxDQUFDLEVBQUU7NEJBQ1YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsMEJBQWUsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxjQUFZLElBQUksQ0FBQyxRQUFRLGlDQUE4QixDQUFDLENBQUMsQ0FBQzt5QkFDN0g7Ozs7O0tBQ0Y7SUFFSywrQkFBUyxHQUFmLFVBQWdCLEtBQWE7Ozs7OzRCQUMzQixxQkFBTSxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUE7O3dCQUE1QixTQUE0QixDQUFDO3dCQUN2QixRQUFRLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQzt3QkFDbEMsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7d0JBRXRCLGFBQWEsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3dCQUN6QyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQywyQkFBeUIsYUFBYSxRQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7d0JBQ3ZFLHdCQUFRLENBQUMsaUJBQWUsYUFBZSxFQUFFLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7Ozs7O0tBQ2hFO0lBQ0gsa0JBQUM7QUFBRCxDQUFDLEFBcERELENBQWlDLHVCQUFjLEdBb0Q5QztBQXBEWSxrQ0FBVyJ9 \ No newline at end of file diff --git a/dist/lib/resource/ram.d.ts b/dist/lib/resource/ram.d.ts index 364313e..6279bad 100644 --- a/dist/lib/resource/ram.d.ts +++ b/dist/lib/resource/ram.d.ts @@ -20,3 +20,4 @@ export declare class AlicloudRam extends AlicloudClient { makeRole(roleName: string, args?: string, description?: string, resourceName?: string, assumeRolePolicy?: any, attachedPolicies?: Array): Promise; } export declare function extractRoleNameFromArn(roleArn: string): string; +export declare function checkRoleArnFormat(roleArn: string): void; diff --git a/dist/lib/resource/ram.js b/dist/lib/resource/ram.js index 391db69..76458a3 100644 --- a/dist/lib/resource/ram.js +++ b/dist/lib/resource/ram.js @@ -68,7 +68,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { } }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.extractRoleNameFromArn = exports.AlicloudRam = exports.normalizeRoleOrPoliceName = void 0; +exports.checkRoleArnFormat = exports.extractRoleNameFromArn = exports.AlicloudRam = exports.normalizeRoleOrPoliceName = void 0; var ram_1 = require("../component/ram"); var core = __importStar(require("@serverless-devs/core")); var client_1 = require("./client"); @@ -131,10 +131,14 @@ var AlicloudRam = /** @class */ (function (_super) { }(client_1.AlicloudClient)); exports.AlicloudRam = AlicloudRam; function extractRoleNameFromArn(roleArn) { - if (!roleArn.startsWith('acs:ram::')) { - throw new Error("Invalid format of role arn: " + roleArn); - } + checkRoleArnFormat(roleArn); return roleArn.match(/acs:ram::[0-9]+:role\/(\S*)/)[1]; } exports.extractRoleNameFromArn = extractRoleNameFromArn; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9yZXNvdXJjZS9yYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3Q0FBZ0Q7QUFDaEQsMERBQThDO0FBQzlDLG1DQUEwQztBQUMxQyxzQ0FBZ0Q7QUFvQmhELFNBQWdCLHlCQUF5QixDQUFDLFFBQWdCO0lBQ3hELE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDckMsQ0FBQztBQUZELDhEQUVDO0FBRUQ7SUFBaUMsK0JBQWM7SUFBL0M7O0lBaUNBLENBQUM7SUFoQ0MseUNBQW1CLEdBQW5CLFVBQW9CLFFBQWdCLEVBQUUsWUFBcUIsRUFBRSxnQkFBc0IsRUFBRSxnQkFBcUQsRUFBRSxXQUFvQjtRQUM5SixJQUFNLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtZQUM3QixJQUFJLEVBQUUsUUFBUTtZQUNkLFdBQVcsYUFBQTtZQUNYLFFBQVEsRUFBRSxnQkFBZ0I7U0FDM0IsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxnQkFBZ0IsRUFBRTtZQUNwQixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtnQkFDbEIsU0FBUyxFQUFFLGdCQUFnQjthQUM1QixDQUFDLENBQUM7U0FDSjthQUFNLElBQUksWUFBWSxFQUFFO1lBQ3ZCLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO2dCQUNsQixPQUFPLEVBQUUsWUFBWTthQUN0QixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVLLDhCQUFRLEdBQWQsVUFBZSxRQUFnQixFQUFFLElBQWEsRUFBRSxXQUFvQixFQUFFLFlBQXFCLEVBQUUsZ0JBQXNCLEVBQUUsZ0JBQXFEOzs7Ozs7O3dCQUNsSyxZQUFZLEdBQUcsNEJBQWtCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGFBQUcsSUFBSSxDQUFDLGlCQUFpQiwwQ0FBRSxPQUFPLDBDQUFFLFdBQVcsa0JBQWMsQ0FBQyxDQUFDO3dCQUN6SCxZQUFZLEdBQUcsSUFBSSxrQkFBWSxDQUFDLFlBQVksRUFBRTs0QkFDbEQsUUFBUSxVQUFBOzRCQUNSLFlBQVksY0FBQTs0QkFDWixnQkFBZ0Isa0JBQUE7NEJBQ2hCLGdCQUFnQixrQkFBQTs0QkFDaEIsV0FBVyxhQUFBO3lCQUNaLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7d0JBQ2hELGtCQUFrQixHQUFHLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQzt3QkFDMUMscUJBQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBQTs7d0JBQWhELGVBQWUsR0FBRyxTQUE4Qjt3QkFDdEMscUJBQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxFQUFBOzt3QkFBMUQsT0FBTyxHQUFHLFNBQWdEO3dCQUNoRSxzQkFBTyxPQUFPLEVBQUM7Ozs7S0FDaEI7SUFDSCxrQkFBQztBQUFELENBQUMsQUFqQ0QsQ0FBaUMsdUJBQWMsR0FpQzlDO0FBakNZLGtDQUFXO0FBb0N4QixTQUFnQixzQkFBc0IsQ0FBQyxPQUFlO0lBQ3BELElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1FBQ3BDLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQStCLE9BQVMsQ0FBQyxDQUFDO0tBQzNEO0lBQ0QsT0FBTyxPQUFPLENBQUMsS0FBSyxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDekQsQ0FBQztBQUxELHdEQUtDIn0= \ No newline at end of file +function checkRoleArnFormat(roleArn) { + if (!roleArn.startsWith('acs:ram::')) { + throw new Error("Invalid format of role arn: " + roleArn + ", it should start with 'acs:ram::'"); + } +} +exports.checkRoleArnFormat = checkRoleArnFormat; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9yZXNvdXJjZS9yYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3Q0FBZ0Q7QUFDaEQsMERBQThDO0FBQzlDLG1DQUEwQztBQUMxQyxzQ0FBZ0Q7QUFvQmhELFNBQWdCLHlCQUF5QixDQUFDLFFBQWdCO0lBQ3hELE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDckMsQ0FBQztBQUZELDhEQUVDO0FBRUQ7SUFBaUMsK0JBQWM7SUFBL0M7O0lBaUNBLENBQUM7SUFoQ0MseUNBQW1CLEdBQW5CLFVBQW9CLFFBQWdCLEVBQUUsWUFBcUIsRUFBRSxnQkFBc0IsRUFBRSxnQkFBcUQsRUFBRSxXQUFvQjtRQUM5SixJQUFNLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtZQUM3QixJQUFJLEVBQUUsUUFBUTtZQUNkLFdBQVcsYUFBQTtZQUNYLFFBQVEsRUFBRSxnQkFBZ0I7U0FDM0IsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxnQkFBZ0IsRUFBRTtZQUNwQixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtnQkFDbEIsU0FBUyxFQUFFLGdCQUFnQjthQUM1QixDQUFDLENBQUM7U0FDSjthQUFNLElBQUksWUFBWSxFQUFFO1lBQ3ZCLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO2dCQUNsQixPQUFPLEVBQUUsWUFBWTthQUN0QixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVLLDhCQUFRLEdBQWQsVUFBZSxRQUFnQixFQUFFLElBQWEsRUFBRSxXQUFvQixFQUFFLFlBQXFCLEVBQUUsZ0JBQXNCLEVBQUUsZ0JBQXFEOzs7Ozs7O3dCQUNsSyxZQUFZLEdBQUcsNEJBQWtCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGFBQUcsSUFBSSxDQUFDLGlCQUFpQiwwQ0FBRSxPQUFPLDBDQUFFLFdBQVcsa0JBQWMsQ0FBQyxDQUFDO3dCQUN6SCxZQUFZLEdBQUcsSUFBSSxrQkFBWSxDQUFDLFlBQVksRUFBRTs0QkFDbEQsUUFBUSxVQUFBOzRCQUNSLFlBQVksY0FBQTs0QkFDWixnQkFBZ0Isa0JBQUE7NEJBQ2hCLGdCQUFnQixrQkFBQTs0QkFDaEIsV0FBVyxhQUFBO3lCQUNaLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7d0JBQ2hELGtCQUFrQixHQUFHLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQzt3QkFDMUMscUJBQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBQTs7d0JBQWhELGVBQWUsR0FBRyxTQUE4Qjt3QkFDdEMscUJBQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxFQUFBOzt3QkFBMUQsT0FBTyxHQUFHLFNBQWdEO3dCQUNoRSxzQkFBTyxPQUFPLEVBQUM7Ozs7S0FDaEI7SUFDSCxrQkFBQztBQUFELENBQUMsQUFqQ0QsQ0FBaUMsdUJBQWMsR0FpQzlDO0FBakNZLGtDQUFXO0FBb0N4QixTQUFnQixzQkFBc0IsQ0FBQyxPQUFlO0lBQ3BELGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVCLE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3pELENBQUM7QUFIRCx3REFHQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLE9BQWU7SUFDaEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUU7UUFDcEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBK0IsT0FBTyx1Q0FBc0MsQ0FBQyxDQUFDO0tBQy9GO0FBQ0gsQ0FBQztBQUpELGdEQUlDIn0= \ No newline at end of file diff --git a/dist/lib/utils/utils.d.ts b/dist/lib/utils/utils.d.ts index 1fb1e0e..11a5675 100644 --- a/dist/lib/utils/utils.d.ts +++ b/dist/lib/utils/utils.d.ts @@ -1,2 +1,3 @@ export declare function createProgressBar(format: any, options: any): any; export declare function hasHttpPrefix(s: string): boolean; +export declare function capitalizeFirstLetter(s: string): string; diff --git a/dist/lib/utils/utils.js b/dist/lib/utils/utils.js index 01040b5..809ab2d 100644 --- a/dist/lib/utils/utils.js +++ b/dist/lib/utils/utils.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.hasHttpPrefix = exports.createProgressBar = void 0; +exports.capitalizeFirstLetter = exports.hasHttpPrefix = exports.createProgressBar = void 0; var colors_1 = require("colors"); var progress_1 = __importDefault(require("progress")); function createProgressBar(format, options) { @@ -30,4 +30,8 @@ function hasHttpPrefix(s) { return s.startsWith('http://'); } exports.hasHttpPrefix = hasHttpPrefix; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGlDQUFzQztBQUN0QyxzREFBbUM7QUFFbkMsU0FBZ0IsaUJBQWlCLENBQUMsTUFBTSxFQUFFLE9BQU87SUFDL0MsSUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUN6QixRQUFRLEVBQUUsY0FBSyxDQUFDLEdBQUcsQ0FBQztRQUNwQixVQUFVLEVBQUUsY0FBSyxDQUFDLEdBQUcsQ0FBQztRQUN0QixLQUFLLEVBQUUsRUFBRTtRQUNULEtBQUssRUFBRSxJQUFJO0tBQ1osRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNaLElBQU0sR0FBRyxHQUFHLElBQUksa0JBQVcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDMUMsSUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztJQUNyQixJQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMvQyxhQUFhO0lBQ2IsR0FBRyxDQUFDLElBQUksR0FBRyxVQUFDLEdBQUcsRUFBRSxNQUFNO1FBQ3JCLElBQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDOUIsT0FBTyxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1NBQ3pDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDWCxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDaEMsQ0FBQyxDQUFDO0lBQ0YsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBbEJELDhDQWtCQztBQUVELFNBQWdCLGFBQWEsQ0FBQyxDQUFTO0lBQ3JDLE9BQU8sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUNqQyxDQUFDO0FBRkQsc0NBRUMifQ== \ No newline at end of file +function capitalizeFirstLetter(s) { + return s.charAt(0).toUpperCase() + s.slice(1); +} +exports.capitalizeFirstLetter = capitalizeFirstLetter; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3V0aWxzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGlDQUFzQztBQUN0QyxzREFBbUM7QUFFbkMsU0FBZ0IsaUJBQWlCLENBQUMsTUFBTSxFQUFFLE9BQU87SUFDL0MsSUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUN6QixRQUFRLEVBQUUsY0FBSyxDQUFDLEdBQUcsQ0FBQztRQUNwQixVQUFVLEVBQUUsY0FBSyxDQUFDLEdBQUcsQ0FBQztRQUN0QixLQUFLLEVBQUUsRUFBRTtRQUNULEtBQUssRUFBRSxJQUFJO0tBQ1osRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNaLElBQU0sR0FBRyxHQUFHLElBQUksa0JBQVcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDMUMsSUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztJQUNyQixJQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMvQyxhQUFhO0lBQ2IsR0FBRyxDQUFDLElBQUksR0FBRyxVQUFDLEdBQUcsRUFBRSxNQUFNO1FBQ3JCLElBQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDOUIsT0FBTyxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1NBQ3pDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDWCxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDaEMsQ0FBQyxDQUFDO0lBQ0YsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBbEJELDhDQWtCQztBQUVELFNBQWdCLGFBQWEsQ0FBQyxDQUFTO0lBQ3JDLE9BQU8sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUNqQyxDQUFDO0FBRkQsc0NBRUM7QUFFRCxTQUFnQixxQkFBcUIsQ0FBQyxDQUFTO0lBQzdDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUM7QUFGRCxzREFFQyJ9 \ No newline at end of file diff --git a/package.json b/package.json index 0111ad0..ba3cf09 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fc-delpoy", "main": "./dist/index.js", - "version": "0.0.28", + "version": "0.0.29", "dependencies": { "@alicloud/fc2": "^2.2.2", "@alicloud/pop-core": "^1.7.10", diff --git a/publish.yaml b/publish.yaml index 1df383c..2aa308c 100644 --- a/publish.yaml +++ b/publish.yaml @@ -2,7 +2,7 @@ Type: Component Name: fc-deploy Provider: - 阿里云 -Version: 0.0.28 +Version: 0.0.29 Description: 阿里云函数计算基础组件 HomePage: https://github.com/devsapp/fc-base Tags: