@geek-fun/serverlessinsight 0.3.0 → 0.3.1

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

@@ -78,41 +78,41 @@ const resolveBuckets = (scope, buckets, context) => {
         }, true);
     }
     buckets.forEach((bucket) => {
-        const ossBucket = new oss.Bucket(scope, (0, common_1.replaceReference)(bucket.key, context), {
-            bucketName: (0, common_1.replaceReference)(bucket.name, context),
-            accessControl: aclMap.get((0, common_1.replaceReference)(bucket.security?.acl, context) ?? ''),
+        const ossBucket = new oss.Bucket(scope, bucket.key, {
+            bucketName: (0, common_1.calcRefs)(bucket.name, context),
+            accessControl: aclMap.get((0, common_1.calcRefs)(bucket.security?.acl, context) ?? ''),
             websiteConfigurationV2: bucket.website
                 ? {
                     indexDocument: {
                         type: '0',
-                        suffix: (0, common_1.replaceReference)(bucket.website.index, context),
+                        suffix: (0, common_1.calcRefs)(bucket.website.index, context),
                         supportSubDir: 'true',
                     },
                     errorDocument: {
-                        httpStatus: `${(0, common_1.replaceReference)(bucket.website.error_code, context)}`,
-                        key: (0, common_1.replaceReference)(bucket.website.error_page, context),
+                        httpStatus: `${(0, common_1.calcRefs)(bucket.website.error_code, context)}`,
+                        key: (0, common_1.calcRefs)(bucket.website.error_page, context),
                     },
                 }
                 : undefined,
         });
         if (bucket.website?.code) {
-            const filePath = node_path_1.default.resolve(process.cwd(), (0, common_1.replaceReference)(bucket.website.code, context));
-            new ossDeployment.BucketDeployment(scope, `si_auto_${bucket.key}_bucket_code_deployment`, {
+            const filePath = node_path_1.default.resolve(process.cwd(), (0, common_1.calcValue)(bucket.website.code, context));
+            new ossDeployment.BucketDeployment(scope, (0, common_1.formatRosId)(`si_auto_${bucket.key}_bucket_code_deployment`), {
                 sources: (0, common_1.getAssets)(filePath),
                 destinationBucket: ossBucket.attrName,
                 roleArn: siAutoOssDeploymentBucketRole.attrArn,
-                timeout: 3000,
+                timeout: common_1.OSS_DEPLOYMENT_TIMEOUT,
                 logMonitoring: false,
                 retainOnCreate: false,
             }, true);
         }
         if (bucket.website?.domain) {
             const { rr, domainName } = (0, common_1.splitDomain)(bucket.website.domain);
-            new oss.Domain(scope, `${bucket.key}_custom_domain_${(0, common_1.encodeBase64ForRosId)(bucket.website.domain)}`, {
+            new oss.Domain(scope, (0, common_1.formatRosId)(`${bucket.key}_custom_domain`), {
                 bucketName: ossBucket.attrName,
-                domainName: (0, common_1.replaceReference)(bucket.website.domain, context),
+                domainName: (0, common_1.calcRefs)(bucket.website.domain, context),
             });
-            new dns.DomainRecord(scope, `${bucket.key}_custom_domain_record_${(0, common_1.encodeBase64ForRosId)(bucket.website.domain)}`, {
+            new dns.DomainRecord(scope, (0, common_1.formatRosId)(`${bucket.key}_custom_domain_record`), {
                 domainName: domainName,
                 rr,
                 type: 'CNAME',

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

@@ -212,13 +212,13 @@ const resolveDatabases = (scope, databases, context) => {
     databases.forEach((db) => {
         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),
+            new esServerless.App(scope, db.key, {
+                appName: (0, common_1.calcRefs)(db.name, context),
                 appVersion: version,
                 authentication: {
                     basicAuth: [
                         {
-                            password: (0, common_1.replaceReference)(db.security.basicAuth.password, context),
+                            password: (0, common_1.calcRefs)(db.security.basicAuth.password, context),
                         },
                     ],
                 },
@@ -246,7 +246,7 @@ const resolveDatabases = (scope, databases, context) => {
             "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), {
+            new rds.DBInstance(scope, db.key, {
                 engine: engine,
                 /**
                  * Serverless 实例
@@ -255,7 +255,7 @@ const resolveDatabases = (scope, databases, context) => {
                  *    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),
+                dbInstanceStorage: (0, common_1.calcRefs)(db.storage.min, context),
                 /** Serverless 实例
                  *     serverless_basic：Serverless 基础系列。（仅适用 MySQL 和 PostgreSQL）
                  *     serverless_standard：Serverless 高可用系列。（仅适用 MySQL 和 PostgreSQL）
@@ -293,18 +293,18 @@ const resolveDatabases = (scope, databases, context) => {
                  */
                 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
+                    minCapacity: (0, common_1.calcRefs)(db.cu.min === 0 ? quota.minCapacity : db.cu.min + quota.minCapacity, context),
+                    maxCapacity: (0, common_1.calcRefs)(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),
+                masterUsername: (0, common_1.calcRefs)(db.security.basicAuth.username, context),
+                masterUserPassword: (0, common_1.calcRefs)(db.security.basicAuth.password, context),
                 masterUserType: 'Super',
                 multiAz: quota.ha,
-                securityIpList: (0, common_1.replaceReference)(db.network.ingressRules.join(','), context),
+                securityIpList: (0, common_1.calcRefs)(db.network.ingressRules.join(','), context),
                 connectionStringType: db.network.type === 'PRIVATE' ? 'Inner' : 'Public',
                 dbInstanceNetType: db.network.type === 'PRIVATE' ? 'Intranet' : 'Internet',
             }, true);

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

@@ -48,9 +48,9 @@ const resolveEvents = (scope, events, tags, context, service) => {
     if (!apiGateway?.length)
         return;
     apiGateway.forEach((event) => {
-        const gatewayAccessRole = new ram.RosRole(scope, (0, common_1.replaceReference)(`${event.key}_role`, context), {
-            roleName: (0, common_1.replaceReference)(`${service}-${event.name}-agw-access-role`, context),
-            description: (0, common_1.replaceReference)(`${service} role`, context),
+        const gatewayAccessRole = new ram.RosRole(scope, (0, common_1.formatRosId)(`${event.key}_agw_role`), {
+            roleName: (0, common_1.calcRefs)(`${event.name}-agw-access-role`, context),
+            description: (0, common_1.calcRefs)(`${service} role`, context),
             assumeRolePolicyDocument: {
                 version: '1',
                 statement: [
@@ -65,7 +65,7 @@ const resolveEvents = (scope, events, tags, context, service) => {
             },
             policies: [
                 {
-                    policyName: (0, common_1.replaceReference)(`${service}-${event.name}-policy`, context),
+                    policyName: (0, common_1.calcRefs)(`${service}-${event.name}-policy`, context),
                     policyDocument: {
                         version: '1',
                         statement: [
@@ -80,62 +80,62 @@ const resolveEvents = (scope, events, tags, context, service) => {
                 },
             ],
         }, true);
-        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),
+        const apiGatewayGroup = new agw.RosGroup(scope, (0, common_1.formatRosId)(`${event.key}_agw_group`), {
+            groupName: (0, common_1.calcRefs)(`${service}-agw-group`, context),
+            tags: (0, common_1.calcRefs)(tags, context),
             passthroughHeaders: 'host',
         }, true);
         if (event.domain) {
-            const dnsRecordRosId = `${event.key}_custom_domain_record_${(0, common_1.encodeBase64ForRosId)(event.domain.domain_name)}`;
+            const dnsRecordId = (0, common_1.formatRosId)(`${event.key}_agw_custom_domain_record`);
             const { domainName, rr } = (0, common_1.splitDomain)(event.domain?.domain_name);
-            new dns.DomainRecord(scope, dnsRecordRosId, {
+            new dns.DomainRecord(scope, dnsRecordId, {
                 domainName,
                 rr,
                 type: 'CNAME',
                 value: apiGatewayGroup.attrSubDomain,
             });
-            const agwCustomDomain = new agw.RosCustomDomain(scope, `${event.key}_custom_domain_${(0, common_1.encodeBase64ForRosId)(event.domain.domain_name)}`, {
+            const agwCustomDomain = new agw.RosCustomDomain(scope, (0, common_1.formatRosId)(`${event.key}_agw_custom_domain`), {
                 groupId: apiGatewayGroup.attrGroupId,
                 domainName: event.domain.domain_name,
                 certificateName: event.domain.certificate_name,
                 certificateBody: event.domain.certificate_body,
                 certificatePrivateKey: event.domain.certificate_private_key,
             }, true);
-            agwCustomDomain.addRosDependency(dnsRecordRosId);
+            agwCustomDomain.addRosDependency(dnsRecordId);
         }
         event.triggers.forEach((trigger) => {
-            const key = (0, common_1.encodeBase64ForRosId)((0, common_1.replaceReference)(`${trigger.method}_${trigger.path}`, context));
-            const api = new agw.RosApi(scope, `${event.key}_api_${key}`, {
-                apiName: (0, common_1.replaceReference)(`${event.name}_api_${key}`, context),
+            const key = (0, common_1.formatRosId)((0, common_1.calcValue)(`${trigger.method}_${trigger.path}`, context));
+            const api = new agw.RosApi(scope, (0, common_1.formatRosId)(`${event.key}_agw_api_${key}`), {
+                apiName: (0, common_1.calcRefs)(`${event.name}-agw-api-${key.replace(/_/g, '-')}`, context),
                 groupId: apiGatewayGroup.attrGroupId,
                 visibility: 'PRIVATE',
                 authType: 'ANONYMOUS',
                 requestConfig: {
                     requestProtocol: 'HTTP',
-                    requestHttpMethod: (0, common_1.replaceReference)(trigger.method, context),
-                    requestPath: (0, common_1.replaceReference)(trigger.path, context),
+                    requestHttpMethod: (0, common_1.calcRefs)(trigger.method, context),
+                    requestPath: (0, common_1.calcRefs)(trigger.path, context),
                     requestMode: 'PASSTHROUGH',
                 },
                 serviceConfig: {
                     serviceProtocol: 'FunctionCompute',
                     functionComputeConfig: {
                         fcRegionId: context.region,
-                        functionName: (0, common_1.replaceReference)(trigger.backend, context),
+                        functionName: (0, common_1.calcRefs)(trigger.backend, context),
                         roleArn: gatewayAccessRole.attrArn,
                         fcVersion: '3.0',
-                        method: (0, common_1.replaceReference)(trigger.method, context),
+                        method: (0, common_1.calcRefs)(trigger.method, context),
                     },
                 },
                 resultSample: 'ServerlessInsight resultSample',
                 resultType: 'PASSTHROUGH',
-                tags: (0, common_1.replaceReference)(tags, context),
+                tags: (0, common_1.calcRefs)(tags, context),
             }, true);
             api.addDependsOn(apiGatewayGroup);
-            new agw.Deployment(scope, `${service}_deployment`, {
+            new agw.Deployment(scope, (0, common_1.formatRosId)(`${event.key}_agw_api_deployment_${key}`), {
                 apiId: api.attrApiId,
                 groupId: apiGatewayGroup.attrGroupId,
                 stageName: 'RELEASE',
-                description: `${service} Api Gateway deployment`,
+                description: (0, common_1.calcRefs)(`${service} Api Gateway deployment for api: ${trigger.method} ${trigger.path}`, context),
             });
         });
     });

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

@@ -43,6 +43,7 @@ const ros = __importStar(require("@alicloud/ros-cdk-core"));
 const sls = __importStar(require("@alicloud/ros-cdk-sls"));
 const nas = __importStar(require("@alicloud/ros-cdk-nas"));
 const ecs = __importStar(require("@alicloud/ros-cdk-ecs"));
+const vpc = __importStar(require("@alicloud/ros-cdk-vpc"));
 const storageClassMap = {
     [types_1.NasStorageClassEnum.STANDARD_CAPACITY]: { fileSystemType: 'standard', storageType: 'Capacity' },
     [types_1.NasStorageClassEnum.STANDARD_PERFORMANCE]: {
@@ -95,14 +96,17 @@ const resolveFunctions = (scope, functions, tags, context, service) => {
     }
     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,
+    const slsProjectId = 'sls_project';
+    const slsLogstoreId = 'sls_logstore';
+    const slsIndexId = 'sls_index';
+    const slsProject = new sls.Project(scope, slsProjectId, { name: (0, common_1.calcRefs)(`${service}-sls`, context), tags: (0, common_1.calcRefs)(tags, context) }, true);
+    const slsLogstore = new sls.Logstore(scope, slsLogstoreId, {
+        logstoreName: (0, common_1.calcRefs)(`${service}-sls-logstore`, context),
+        projectName: slsProject.attrName,
         ttl: 7,
     }, true);
-    new sls.Index(scope, `${service}_sls_index`, {
-        projectName: slsService.attrName,
+    new sls.Index(scope, slsIndexId, {
+        projectName: slsProject.attrName,
         logstoreName: slsLogstore.attrLogstoreName,
         fullTextIndex: { enable: true },
     }, true);
@@ -116,99 +120,118 @@ const resolveFunctions = (scope, functions, tags, context, service) => {
     const fileSources = functions
         ?.filter(({ code }) => code?.path && (0, common_1.readCodeSize)(code.path) > common_1.CODE_ZIP_SIZE_LIMIT)
         .map(({ code, name }) => {
-        const fcName = (0, common_1.replaceReference)(name, context);
+        const fcName = (0, common_1.calcRefs)(name, context);
         return { fcName, ...(0, common_1.getFileSource)(fcName, code.path) };
     });
     const destinationBucketName = ros.Fn.sub('si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}');
-    const ossDeploymentId = `${service}_artifacts_code_deployment`;
+    const ossDeploymentId = 'si_auto_artifacts_code_deployment';
     if (!(0, lodash_1.isEmpty)(fileSources)) {
         new ossDeployment.BucketDeployment(scope, ossDeploymentId, {
             sources: fileSources.map(({ source }) => source),
             destinationBucket: destinationBucketName,
-            timeout: 3000,
+            timeout: common_1.OSS_DEPLOYMENT_TIMEOUT,
             logMonitoring: false,
             retainOnCreate: false,
         }, true);
     }
     functions?.forEach((fnc) => {
         let runtimeConfig;
-        const storeInBucket = !!fnc.code?.path && (0, common_1.readCodeSize)(fnc.code.path) > common_1.CODE_ZIP_SIZE_LIMIT;
+        const storeInBucket = !!fnc.code?.path && (0, common_1.readCodeSize)((0, common_1.calcValue)(fnc.code.path, context)) > common_1.CODE_ZIP_SIZE_LIMIT;
         if (fnc.container) {
             runtimeConfig = {
                 runtime: 'custom-container',
                 handler: 'index.handler',
                 customContainerConfig: {
-                    image: fnc.container.image,
-                    command: fnc.container.cmd?.split(' '),
-                    port: fnc.container.port,
+                    image: (0, common_1.calcRefs)(fnc.container.image, context),
+                    command: (0, common_1.calcRefs)(fnc.container.cmd, context)?.split(' '),
+                    port: (0, common_1.calcRefs)(fnc.container.port, context),
                 },
             };
         }
         else {
             let code = {
-                zipFile: (0, common_1.resolveCode)(fnc.code.path),
+                zipFile: (0, common_1.resolveCode)((0, common_1.calcValue)(fnc.code.path, context)),
             };
             if (storeInBucket) {
                 code = {
                     ossBucketName: destinationBucketName,
-                    ossObjectName: fileSources?.find(({ fcName }) => fcName === (0, common_1.replaceReference)(fnc.name, context))?.objectKey,
+                    ossObjectName: fileSources?.find(({ fcName }) => fcName === (0, common_1.calcRefs)(fnc.name, context))
+                        ?.objectKey,
                 };
             }
             runtimeConfig = {
                 code,
-                handler: (0, common_1.replaceReference)(fnc.code.handler, context),
-                runtime: (0, common_1.replaceReference)(fnc.code.runtime, context),
+                handler: (0, common_1.calcRefs)(fnc.code.handler, context),
+                runtime: (0, common_1.calcRefs)(fnc.code.runtime, context),
             };
         }
         let vpcConfig = undefined;
         if (fnc.network) {
-            const securityGroup = new ecs.SecurityGroup(scope, `${fnc.key}_security_group`, {
+            const securityGroup = new ecs.SecurityGroup(scope, (0, common_1.formatRosId)(`${fnc.key}_security_group`), {
                 securityGroupName: fnc.network.security_group.name,
-                vpcId: (0, common_1.replaceReference)(fnc.network.vpc_id, context),
-                tags: (0, common_1.replaceReference)(tags, context),
+                vpcId: (0, common_1.calcRefs)(fnc.network.vpc_id, context),
+                tags: (0, common_1.calcRefs)(tags, context),
                 securityGroupIngress: transformSecurityRules(fnc.network.security_group.ingress, 'INGRESS'),
                 securityGroupEgress: transformSecurityRules(fnc.network.security_group.egress, 'EGRESS'),
             }, true);
             vpcConfig = {
-                vpcId: (0, common_1.replaceReference)(fnc.network.vpc_id, context),
-                vSwitchIds: (0, common_1.replaceReference)(fnc.network.subnet_ids, context),
+                vpcId: (0, common_1.calcRefs)(fnc.network.vpc_id, context),
+                vSwitchIds: (0, common_1.calcRefs)(fnc.network.subnet_ids, context),
                 securityGroupId: securityGroup.attrSecurityGroupId,
             };
         }
         let fcNas;
         if (fnc.storage?.nas) {
             fcNas = fnc.storage.nas.map((nasItem) => {
-                const { fileSystemType, storageType } = storageClassMap[nasItem.storage_class];
-                const accessGroup = new nas.AccessGroup(scope, `${fnc.key}_nas_access_${(0, common_1.encodeBase64ForRosId)(nasItem.mount_path)}`, {
-                    accessGroupName: `${fnc.name}-nas-access-${(0, common_1.encodeBase64ForRosId)(nasItem.mount_path)}`,
+                const storageClass = (0, common_1.calcValue)(nasItem.storage_class, context);
+                const { fileSystemType, storageType } = storageClassMap[storageClass];
+                const mountPathValue = (0, common_1.formatRosId)((0, common_1.calcValue)(nasItem.mount_path, context));
+                const nasMountTargetId = (0, common_1.formatRosId)(`${fnc.key}_nas_mount_${mountPathValue}`);
+                const accessGroup = new nas.AccessGroup(scope, (0, common_1.formatRosId)(`${fnc.key}_nas_access_${mountPathValue}`), {
+                    accessGroupName: (0, common_1.calcRefs)(`${fnc.name}-nas-access-${mountPathValue.replace(/_/g, '-')}`, context),
                     accessGroupType: 'Vpc',
                 }, true);
-                const nasResource = new nas.FileSystem(scope, `${fnc.key}_nas_${(0, common_1.encodeBase64ForRosId)(nasItem.mount_path)}`, {
+                const fcVpcSubnets = fnc.network?.subnet_ids.map((subnet) => new vpc.datasource.VSwitch(scope, (0, common_1.formatRosId)((0, common_1.calcValue)(`${fnc.key}_datasource_subnet_${subnet}`, context)), {
+                    vSwitchId: subnet,
+                    refreshOptions: 'Always',
+                }));
+                fcVpcSubnets?.forEach((subnetDatasource, index) => {
+                    new nas.AccessRule(scope, (0, common_1.formatRosId)((0, common_1.calcValue)(`${fnc.key}_nas_rule_${fnc.network.subnet_ids[index]}`, context)), {
+                        accessGroupName: accessGroup.attrAccessGroupName,
+                        sourceCidrIp: subnetDatasource.attrCidrBlock,
+                    }, true);
+                });
+                const nasResource = new nas.FileSystem(scope, (0, common_1.formatRosId)(`${fnc.key}_nas_${mountPathValue}`), {
                     fileSystemType,
                     storageType,
                     protocolType: 'NFS',
                     tags: [
-                        ...((0, common_1.replaceReference)(tags, context) ?? []),
-                        { key: 'function-name', value: fnc.name },
+                        ...((0, common_1.calcRefs)(tags, context) ?? []),
+                        { key: 'function-name', value: (0, common_1.calcRefs)(fnc.name, context) },
                     ],
                 }, true);
-                const nasMountTarget = new nas.MountTarget(scope, `${fnc.key}_nas_mount_${(0, common_1.encodeBase64ForRosId)(nasItem.mount_path)}`, {
+                const nasMountTarget = new nas.MountTarget(scope, nasMountTargetId, {
                     fileSystemId: nasResource.attrFileSystemId,
                     networkType: 'Vpc',
                     accessGroupName: accessGroup.attrAccessGroupName,
-                    vpcId: fnc.network.vpc_id,
-                    vSwitchId: fnc.network.subnet_ids[0],
+                    vpcId: (0, common_1.calcRefs)(fnc.network.vpc_id, context),
+                    vSwitchId: (0, common_1.calcRefs)(fnc.network.subnet_ids[0], context),
                 }, true);
-                return { nas: nasResource, nasMount: nasMountTarget, mountDir: nasItem.mount_path };
+                return {
+                    nas: nasResource,
+                    nasMount: nasMountTarget,
+                    mountDir: (0, common_1.calcRefs)(nasItem.mount_path, context),
+                    nasMountTargetId,
+                };
             });
         }
         const fcn = new fc.RosFunction(scope, fnc.key, {
-            functionName: (0, common_1.replaceReference)(fnc.name, context),
-            memorySize: (0, common_1.replaceReference)(fnc.memory, context),
-            diskSize: fnc.storage?.disk,
+            functionName: (0, common_1.calcRefs)(fnc.name, context),
+            memorySize: (0, common_1.calcRefs)(fnc.memory, context),
+            diskSize: (0, common_1.calcRefs)(fnc.storage?.disk, context),
             gpuConfig: transformGpuConfig(fnc.gpu),
-            timeout: (0, common_1.replaceReference)(fnc.timeout, context),
-            environmentVariables: (0, common_1.replaceReference)(fnc.environment, context),
+            timeout: (0, common_1.calcRefs)(fnc.timeout, context),
+            environmentVariables: (0, common_1.calcRefs)(fnc.environment, context),
             logConfig,
             vpcConfig,
             ...runtimeConfig,
@@ -222,17 +245,15 @@ const resolveFunctions = (scope, functions, tags, context, service) => {
                 : undefined,
         }, true);
         if (enableLog) {
-            fcn.addRosDependency(`${service}_sls`);
-            fcn.addRosDependency(`${service}_sls_logstore`);
-            fcn.addRosDependency(`${service}_sls_index`);
+            fcn.addRosDependency(slsProjectId);
+            fcn.addRosDependency(slsLogstoreId);
+            fcn.addRosDependency(slsIndexId);
         }
         if (storeInBucket) {
-            fcn.addRosDependency(`${service}_artifacts_code_deployment`);
+            fcn.addRosDependency(ossDeploymentId);
         }
         if (fcNas?.length) {
-            fcNas.forEach((nasItem) => {
-                fcn.addRosDependency(`${fnc.key}_nas_mount_${(0, common_1.encodeBase64ForRosId)(nasItem.mountDir)}`);
-            });
+            fcNas.forEach(({ nasMountTargetId }) => fcn.addRosDependency(nasMountTargetId));
         }
     });
 };

package/dist/src/stack/rosStack/index.d.ts

@@ -1,7 +1,7 @@
 import * as ros from '@alicloud/ros-cdk-core';
-import { ActionContext, ServerlessIac } from '../../types';
+import { Context, ServerlessIac } from '../../types';
 export * from './bootstrap';
 export declare class RosStack extends ros.Stack {
     private readonly service;
-    constructor(scope: ros.Construct, iac: ServerlessIac, context: ActionContext);
+    constructor(scope: ros.Construct, iac: ServerlessIac, context: Context);
 }

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

@@ -49,14 +49,14 @@ const bucket_1 = require("./bucket");
 __exportStar(require("./bootstrap"), exports);
 class RosStack extends ros.Stack {
     constructor(scope, iac, context) {
-        super(scope, (0, common_1.replaceReference)(iac.service, context), {
+        super(scope, (0, common_1.calcRefs)(iac.service, context), {
             stackName: context.stackName,
             tags: (0, tag_1.resolveTags)(iac.tags, context),
         });
-        this.service = (0, common_1.replaceReference)(iac.service, context);
+        this.service = (0, common_1.calcRefs)(iac.service, context);
         new ros.RosInfo(this, ros.RosInfo.description, `${this.service} stack`);
         // Define Parameters
-        (0, vars_1.resloveVars)(this, iac.vars);
+        (0, vars_1.resolveVars)(this, iac.vars);
         // Define Mappings
         (0, stage_1.resolveStages)(this, iac.stages, context);
         // Define functions

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

@@ -41,6 +41,6 @@ const resolveStages = (scope, stages, context) => {
     if ((0, lodash_1.isEmpty)(stages)) {
         return undefined;
     }
-    new ros.RosMapping(scope, 'stages', { mapping: (0, common_1.replaceReference)(stages, context) });
+    new ros.RosMapping(scope, 'stages', { mapping: (0, common_1.calcRefs)(stages, context) });
 };
 exports.resolveStages = resolveStages;

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

@@ -4,7 +4,7 @@ exports.resolveTags = void 0;
 const common_1 = require("../../common");
 const resolveTags = (tags, context) => {
     return tags?.reduce((acc, tag) => {
-        acc[tag.key] = (0, common_1.replaceReference)(tag.value, context);
+        acc[tag.key] = (0, common_1.calcRefs)(tag.value, context);
         return acc;
     }, {});
 };

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

@@ -33,11 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resloveVars = void 0;
+exports.resolveVars = void 0;
 const ros = __importStar(require("@alicloud/ros-cdk-core"));
 const ros_cdk_core_1 = require("@alicloud/ros-cdk-core");
 const lodash_1 = require("lodash");
-const resloveVars = (scope, vars) => {
+const resolveVars = (scope, vars) => {
     if ((0, lodash_1.isEmpty)(vars)) {
         return undefined;
     }
@@ -46,4 +46,4 @@ const resloveVars = (scope, vars) => {
         defaultValue: value,
     }));
 };
-exports.resloveVars = resloveVars;
+exports.resolveVars = resolveVars;

package/dist/src/validator/functionSchema.js

@@ -101,8 +101,8 @@ exports.functionSchema = {
                                     storage_class: {
                                         type: 'string',
                                         enum: [
-                                            'STANDARD_PERFORMANCE',
                                             'STANDARD_CAPACITY',
+                                            'STANDARD_PERFORMANCE',
                                             'EXTREME_STANDARD',
                                             'EXTREME_ADVANCE',
                                         ],

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/base64.ts","../src/common/constants.ts","../src/common/domainHelper.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/rosAssets.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/bucketParser.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/bucket.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/bucket.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/bucketSchema.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/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/domainHelper.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/rosAssets.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/bucketParser.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/bucket.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/bucket.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/bucketSchema.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.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.3.0",
+  "version": "0.3.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",
@@ -49,51 +49,52 @@
     "function"
   ],
   "dependencies": {
-    "@alicloud/ims20190815": "^2.1.4",
-    "@alicloud/openapi-client": "^0.4.12",
-    "@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",
+    "@alicloud/ims20190815": "^2.2.0",
+    "@alicloud/openapi-client": "^0.4.14",
+    "@alicloud/ros-cdk-apigateway": "^1.8.0",
+    "@alicloud/ros-cdk-core": "^1.8.0",
+    "@alicloud/ros-cdk-dns": "^1.8.0",
+    "@alicloud/ros-cdk-ecs": "^1.8.0",
+    "@alicloud/ros-cdk-elasticsearchserverless": "^1.8.0",
+    "@alicloud/ros-cdk-fc3": "^1.8.0",
+    "@alicloud/ros-cdk-nas": "^1.8.0",
+    "@alicloud/ros-cdk-oss": "^1.8.0",
+    "@alicloud/ros-cdk-ossdeployment": "^1.8.0",
+    "@alicloud/ros-cdk-ram": "^1.8.0",
+    "@alicloud/ros-cdk-rds": "^1.8.0",
+    "@alicloud/ros-cdk-sls": "^1.8.0",
+    "@alicloud/ros-cdk-vpc": "^1.8.0",
+    "@alicloud/ros20190910": "^3.5.6",
     "ajv": "^8.17.1",
     "ali-oss": "^6.22.0",
     "chalk": "^5.4.1",
-    "commander": "^12.1.0",
+    "commander": "^13.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",
+    "npm": "^11.2.0",
+    "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
-    "yaml": "^2.7.0"
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@types/ali-oss": "^6.16.11",
     "@types/i18n": "^0.13.12",
     "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.13",
-    "@types/node": "^22.10.1",
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.17.0",
-    "eslint": "^9.16.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.13.0",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^22.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
+    "eslint": "^9.24.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-prettier": "^5.2.6",
+    "globals": "^16.0.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
-    "prettier": "^3.4.2",
-    "ts-jest": "^29.2.5",
+    "prettier": "^3.5.3",
+    "ts-jest": "^29.3.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.3"
   }
 }