@geek-fun/serverlessinsight 0.1.0 → 0.2.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.1.0",
+    "version": "0.2.1",
     "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
     "homepage": "https://serverlessinsight.geekfun.club",
     "main": "dist/src/index.js",
@@ -58,6 +58,8 @@
         "@alicloud/ros-cdk-oss": "^1.4.0",
         "@alicloud/ros-cdk-ossdeployment": "^1.4.0",
         "@alicloud/ros-cdk-ram": "^1.4.0",
+        "@alicloud/ros-cdk-rds": "^1.5.0",
+        "@alicloud/ros-cdk-sls": "^1.5.0",
         "@alicloud/ros20190910": "^3.5.2",
         "ajv": "^8.17.1",
         "ali-oss": "^6.22.0",

package/dist/src/common/base64.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeBase64 = void 0;
+const encodeBase64 = (str) => Buffer.from(str, 'utf-8').toString('base64');
+exports.encodeBase64 = encodeBase64;

package/dist/src/common/index.d.ts

@@ -6,3 +6,4 @@ export * from './actionContext';
 export * from './iacHelper';
 export * from './constants';
 export * from './imsClient';
+export * from './base64';

package/dist/src/common/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./actionContext"), exports);
 __exportStar(require("./iacHelper"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./imsClient"), exports);
+__exportStar(require("./base64"), exports);

package/dist/src/parser/databaseParser.js

@@ -11,16 +11,22 @@ const parseDatabase = (databases) => {
         name: database.name,
         type: database.type,
         version: database.version,
-        engineMode: database.engine_mode,
         security: {
             basicAuth: {
+                username: (0, lodash_1.get)(database, 'security.basic_auth.master_user'),
                 password: (0, lodash_1.get)(database, 'security.basic_auth.password'),
             },
         },
-        cu: database.cu,
-        storageSize: database.storage_size,
-        network: database.network && {
-            public: database.network?.public,
+        cu: {
+            min: database.cu?.min ?? 0,
+            max: database.cu?.max ?? 6,
+        },
+        storage: {
+            min: database.storage?.min ?? 20,
+        },
+        network: {
+            type: database.network?.type ?? 'PRIVATE',
+            ingressRules: database.network?.ingress_rules ?? ['0.0.0.0/0'],
         },
     }));
 };

package/dist/src/parser/functionParser.js

@@ -15,6 +15,7 @@ const parseFunction = (functions) => {
         timeout: func.timeout,
         environment: func.environment,
         code: func.code,
+        log: func.log,
     }));
 };
 exports.parseFunction = parseFunction;

package/dist/src/stack/rosStack/database.js

@@ -34,19 +34,187 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDatabases = void 0;
+const rds = __importStar(require("@alicloud/ros-cdk-rds"));
 const common_1 = require("../../common");
-const types_1 = require("../../types");
 const lodash_1 = require("lodash");
 const esServerless = __importStar(require("@alicloud/ros-cdk-elasticsearchserverless"));
