@geek-fun/serverlessinsight 0.2.0 → 0.3.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
     "homepage": "https://serverlessinsight.geekfun.club",
     "main": "dist/src/index.js",
@@ -51,25 +51,31 @@
     "dependencies": {
         "@alicloud/ims20190815": "^2.1.4",
         "@alicloud/openapi-client": "^0.4.12",
-        "@alicloud/ros-cdk-apigateway": "^1.4.0",
-        "@alicloud/ros-cdk-core": "^1.4.0",
-        "@alicloud/ros-cdk-elasticsearchserverless": "^1.4.0",
-        "@alicloud/ros-cdk-fc3": "^1.4.0",
-        "@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/ros-cdk-apigateway": "^1.6.0",
+        "@alicloud/ros-cdk-core": "^1.6.0",
+        "@alicloud/ros-cdk-dns": "^1.6.0",
+        "@alicloud/ros-cdk-ecs": "^1.6.0",
+        "@alicloud/ros-cdk-elasticsearchserverless": "^1.6.0",
+        "@alicloud/ros-cdk-fc3": "^1.6.0",
+        "@alicloud/ros-cdk-nas": "^1.6.0",
+        "@alicloud/ros-cdk-oss": "^1.6.0",
+        "@alicloud/ros-cdk-ossdeployment": "^1.6.0",
+        "@alicloud/ros-cdk-ram": "^1.6.0",
+        "@alicloud/ros-cdk-rds": "^1.6.0",
+        "@alicloud/ros-cdk-sls": "^1.6.0",
         "@alicloud/ros20190910": "^3.5.2",
         "ajv": "^8.17.1",
         "ali-oss": "^6.22.0",
-        "chalk": "^5.3.0",
+        "chalk": "^5.4.1",
         "commander": "^12.1.0",
+        "i": "^0.3.7",
         "i18n": "^0.15.1",
+        "jszip": "^3.10.1",
         "lodash": "^4.17.21",
+        "npm": "^11.1.0",
         "pino": "^9.5.0",
         "pino-pretty": "^13.0.0",
-        "yaml": "^2.6.1"
+        "yaml": "^2.7.0"
     },
     "devDependencies": {
         "@types/ali-oss": "^6.16.11",

package/dist/src/commands/deploy.js

@@ -5,10 +5,10 @@ const stack_1 = require("../stack");
 const common_1 = require("../common");
 const parser_1 = require("../parser");
 const deploy = async (stackName, options) => {
-    const context = (0, common_1.constructActionContext)({ ...options, stackName });
     common_1.logger.info('Validating yaml...');
-    const iac = (0, parser_1.parseYaml)(context.iacLocation);
+    const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
     common_1.logger.info('Yaml is valid! 🎉');
+    const context = (0, common_1.constructActionContext)({ ...options, stackName, iacProvider: iac.provider });
     common_1.logger.info('Deploying stack...');
     await (0, stack_1.deployStack)(stackName, iac, context);
     common_1.logger.info('Stack deployed! 🎉');

package/dist/src/commands/destroy.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroyStack = void 0;
 const common_1 = require("../common");
-const destroyStack = async (stackName) => {
-    const context = (0, common_1.constructActionContext)({ stackName });
-    common_1.logger.info(`Destroying stack ${stackName}...`);
+const parser_1 = require("../parser");
+const destroyStack = async (stackName, options) => {
+    const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
+    const context = (0, common_1.constructActionContext)({ stackName, ...options, iacProvider: iac.provider });
+    common_1.logger.info(`Destroying stack: ${stackName}, provider: ${context.provider}, region: ${context.region}...`);
     await (0, common_1.rosStackDelete)(context);
 };
 exports.destroyStack = destroyStack;

package/dist/src/commands/index.js

@@ -25,20 +25,34 @@ program
     .option('-s, --stage <stage>', 'specify the stage')
     .action((stackName, { file, stage }) => {
     common_1.logger.debug('log command info');
-    (0, validate_1.validate)(file, stage);
+    (0, validate_1.validate)(stackName, { stage, location: file });
 });
 program
     .command('deploy <stackName>')
     .description('deploy serverless Iac yaml')
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-s, --stage <stage>', 'specify the stage')
+    .option('-r, --region <region>', 'specify the region')
+    .option('-pr, --provider <provider>', 'specify the provider')
+    .option('-ak, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
+    .option('-as, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
+    .option('-at, --securityToken <securityToken>', 'specify the SecurityToken')
     .option('-p, --parameter <key=value>', 'override parameters', (value, previous) => {
     const [key, val] = value.split('=');
     previous[key] = val;
     return previous;
 }, {})
-    .action(async (stackName, { file, parameter, stage }) => {
-    await (0, deploy_1.deploy)(stackName, { location: file, parameters: parameter, stage });
+    .action(async (stackName, { stage, parameter, file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
+    await (0, deploy_1.deploy)(stackName, {
+        stage,
+        parameters: parameter,
+        location: file,
+        region,
+        provider,
+        accessKeyId,
+        accessKeySecret,
+        securityToken,
+    });
 });
 program
     .command('template <stackName>')
@@ -51,8 +65,21 @@ program
 });
 program
     .command('destroy <stackName>')
+    .option('-f, --file <path>', 'specify the yaml file')
+    .option('-r, --region <region>', 'specify the region')
+    .option('-pr, --provider <provider>', 'specify the provider')
+    .option('-ak, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
+    .option('-as, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
+    .option('-at, --securityToken <securityToken>', 'specify the SecurityToken')
     .description('destroy serverless stack')
-    .action(async (stackName) => {
-    await (0, destroy_1.destroyStack)(stackName);
+    .action(async (stackName, { file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
+    await (0, destroy_1.destroyStack)(stackName, {
+        location: file,
+        region,
+        provider,
+        accessKeyId,
+        accessKeySecret,
+        securityToken,
+    });
 });
 program.parse();

package/dist/src/commands/validate.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
 const common_1 = require("../common");
 const parser_1 = require("../parser");
-const validate = (location, stage) => {
-    const context = (0, common_1.constructActionContext)({ location, stage });
+const validate = (stackName, options) => {
+    const context = (0, common_1.constructActionContext)({ stackName, ...options });
     (0, parser_1.parseYaml)(context.iacLocation);
     common_1.logger.info('Yaml is valid! 🎉');
 };

package/dist/src/common/actionContext.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructActionContext = exports.getIacLocation = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const providerEnum_1 = require("./providerEnum");
 const getIacLocation = (location) => {
     const projectRoot = node_path_1.default.resolve(process.cwd());
     return location
@@ -17,15 +18,19 @@ const getIacLocation = (location) => {
 exports.getIacLocation = getIacLocation;
 const constructActionContext = (config) => {
     return {
-        stage: config?.stage ?? 'default',
-        stackName: config?.stackName ?? '',
-        region: config?.region ?? process.env.ROS_REGION_ID ?? process.env.ALIYUN_REGION ?? 'cn-hangzhou',
-        accessKeyId: config?.accessKeyId ?? process.env.ALIYUN_ACCESS_KEY_ID,
-        accessKeySecret: config?.accessKeySecret ?? process.env.ALIYUN_ACCESS_KEY_SECRET,
-        securityToken: config?.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
-        iacLocation: (0, exports.getIacLocation)(config?.location),
-        parameters: Object.entries(config?.parameters ?? {}).map(([key, value]) => ({ key, value })),
-        provider: config?.provider,
+        stage: config.stage ?? 'default',
+        stackName: config.stackName ?? '',
+        provider: (config.provider ?? config.iacProvider?.name ?? providerEnum_1.ProviderEnum.ALIYUN),
+        region: config.region ??
+            config.iacProvider?.region ??
+            process.env.ROS_REGION_ID ??
+            process.env.ALIYUN_REGION ??
+            'cn-hangzhou',
+        accessKeyId: config.accessKeyId ?? process.env.ALIYUN_ACCESS_KEY_ID,
+        accessKeySecret: config.accessKeySecret ?? process.env.ALIYUN_ACCESS_KEY_SECRET,
+        securityToken: config.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
+        iacLocation: (0, exports.getIacLocation)(config.location),
+        parameters: Object.entries(config.parameters ?? {}).map(([key, value]) => ({ key, value })),
     };
 };
 exports.constructActionContext = constructActionContext;

package/dist/src/common/base64.js

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

package/dist/src/common/domainHelper.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitDomain = void 0;
+const splitDomain = (domain) => {
+    const parts = domain.split('.');
+    const rr = parts.length > 2 ? parts[0] : '@';
+    const domainName = parts.length > 2 ? parts.slice(1).join('.') : domain;
+    return { rr, domainName };
+};
+exports.splitDomain = splitDomain;

package/dist/src/common/iacHelper.js

@@ -61,7 +61,7 @@ const getFileSource = (fcName, location) => {
     }
     const hash = node_crypto_1.default.createHash('md5').update(node_fs_1.default.readFileSync(filePath)).digest('hex');
     const objectKey = `${fcName}/${hash}-${filePath.split('/').pop()}`;
-    const source = ossDeployment.Source.asset(filePath, {}, `${fcName}/${hash}-`);
+    const source = ossDeployment.Source.asset(filePath, { deployTime: true }, `${fcName}/${hash}-`);
     return { source, objectKey };
 };
 exports.getFileSource = getFileSource;

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

@@ -7,3 +7,5 @@ export * from './iacHelper';
 export * from './constants';
 export * from './imsClient';
 export * from './base64';
+export * from './rosAssets';
+export * from './domainHelper';

package/dist/src/common/index.js

@@ -23,3 +23,5 @@ __exportStar(require("./iacHelper"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./imsClient"), exports);
 __exportStar(require("./base64"), exports);
+__exportStar(require("./rosAssets"), exports);
+__exportStar(require("./domainHelper"), exports);

package/dist/src/common/rosAssets.js

@@ -0,0 +1,152 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishAssets = exports.getAssets = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const ossDeployment = __importStar(require("@alicloud/ros-cdk-ossdeployment"));
+const node_path_1 = __importDefault(require("node:path"));
+const jszip_1 = __importDefault(require("jszip"));
+const logger_1 = require("./logger");
+const lodash_1 = require("lodash");
+const ali_oss_1 = __importDefault(require("ali-oss"));
+const buildAssets = (rootPath, relativePath) => {
+    const location = node_path_1.default.resolve(rootPath, relativePath);
+    if (!node_fs_1.default.existsSync(location)) {
+        throw new Error(`Location: ${location} is not exists!`);
+    }
+    if (node_fs_1.default.lstatSync(location).isFile()) {
+        return [
+            ossDeployment.Source.asset(location, {}, relativePath.substring(0, relativePath.lastIndexOf('/') + 1)),
+        ];
+    }
+    return node_fs_1.default
+        .readdirSync(location)
+        .map((file) => buildAssets(rootPath, `${relativePath}/${file}`.replace(/^\//, '')))
+        .flat();
+};
+const getAssets = (location) => {
+    return buildAssets(location, '');
+};
+exports.getAssets = getAssets;
+const assembleFiles = (folder, zip) => {
+    const files = node_fs_1.default.readdirSync(folder);
+    files.forEach((file) => {
+        const filePath = node_path_1.default.join(folder, file);
+        if (node_fs_1.default.lstatSync(filePath).isFile()) {
+            const content = node_fs_1.default.readFileSync(filePath);
+            zip.file(file, content);
+        }
+        else {
+            const subZip = zip.folder(file);
+            if (subZip) {
+                assembleFiles(filePath, subZip);
+            }
+        }
+    });
+};
+const zipAssets = async (assetsPath) => {
+    const zip = new jszip_1.default();
+    assembleFiles(assetsPath, zip);
+    const zipPath = `${assetsPath.replace(/\/$/, '').trim()}.zip`;
+    await zip
+        .generateAsync({ type: 'nodebuffer' })
+        .then((content) => {
+        node_fs_1.default.writeFileSync(zipPath, content);
+        logger_1.logger.info(`Folder compressed to: ${zipPath}`);
+    })
+        .catch((e) => {
+        logger_1.logger.error(`Failed to compress folder: ${e}`);
+        throw e;
+    });
+    return zipPath;
+};
+const constructAssets = async ({ files, rootPath }, region) => {
+    const assets = await Promise.all(Object.entries(files)
+        .filter(([, fileItem]) => !fileItem.source.path.endsWith('.template.json'))
+        .map(async ([, fileItem]) => {
+        let sourcePath = `${rootPath}/${fileItem.source.path}`;
+        if (fileItem.source.packaging === 'zip') {
+            sourcePath = await zipAssets(`${rootPath}/${fileItem.source.path}`);
+        }
+        return {
+            bucketName: (0, lodash_1.get)(fileItem, 'destinations.current_account-current_region.bucketName', '').replace('${ALIYUN::Region}', region),
+            source: sourcePath,
+            objectKey: (0, lodash_1.get)(fileItem, 'destinations.current_account-current_region.objectKey'),
+        };
+    }));
+    return !(0, lodash_1.isEmpty)(assets) ? assets : undefined;
+};
+const ensureBucketExits = async (bucketName, ossClient) => await ossClient.getBucketInfo(bucketName).catch((err) => {
+    if (err.code === 'NoSuchBucket') {
+        logger_1.logger.info(`Bucket: ${bucketName} not exists, creating...`);
+        return ossClient.putBucket(bucketName, {
+            storageClass: 'Standard',
+            acl: 'private',
+            dataRedundancyType: 'LRS',
+        });
+    }
+    else {
+        throw err;
+    }
+});
+const publishAssets = async (assets, context) => {
+    const constructedAssets = await constructAssets(assets, context.region);
+    if (!constructedAssets?.length) {
+        logger_1.logger.info('No assets to publish, skipped!');
+        return;
+    }
+    const bucketName = constructedAssets[0].bucketName;
+    const client = new ali_oss_1.default({
+        region: `oss-${context.region}`,
+        accessKeyId: context.accessKeyId,
+        accessKeySecret: context.accessKeySecret,
+        bucket: bucketName,
+    });
+    await ensureBucketExits(bucketName, client);
+    const headers = {
+        'x-oss-storage-class': 'Standard',
+        'x-oss-object-acl': 'default',
+        'x-oss-forbid-overwrite': 'false',
+    };
+    await Promise.all(constructedAssets.map(async ({ source, objectKey }) => {
+        await client.put(objectKey, node_path_1.default.normalize(source), { headers });
+        logger_1.logger.info(`Upload file: ${source}) to bucket: ${bucketName} successfully!`);
+    }));
+    return bucketName;
+};
+exports.publishAssets = publishAssets;

package/dist/src/common/rosClient.js

@@ -36,15 +36,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishAssets = exports.rosStackDelete = exports.rosStackDeploy = void 0;
+exports.rosStackDelete = exports.rosStackDeploy = void 0;
 const tea_util_1 = __importDefault(require("@alicloud/tea-util"));
 const ros20190910_1 = __importStar(require("@alicloud/ros20190910"));
 const openapi_client_1 = require("@alicloud/openapi-client");
-const ali_oss_1 = __importDefault(require("ali-oss"));
 const logger_1 = require("./logger");
 const lang_1 = require("../lang");
-const node_path_1 = __importDefault(require("node:path"));
-const lodash_1 = require("lodash");
 const client = new ros20190910_1.default(new openapi_client_1.Config({
     accessKeyId: process.env.ALIYUN_ACCESS_KEY_ID,
     accessKeySecret: process.env.ALIYUN_ACCESS_KEY_SECRET,
@@ -197,52 +194,3 @@ const rosStackDelete = async ({ stackName, region, }) => {
     }
 };
 exports.rosStackDelete = rosStackDelete;
-const ensureBucketExits = async (bucketName, ossClient) => await ossClient.getBucketInfo(bucketName).catch((err) => {
-    if (err.code === 'NoSuchBucket') {
-        logger_1.logger.info(`Bucket: ${bucketName} not exists, creating...`);
-        return ossClient.putBucket(bucketName, {
-            storageClass: 'Standard',
-            acl: 'private',
-            dataRedundancyType: 'LRS',
-        });
-    }
-    else {
-        throw err;
-    }
-});
-const getZipAssets = ({ files, rootPath }, region) => {
-    const zipAssets = Object.entries(files)
-        .filter(([, fileItem]) => fileItem.source.path.endsWith('zip'))
-        .map(([, fileItem]) => ({
-        bucketName: (0, lodash_1.get)(fileItem, 'destinations.current_account-current_region.bucketName', '').replace('${ALIYUN::Region}', region),
-        source: `${rootPath}/${fileItem.source.path}`,
-        objectKey: (0, lodash_1.get)(fileItem, 'destinations.current_account-current_region.objectKey'),
-    }));
-    return !(0, lodash_1.isEmpty)(zipAssets) ? zipAssets : undefined;
-};
-const publishAssets = async (assets, context) => {
-    const zipAssets = getZipAssets(assets, context.region);
-    if (!zipAssets) {
-        logger_1.logger.info('No assets to publish, skipped!');
-        return;
-    }
-    const bucketName = zipAssets[0].bucketName;
-    const client = new ali_oss_1.default({
-        region: `oss-${context.region}`,
-        accessKeyId: context.accessKeyId,
-        accessKeySecret: context.accessKeySecret,
-        bucket: bucketName,
-    });
-    await ensureBucketExits(bucketName, client);
-    const headers = {
-        'x-oss-storage-class': 'Standard',
-        'x-oss-object-acl': 'private',
-        'x-oss-forbid-overwrite': 'false',
-    };
-    await Promise.all(zipAssets.map(async ({ source, objectKey }) => {
-        await client.put(objectKey, node_path_1.default.normalize(source), { headers });
-        logger_1.logger.info(`Upload file: ${source}) to bucket: ${bucketName} successfully!`);
-    }));
-    return bucketName;
-};
-exports.publishAssets = publishAssets;

package/dist/src/parser/bucketParser.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBucket = void 0;
+const types_1 = require("../types");
+const parseBucket = (buckets) => {
+    if (!buckets) {
+        return undefined;
+    }
+    return Object.entries(buckets).map(([key, bucket]) => ({
+        key,
+        name: bucket.name,
+        storage: bucket.storage,
+        versioning: bucket.versioning,
+        security: bucket.security
+            ? {
+                acl: bucket.security.acl
+                    ? bucket.security.acl
+                    : types_1.BucketAccessEnum.PRIVATE,
+                force_delete: bucket.security.force_delete ?? false,
+                sse_algorithm: bucket.security.sse_algorithm,
+                sse_kms_master_key_id: bucket.security.sse_kms_master_key_id,
+            }
+            : undefined,
+        website: bucket.website
+            ? {
+                code: bucket.website.code,
+                domain: bucket.website.domain,
+                index: bucket.website.index ?? 'index.html',
+                error_page: bucket.website.error_page ?? '404.html',
+                error_code: bucket.website.error_code ?? 404,
+            }
+            : undefined,
+    }));
+};
+exports.parseBucket = parseBucket;

package/dist/src/parser/eventParser.js

@@ -10,6 +10,7 @@ const parseEvent = (events) => {
         name: event.name,
         type: event.type,
         triggers: event.triggers,
+        domain: event.domain,
     }));
 };
 exports.parseEvent = parseEvent;

package/dist/src/parser/functionParser.js

@@ -9,12 +9,21 @@ const parseFunction = (functions) => {
     return Object.entries(functions).map(([key, func]) => ({
         key,
         name: func.name,
-        runtime: func.runtime,
-        handler: func.handler,
+        code: func.code,
+        container: func.container,
         memory: func.memory,
+        gpu: func.gpu,
         timeout: func.timeout,
         environment: func.environment,
-        code: func.code,
+        log: func.log,
+        network: func.network,
+        storage: {
+            disk: func.storage?.disk,
+            nas: func.storage?.nas?.map((nasItem) => ({
+                mount_path: nasItem.mount_path,
+                storage_class: nasItem.storage_class,
+            })),
+        },
     }));
 };
 exports.parseFunction = parseFunction;

package/dist/src/parser/index.js

@@ -8,6 +8,7 @@ const databaseParser_1 = require("./databaseParser");
 const tagParser_1 = require("./tagParser");
 const yaml_1 = require("yaml");
 const validator_1 = require("../validator");
+const bucketParser_1 = require("./bucketParser");
 const validateExistence = (path) => {
     if (!(0, node_fs_1.existsSync)(path)) {
         throw new Error(`File does not exist at path: ${path}`);
@@ -24,6 +25,7 @@ const transformYaml = (iacJson) => {
         events: (0, eventParser_1.parseEvent)(iacJson.events),
         databases: (0, databaseParser_1.parseDatabase)(iacJson.databases),
         tags: (0, tagParser_1.parseTag)(iacJson.tags),
+        buckets: (0, bucketParser_1.parseBucket)(iacJson.buckets),
     };
 };
 const parseYaml = (iacLocation) => {

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

@@ -12,13 +12,13 @@ resource "huaweicloud_fgs_application" "${service}_app" {
 const fgsFunction = (fn, context, service) => `
 resource "huaweicloud_fgs_function" "${fn.key}" {
   name = "${fn.name}"
-  handler = "${fn.handler}"
-  runtime = "${fn.runtime}"
+  handler = "${fn.code.handler}"
+  runtime = "${fn.code.runtime}"
   memory_size = ${fn.memory}
   timeout = ${fn.timeout}
   environment = ${JSON.stringify(fn.environment)}
   code_type = "inline"
-  func_code = "${(0, common_1.resolveCode)(fn.code)}"
+  func_code = "${(0, common_1.resolveCode)(fn.code.path)}"
   app = "huaweicloud_fgs_application.${service}_app.id"
 }
 `;