+const rdsEngineMap = new Map([
+    [
+        `${"RDS_MYSQL_SERVERLESS" /* DatabaseEnum.RDS_MYSQL_SERVERLESS */}-${"MYSQL_5.7" /* DatabaseVersionEnum['MYSQL_5.7'] */}`,
+        {
+            engine: 'MySQL',
+            version: '5.7',
+            category: 'serverless_basic',
+            dbInstanceClass: 'mysql.n2.serverless.1c',
+            quota: { minCapacity: 0.5, maxCapacity: 32, ha: false },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: true, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_MYSQL_SERVERLESS" /* DatabaseEnum.RDS_MYSQL_SERVERLESS */}-${"MYSQL_8.0" /* DatabaseVersionEnum['MYSQL_8.0'] */}`,
+        {
+            engine: 'MySQL',
+            version: '8.0',
+            category: 'serverless_basic',
+            dbInstanceClass: 'mysql.n2.serverless.1c',
+            quota: { minCapacity: 0.5, maxCapacity: 32, ha: false },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: true, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_MYSQL_SERVERLESS" /* DatabaseEnum.RDS_MYSQL_SERVERLESS */}-${"MYSQL_HA_5.7" /* DatabaseVersionEnum['MYSQL_HA_5.7'] */}`,
+        {
+            engine: 'MySQL',
+            version: '5.7',
+            category: 'serverless_standard',
+            dbInstanceClass: 'mysql.n2.serverless.2c',
+            quota: { minCapacity: 0.5, maxCapacity: 32, ha: true },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: true, encryption: true },
+        },
+    ],
+    [
+        `${"RDS_MYSQL_SERVERLESS" /* DatabaseEnum.RDS_MYSQL_SERVERLESS */}-${"MYSQL_HA_8.0" /* DatabaseVersionEnum['MYSQL_HA_8.0'] */}`,
+        {
+            engine: 'MySQL',
+            version: '8.0',
+            category: 'serverless_standard',
+            dbInstanceClass: 'mysql.n2.serverless.2c',
+            quota: { minCapacity: 0.5, maxCapacity: 32, ha: true },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: true, encryption: true },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_14" /* DatabaseVersionEnum['PGSQL_14'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '14.0',
+            category: 'serverless_basic',
+            dbInstanceClass: 'pg.n2.serverless.1c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: false },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_15" /* DatabaseVersionEnum['PGSQL_15'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '15.0',
+            category: 'serverless_basic',
+            dbInstanceClass: 'pg.n2.serverless.1c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: false },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_16" /* DatabaseVersionEnum['PGSQL_16'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '16.0',
+            category: 'serverless_basic',
+            dbInstanceClass: 'pg.n2.serverless.1c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: false },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_HA_14" /* DatabaseVersionEnum['PGSQL_HA_14'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '14.0',
+            category: 'serverless_standard',
+            dbInstanceClass: 'pg.n2.serverless.2c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: true },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_HA_15" /* DatabaseVersionEnum['PGSQL_HA_15'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '15.0',
+            category: 'serverless_standard',
+            dbInstanceClass: 'pg.n2.serverless.2c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: true },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */}-${"PGSQL_HA_16" /* DatabaseVersionEnum['PGSQL_HA_16'] */}`,
+        {
+            engine: 'PostgreSQL',
+            version: '16.0',
+            category: 'serverless_standard',
+            dbInstanceClass: 'pg.n2.serverless.2c',
+            quota: { minCapacity: 0.5, maxCapacity: 14, ha: true },
+            storage: { type: 'general_essd', bursting: true, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_MSSQL_SERVERLESS" /* DatabaseEnum.RDS_MSSQL_SERVERLESS */}-${"MSSQL_HA_2016" /* DatabaseVersionEnum['MSSQL_HA_2016'] */}`,
+        {
+            engine: 'SQLServer',
+            version: '2016_std_sl',
+            category: 'serverless_ha',
+            dbInstanceClass: 'mssql.mem2.serverless.s2',
+            quota: { minCapacity: 2, maxCapacity: 8, ha: true },
+            storage: { type: 'cloud_essd', bursting: false, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_MSSQL_SERVERLESS" /* DatabaseEnum.RDS_MSSQL_SERVERLESS */}-${"MSSQL_HA_2017" /* DatabaseVersionEnum['MSSQL_HA_2017'] */}`,
+        {
+            engine: 'SQLServer',
+            version: '2017_std_sl',
+            category: 'serverless_ha',
+            dbInstanceClass: 'mssql.mem2.serverless.s2',
+            quota: { minCapacity: 2, maxCapacity: 8, ha: true },
+            storage: { type: 'cloud_essd', bursting: false, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"RDS_MSSQL_SERVERLESS" /* DatabaseEnum.RDS_MSSQL_SERVERLESS */}-${"MSSQL_HA_2019" /* DatabaseVersionEnum['MSSQL_HA_2019'] */}`,
+        {
+            engine: 'SQLServer',
+            version: '2019_std_sl',
+            category: 'serverless_ha',
+            dbInstanceClass: 'mssql.mem2.serverless.s2',
+            quota: { minCapacity: 2, maxCapacity: 8, ha: true },
+            storage: { type: 'cloud_essd', bursting: false, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"ELASTICSEARCH_SERVERLESS" /* DatabaseEnum.ELASTICSEARCH_SERVERLESS */}-${"ES_SEARCH_7.10" /* DatabaseVersionEnum['ES_SEARCH_7.10'] */}`,
+        {
+            engine: 'Elasticsearch',
+            version: '7.10',
+            category: 'STANDARD',
+            dbInstanceClass: '',
+            quota: { minCapacity: 2, maxCapacity: 8, ha: false },
+            storage: { type: 'cloud_essd', bursting: false, optimizedWrites: false, encryption: false },
+        },
+    ],
+    [
+        `${"ELASTICSEARCH_SERVERLESS" /* DatabaseEnum.ELASTICSEARCH_SERVERLESS */}-${"ES_TIME_SERIES_7.10" /* DatabaseVersionEnum['ES_TIME_SERIES_7.10'] */}`,
+        {
+            engine: 'Elasticsearch',
+            version: '7.10',
+            category: 'TRIAL',
+            dbInstanceClass: '',
+            quota: { minCapacity: 2, maxCapacity: 8, ha: false },
+            storage: { type: 'cloud_essd', bursting: false, optimizedWrites: false, encryption: false },
+        },
+    ],
+]);
 const resolveDatabases = (scope, databases, context) => {
     if ((0, lodash_1.isEmpty)(databases)) {
         return undefined;
     }
     databases.forEach((db) => {
-        if ([types_1.DatabaseEnum.ELASTICSEARCH_SERVERLESS].includes(db.type)) {
+        const { engine, version, category, dbInstanceClass, quota, storage } = rdsEngineMap.get(`${db.type}-${db.version}`) ?? {};
+        if (["ELASTICSEARCH_SERVERLESS" /* DatabaseEnum.ELASTICSEARCH_SERVERLESS */].includes(db.type)) {
             new esServerless.App(scope, (0, common_1.replaceReference)(db.key, context), {
                 appName: (0, common_1.replaceReference)(db.name, context),
-                appVersion: db.version,
+                appVersion: version,
                 authentication: {
                     basicAuth: [
                         {
@@ -55,9 +223,9 @@ const resolveDatabases = (scope, databases, context) => {
                     ],
                 },
                 quotaInfo: {
-                    cu: db.cu,
-                    storage: db.storageSize,
-                    appType: db.engineMode === types_1.DatabaseEngineMode.TIMESERIES ? 'TRIAL' : 'STANDARD',
+                    cu: db.cu.min,
+                    storage: db.storage.min,
+                    appType: category,
                 },
                 // network: [
                 //   {
@@ -73,6 +241,74 @@ const resolveDatabases = (scope, databases, context) => {
                 // ],
             }, true);
         }
+        if ([
+            "RDS_MYSQL_SERVERLESS" /* DatabaseEnum.RDS_MYSQL_SERVERLESS */,
+            "RDS_PGSQL_SERVERLESS" /* DatabaseEnum.RDS_PGSQL_SERVERLESS */,
+            "RDS_MSSQL_SERVERLESS" /* DatabaseEnum.RDS_MSSQL_SERVERLESS */,
+        ].includes(db.type)) {
+            new rds.DBInstance(scope, (0, common_1.replaceReference)(db.key, context), {
+                engine: engine,
+                /**
+                 * Serverless 实例
+                 *    MySQL：5.7、8.0  - MYSQL_HA_5.7, MYSQL_5.7, MYSQL_HA_8.0, MYSQL_8.0
+                 *    SQL Server：2016_std_sl、2017_std_sl、2019_std_sl  - MSSQL_HA_2016, MSSQL_HA_2017, MSSQL_HA_2019
+                 *    PostgreSQL：14.0、15.0、16.0 - PGSQL_HA_14, PGSQL_14 PGSQL_HA_15, PGSQL_15, PGSQL_HA_16,PGSQL_16
+                 */
+                engineVersion: version,
+                dbInstanceStorage: (0, common_1.replaceReference)(db.storage.min, context),
+                /** Serverless 实例
+                 *     serverless_basic：Serverless 基础系列。（仅适用 MySQL 和 PostgreSQL）
+                 *     serverless_standard：Serverless 高可用系列。（仅适用 MySQL 和 PostgreSQL）
+                 *     serverless_ha：SQL Server Serverless 高可用系列。
+                 */
+                category,
+                /**
+                 * MySQL:
+                 *    MySQL 基础系列：mysql.n2.serverless.1c
+                 *    MySQL 高可用系列：mysql.n2.serverless.2c
+                 * SQL Server：
+                 *    mssql.mem2.serverless.s2
+                 * PostgreSQL
+                 *    基础系列：pg.n2.serverless.1c
+                 *    高可用系列：pg.n2.serverless.2c
+                 */
+                dbInstanceClass: dbInstanceClass,
+                /**
+                 * 实例存储类型，取值：
+                 *  cloud_essd：ESSD PL1 云盘。
+                 *  general_essd：通用云盘（推荐）。
+                 */
+                dbInstanceStorageType: storage.type,
+                burstingEnabled: storage.bursting,
+                payType: 'Serverless',
+                /**
+                 * MaxCapacity:
+                 *    MySQL：1~32
+                 *    SQL Server：2~8
+                 *    PostgreSQL：1~14
+                 * MinCapacity:
+                 *    MySQL：0.5~32
+                 *    SQL Server：2~8（仅支持整数）
+                 *    PostgreSQL：0.5~14
+                 */
+                serverlessConfig: {
+                    // @TODO db.cu.min should get parameter value when it refer to a parameter
+                    minCapacity: (0, common_1.replaceReference)(db.cu.min === 0 ? quota.minCapacity : db.cu.min + quota.minCapacity, context),
+                    maxCapacity: (0, common_1.replaceReference)(db.cu.max + quota.minCapacity <= quota.maxCapacity
+                        ? db.cu.max + quota.minCapacity
+                        : quota.maxCapacity, context),
+                    autoPause: db.cu.min === 0,
+                    switchForce: false,
+                },
+                masterUsername: (0, common_1.replaceReference)(db.security.basicAuth.username, context),
+                masterUserPassword: (0, common_1.replaceReference)(db.security.basicAuth.password, context),
+                masterUserType: 'Super',
+                multiAz: quota.ha,
+                securityIpList: (0, common_1.replaceReference)(db.network.ingressRules.join(','), context),
+                connectionStringType: db.network.type === 'PRIVATE' ? 'Inner' : 'Public',
+                dbInstanceNetType: db.network.type === 'PRIVATE' ? 'Intranet' : 'Internet',
+            }, true);
+        }
     });
 };
 exports.resolveDatabases = resolveDatabases;

package/dist/src/stack/rosStack/event.js

@@ -80,6 +80,7 @@ const resolveEvents = (scope, events, tags, context, service) => {
         const apiGatewayGroup = new agw.RosGroup(scope, (0, common_1.replaceReference)(`${service}_apigroup`, context), {
             groupName: (0, common_1.replaceReference)(`${service}_apigroup`, context),
             tags: (0, common_1.replaceReference)(tags, context),
+            passthroughHeaders: 'host',
         }, true);
         // new agw.RosCustomDomain(
         //   this,
@@ -95,11 +96,12 @@ const resolveEvents = (scope, events, tags, context, service) => {
         // );
         apiGateway.forEach((event) => {
             event.triggers.forEach((trigger) => {
-                const key = `${trigger.method}_${trigger.path}`.toLowerCase().replace(/\//g, '_');
-                const api = new agw.RosApi(scope, (0, common_1.replaceReference)(`${event.key}_api_${key}`, context), {
+                const key = (0, common_1.encodeBase64)((0, common_1.replaceReference)(`${trigger.method}_${trigger.path}`, context)).replace(/=+$/, '');
+                const api = new agw.RosApi(scope, `${event.key}_api_${key}`, {
                     apiName: (0, common_1.replaceReference)(`${event.name}_api_${key}`, context),
                     groupId: apiGatewayGroup.attrGroupId,
                     visibility: 'PRIVATE',
+                    authType: 'ANONYMOUS',
                     requestConfig: {
                         requestProtocol: 'HTTP',
                         requestHttpMethod: (0, common_1.replaceReference)(trigger.method, context),
@@ -113,13 +115,20 @@ const resolveEvents = (scope, events, tags, context, service) => {
                             functionName: (0, common_1.replaceReference)(trigger.backend, context),
                             roleArn: gatewayAccessRole.attrArn,
                             fcVersion: '3.0',
+                            method: (0, common_1.replaceReference)(trigger.method, context),
                         },
                     },
                     resultSample: 'ServerlessInsight resultSample',
-                    resultType: 'JSON',
+                    resultType: 'PASSTHROUGH',
                     tags: (0, common_1.replaceReference)(tags, context),
                 }, true);
                 api.addDependsOn(apiGatewayGroup);
+                new agw.Deployment(scope, `${service}_deployment`, {
+                    apiId: api.attrApiId,
+                    groupId: apiGatewayGroup.attrGroupId,
+                    stageName: 'RELEASE',
+                    description: `${service} Api Gateway deployment`,
+                });
             });
         });
     }

package/dist/src/stack/rosStack/function.js

@@ -39,10 +39,31 @@ const fc = __importStar(require("@alicloud/ros-cdk-fc3"));
 const lodash_1 = require("lodash");
 const ossDeployment = __importStar(require("@alicloud/ros-cdk-ossdeployment"));
 const ros = __importStar(require("@alicloud/ros-cdk-core"));
-const resolveFunctions = (scope, functions, context, service) => {
+const sls = __importStar(require("@alicloud/ros-cdk-sls"));
+const resolveFunctions = (scope, functions, tags, context, service) => {
     if ((0, lodash_1.isEmpty)(functions)) {
         return undefined;
     }
+    let logConfig = undefined;
+    const enableLog = functions?.some(({ log }) => log);
+    const slsService = new sls.Project(scope, `${service}_sls`, { name: `${service}-sls`, tags: (0, common_1.replaceReference)(tags, context) }, true);
+    const slsLogstore = new sls.Logstore(scope, `${service}_sls_logstore`, {
+        logstoreName: `${service}-sls-logstore`,
+        projectName: slsService.attrName,
+        ttl: 7,
+    }, true);
+    new sls.Index(scope, `${service}_sls_index`, {
+        projectName: slsService.attrName,
+        logstoreName: slsLogstore.attrLogstoreName,
+        fullTextIndex: { enable: true },
+    }, true);
+    if (enableLog) {
+        logConfig = {
+            project: slsLogstore.attrProjectName,
+            logstore: slsLogstore.attrLogstoreName,
+            enableRequestMetrics: true,
+        };
+    }
     const fileSources = functions
         ?.filter(({ code }) => (0, common_1.readCodeSize)(code) > common_1.CODE_ZIP_SIZE_LIMIT)
         .map(({ code, name }) => {
@@ -79,7 +100,13 @@ const resolveFunctions = (scope, functions, context, service) => {
             timeout: (0, common_1.replaceReference)(fnc.timeout, context),
             environmentVariables: (0, common_1.replaceReference)(fnc.environment, context),
             code,
+            logConfig,
         }, true);
+        if (enableLog) {
+            fcn.addRosDependency(`${service}_sls`);
+            fcn.addRosDependency(`${service}_sls_logstore`);
+            fcn.addRosDependency(`${service}_sls_index`);
+        }
         if (storeInBucket) {
             fcn.addRosDependency(`${service}_artifacts_code_deployment`);
         }

package/dist/src/stack/rosStack/index.js

@@ -59,7 +59,7 @@ class RosStack extends ros.Stack {
         // Define Mappings
         (0, stage_1.resolveStages)(this, iac.stages, context);
         // Define functions
-        (0, function_1.resolveFunctions)(this, iac.functions, context, this.service);
+        (0, function_1.resolveFunctions)(this, iac.functions, iac.tags, context, this.service);
         // Define Events
         (0, event_1.resolveEvents)(this, iac.events, iac.tags, context, this.service);
         // Define Databases

package/dist/src/types/domains/database.js

@@ -1,12 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseEnum = exports.DatabaseEngineMode = void 0;
-var DatabaseEngineMode;
-(function (DatabaseEngineMode) {
-    DatabaseEngineMode["SEARCH"] = "SEARCH";
-    DatabaseEngineMode["TIMESERIES"] = "TIMESERIES";
-})(DatabaseEngineMode || (exports.DatabaseEngineMode = DatabaseEngineMode = {}));
-var DatabaseEnum;
-(function (DatabaseEnum) {
-    DatabaseEnum["ELASTICSEARCH_SERVERLESS"] = "ELASTICSEARCH_SERVERLESS";
-})(DatabaseEnum || (exports.DatabaseEnum = DatabaseEnum = {}));

package/dist/src/validator/databaseSchema.js

@@ -9,20 +9,57 @@ exports.databaseSchema = {
             type: 'object',
             properties: {
                 name: { type: 'string' },
-                type: { type: 'string', enum: ['ELASTICSEARCH_SERVERLESS'] },
-                version: { type: 'string' },
-                engine_mode: { type: 'string', enum: ['SEARCH', 'TIMESERIES'] },
-                cu: { type: 'number' },
-                storage_size: { type: 'number' },
+                type: {
+                    type: 'string',
+                    enum: [
+                        'ELASTICSEARCH_SERVERLESS',
+                        'RDS_MYSQL_SERVERLESS',
+                        'RDS_PGSQL_SERVERLESS',
+                        'RDS_MSSQL_SERVERLESS',
+                    ],
+                },
+                version: {
+                    type: 'string',
+                    enum: [
+                        'MYSQL_5.7',
+                        'MYSQL_8.0',
+                        'MYSQL_HA_5.7',
+                        'MYSQL_HA_8.0',
+                        'PGSQL_14',
+                        'PGSQL_15',
+                        'PGSQL_16',
+                        'PGSQL_HA_14',
+                        'PGSQL_HA_15',
+                        'PGSQL_HA_16',
+                        'MSSQL_HA_2016',
+                        'MSSQL_HA_2017',
+                        'MSSQL_HA_2019',
+                        'ES_SEARCH_7.10',
+                        'ES_TIME_SERIES_7.10',
+                    ],
+                },
+                cu: {
+                    type: 'object',
+                    properties: {
+                        min: { type: 'integer', minimum: 0, maximum: 32 },
+                        max: { type: 'integer', minimum: 1, maximum: 32 },
+                    },
+                },
+                storage: {
+                    type: 'object',
+                    properties: { min: { type: 'integer', minimum: 20 } },
+                    required: ['min'],
+                },
                 security: {
                     type: 'object',
                     properties: {
                         basic_auth: {
                             type: 'object',
                             properties: {
+                                master_user: { type: 'string' },
                                 password: { type: 'string' },
                             },
-                            required: ['password'],
+                            required: ['master_user', 'password'],
                         },
                     },
                     required: ['basic_auth'],
@@ -30,11 +67,16 @@ exports.databaseSchema = {
                 network: {
                     type: 'object',
                     properties: {
+                        type: { type: 'string', enum: ['PUBLIC', 'PRIVATE'] },
+                        ingress_rules: {
+                            type: 'array',
+                            items: { type: 'string' },
+                        },
                         public: { type: 'boolean' },
                     },
                 },
             },
-            required: ['name', 'type', 'version', 'security', 'cu', 'storage_size'],
+            required: ['name', 'type', 'version', 'security'],
             additionalProperties: false,
         },
     },

package/dist/src/validator/functionSchema.js

@@ -7,6 +7,7 @@ exports.functionSchema = {
     patternProperties: {
         '.*': {
             type: 'object',
+            required: ['name', 'runtime', 'handler', 'code'],
             properties: {
                 name: { type: 'string' },
                 runtime: {
@@ -32,6 +33,7 @@ exports.functionSchema = {
                 code: { type: 'string' },
                 memory: { type: 'number' },
                 timeout: { type: 'number' },
+                log: { type: 'boolean' },
                 environment: {
                     type: 'object',
                     additionalProperties: {

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/actionContext.ts","../src/common/constants.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/rosStack.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts"],"version":"5.7.2"}
+{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/actionContext.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts"],"version":"5.7.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",
@@ -58,6 +58,8 @@
     "@alicloud/ros-cdk-oss": "^1.4.0",
     "@alicloud/ros-cdk-ossdeployment": "^1.4.0",
     "@alicloud/ros-cdk-ram": "^1.4.0",
+    "@alicloud/ros-cdk-rds": "^1.5.0",
+    "@alicloud/ros-cdk-sls": "^1.5.0",
     "@alicloud/ros20190910": "^3.5.2",
     "ajv": "^8.17.1",
     "ali-oss": "^6.22.0",

package/samples/aliyun-poc-es.yml

@@ -0,0 +1,30 @@
+version: 0.0.1
+
+provider:
+  name: aliyun
+  region: cn-chengdu
+
+
+service: insight-db-poc
+
+tags:
+  owner: geek-fun
+
+databases:
+  #  insight_es_db:
+  #    name: insight-poc-es
+  #    type: ELASTICSEARCH_SERVERLESS
+  #    version: '7.10'
+  #    engine_mode: SEARCH
+  #    cu: 1
+  #    storage_size: 20
+  #    security:
+  #      basic_auth:
+  #        password: 'U34I6InQ8elseTgqTWT2t2oFXpoqFg'
+  insight_poc_db:
+    name: insight-poc-rds
+    type: RDS_PGSQL_SERVERLESS
+    version: PGSQL_16
+    security:
+      basic_auth:
+        password: 'U34I6InQ8elseTgqTWT2t2oFXpoqFg'

package/samples/aliyun-poc-fc.yml

@@ -0,0 +1,60 @@
+version: 0.0.1
+provider:
+  name: aliyun
+  region: cn-chengdu
+
+vars:
+  region: cn-hangzhou
+  testv: testVarValue
+  handler: index.handler
+
+stages:
+  default:
+    region: ${vars.region}
+    node_env: default
+  dev:
+    region: ${vars.region}
+    node_env: development
+  prod:
+    region: cn-shanghai
+
+service: insight-poc
+
+tags:
+  owner: geek-fun
+
+functions:
+  insight_poc_fn:
+    name: insight-poc-fn
+    runtime: nodejs18
+    handler: ${vars.handler}
+    code: tests/fixtures/artifacts/artifact.zip
+    memory: 512
+    timeout: 10
+    environment:
+      NODE_ENV: ${stages.node_env}
+      TEST_VAR: ${vars.testv}
+      TEST_VAR_EXTRA: abcds-${vars.testv}-andyou
+
+databases:
+  insight_poc_db:
+    name: insight-poc-db
+    type: RDS_POSTGRESQL_SERVERLESS
+    version: '17.0'
+    security:
+      basic_auth:
+        password: 'U34I6InQ8elseTgqTWT2t2oFXpoqFg'
+
+events:
+  gateway_event:
+    type: API_GATEWAY
+    name: insight-poc-gateway
+    triggers:
+      - method: GET
+        path: /api/hello
+        backend: ${functions.insight_poc_fn}
+#    custom_domain:
+#      domain_name: test.com
+#      certificate_name: test
+#      certificate_private_key: test
+#      certificate_body: test

package/samples/aliyun-poc-rds.yml

@@ -0,0 +1,24 @@
+version: 0.0.1
+
+provider:
+  name: aliyun
+  region: cn-chengdu
+
+
+service: insight-rds-poc
+
+tags:
+  owner: geek-fun
+
+databases:
+  insight_poc_db:
+    name: insight-poc-rds
+    type: RDS_PGSQL_SERVERLESS
+    version: PGSQL_16
+    security:
+      basic_auth:
+        master_user: 'db_root'
+        password: 'U34I6InQ8elseTgqTWT2t2oFXpoqFg'
+    network:
+      type: 'PRIVATE'
+

package/samples/huawei-poc-fc.yml

@@ -0,0 +1,60 @@
+version: 0.0.1
+provider:
+  name: huawei
+  region: cn-north-4
+
+vars:
+  testv: testVarValue
+  handler: index.handler
+
+stages:
+  default:
+    node_env: default
+  dev:
+    region: ${vars.region}
+    node_env: development
+  prod:
+    node_env: prod
+service: insight-poc
+
+tags:
+  owner: geek-fun
+
+functions:
+  insight_poc_fn:
+    name: insight-poc-fn
+    runtime: nodejs18
+    handler: ${vars.handler}
+    code: tests/fixtures/artifacts/artifact.zip
+    memory: 512
+    timeout: 10
+    environment:
+      NODE_ENV: ${stages.node_env}
+      TEST_VAR: ${vars.testv}
+      TEST_VAR_EXTRA: abcds-${vars.testv}-andyou
+
+#databases:
+#  insight_es_db:
+#    name: insight-poc-es
+#    type: ELASTICSEARCH_SERVERLESS
+#    version: 7.10
+#    engine_mode: SEARCH
+#    security:
+#      basic_auth:
+#        password: 123456
+#    cu: 1
+#    storage_size: 20
+
+events:
+  gateway_event:
+    type: API_GATEWAY
+    name: insight-poc-gateway
+    triggers:
+      - method: GET
+        path: /api/hello
+        backend: ${functions.insight_poc_fn}
+#    custom_domain:
+#      domain_name: test.com
+#      certificate_name: test
+#      certificate_private_key: test
+#      certificate_body: test

package/dist/src/stack/rosStack/rosStack.js

@@ -1 +0,0 @@
-"use strict";