@geek-fun/serverlessinsight 0.6.7 → 0.6.9

package/dist/src/stack/scfStack/cosResource.js

@@ -8,6 +8,7 @@ const common_1 = require("../../common");
 const certUtils_1 = require("../../common/certUtils");
 const logger_1 = require("../../common/logger");
 const lang_1 = require("../../lang");
+const domainUtils_1 = require("../../common/domainUtils");
 const resolveBucketDomainCertificate = (bucket) => {
     const website = bucket.website;
     if (!website)
@@ -133,31 +134,56 @@ const createBucketResource = async (context, bucket, state) => {
     let cnameInfo;
     if (bucket.website?.domain) {
         const resolved = resolveBucketDomainCertificate(bucket);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: bucket.name,
         }));
-        cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
+        cnameInfo = await client.cos.bindCustomDomain(bucket.name, primaryDomain);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
-            if (refreshedInfo) {
-                instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
-            }
             if (resolved && cnameInfo.bucketDomainBound) {
-                await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
+                await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
+            }
+        }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: bucket.name,
+            }));
+            const wwwCnameInfo = await client.cos.bindCustomDomain(bucket.name, wwwDomain);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
+                if (resolved && wwwCnameInfo.bucketDomainBound) {
+                    await deployCertificateToCosDomain(client, resolved, bucket.name, wwwDomain, context.region);
+                }
             }
         }
+        const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
+        if (refreshedInfo) {
+            instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
+        }
     }
     const resourceState = {
         mode: 'managed',
@@ -194,41 +220,75 @@ const updateBucketResource = async (context, bucket, state) => {
         buildCosInstanceFromProvider(bucketInfo, sid),
     ];
     const existingState = state.resources[logicalId];
-    const existingDnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
+    const existingWwwDnsInstance = existingDnsInstances?.find((i) => i.isWwwVariant);
     if (bucket.website?.domain) {
-        const domainChanged = existingDnsInstance?.domain !== bucket.website.domain;
-        if (domainChanged && existingDnsInstance) {
-            await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
+        const domainChanged = existingPrimaryDnsInstance?.domain !== primaryDomain;
+        if (domainChanged && existingDnsInstances) {
+            for (const instance of existingDnsInstances) {
+                await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
+            }
         }
         const resolved = resolveBucketDomainCertificate(bucket);
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: bucket.name,
         }));
-        const cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
+        const cnameInfo = await client.cos.bindCustomDomain(bucket.name, primaryDomain);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
-            if (refreshedInfo) {
-                instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
-            }
             if (resolved && cnameInfo.bucketDomainBound) {
-                await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
+                await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
             }
         }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: bucket.name,
+            }));
+            const wwwCnameInfo = await client.cos.bindCustomDomain(bucket.name, wwwDomain);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
+                if (resolved && wwwCnameInfo.bucketDomainBound) {
+                    await deployCertificateToCosDomain(client, resolved, bucket.name, wwwDomain, context.region);
+                }
+            }
+        }
+        else if (existingWwwDnsInstance && !wwwBindApex) {
+            await client.cos.unbindCustomDomain(bucket.name, existingWwwDnsInstance.domain, existingWwwDnsInstance.dnsRecordId);
+        }
+        const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
+        if (refreshedInfo) {
+            instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
+        }
     }
-    else if (existingDnsInstance) {
-        await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
+    else if (existingDnsInstances) {
+        for (const instance of existingDnsInstances) {
+            await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
+        }
     }
     const resourceState = {
         mode: 'managed',
@@ -243,9 +303,11 @@ exports.updateBucketResource = updateBucketResource;
 const deleteBucketResource = async (context, bucketName, region, logicalId, state) => {
     const client = (0, tencentClient_1.createTencentClient)(context);
     const existingState = state.resources[logicalId];
-    const dnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
-    if (dnsInstance) {
-        await client.cos.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
+    const dnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    if (dnsInstances) {
+        for (const dnsInstance of dnsInstances) {
+            await client.cos.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
+        }
     }
     try {
         await client.cos.deleteBucket(bucketName, region);

package/dist/src/stack/scfStack/cosTypes.js

@@ -26,6 +26,33 @@ const bucketToCosBucketConfig = (bucket, region) => {
                 Key: bucket.website.error_page,
             };
         }
+        if (bucket.website.domain) {
+            config.Domain = bucket.website.domain;
+        }
+        if (bucket.website.www_bind_apex !== undefined) {
+            config.WwwBindApex = bucket.website.www_bind_apex;
+        }
+        if (bucket.website.domain_certificate_id) {
+            config.DomainCertificateId = bucket.website.domain_certificate_id;
+        }
+        if (bucket.website.domain_certificate_body) {
+            config.DomainCertificateBody = bucket.website.domain_certificate_body;
+        }
+        if (bucket.website.domain_certificate_private_key) {
+            config.DomainCertificatePrivateKey = bucket.website.domain_certificate_private_key;
+        }
+        if (bucket.website.domain_protocol) {
+            config.DomainProtocol = bucket.website.domain_protocol;
+        }
+    }
+    if (bucket.versioning?.status) {
+        config.VersioningStatus = bucket.versioning.status;
+    }
+    if (bucket.security?.sse_algorithm) {
+        config.SseAlgorithm = bucket.security.sse_algorithm;
+    }
+    if (bucket.security?.sse_kms_master_key_id) {
+        config.SseKmsMasterKeyId = bucket.security.sse_kms_master_key_id;
     }
     return config;
 };
@@ -41,6 +68,15 @@ const extractCosBucketDefinition = (config) => {
                 errorDocument: config.WebsiteConfiguration.ErrorDocument?.Key ?? null,
             }
             : {},
+        domain: config.Domain ?? null,
+        wwwBindApex: config.WwwBindApex ?? false,
+        domainCertificateId: config.DomainCertificateId ?? null,
+        domainCertificateBody: config.DomainCertificateBody ?? null,
+        domainCertificatePrivateKey: config.DomainCertificatePrivateKey ? '(managed)' : null,
+        domainProtocol: config.DomainProtocol ?? null,
+        versioningStatus: config.VersioningStatus ?? null,
+        sseAlgorithm: config.SseAlgorithm ?? null,
+        sseKmsMasterKeyId: config.SseKmsMasterKeyId ?? null,
     };
 };
 exports.extractCosBucketDefinition = extractCosBucketDefinition;

package/dist/src/stack/scfStack/scfTypes.js

@@ -18,6 +18,31 @@ const functionToScfConfig = (fn) => {
             })),
         };
     }
+    if (fn.network) {
+        config.VpcConfig = {
+            VpcId: fn.network.vpc_id,
+            SubnetId: fn.network.subnet_ids[0],
+        };
+    }
+    if (fn.storage?.disk) {
+        config.DiskSize = fn.storage.disk;
+    }
+    if (fn.storage?.nas && fn.storage.nas.length > 0) {
+        config.CfsConfig = {
+            CfsInsList: fn.storage.nas.map((nas) => ({
+                LocalMountDir: nas.mount_path,
+                RemoteMountDir: '/',
+            })),
+        };
+    }
+    if (fn.gpu) {
+        config.UseGpu = 'TRUE';
+    }
+    if (fn.container) {
+        config.ImageConfig = {
+            ImageUri: fn.container.image,
+        };
+    }
     return config;
 };
 exports.functionToScfConfig = functionToScfConfig;
@@ -31,6 +56,11 @@ const extractScfDefinition = (config, codeHash) => {
         timeout: config.Timeout,
         environment: envMap,
         codeHash,
+        vpcConfig: config.VpcConfig ?? null,
+        diskSize: config.DiskSize ?? null,
+        cfsConfig: config.CfsConfig ?? null,
+        useGpu: config.UseGpu ?? null,
+        imageConfig: config.ImageConfig ?? null,
     };
 };
 exports.extractScfDefinition = extractScfDefinition;

package/dist/src/validator/bucketSchema.js

@@ -73,6 +73,7 @@ exports.bucketSchema = {
                                                 },
                                             ],
                                         },
+                                        www_bind_apex: { type: 'boolean' },
                                     },
                                     required: ['domain_name'],
                                     additionalProperties: false,
@@ -110,6 +111,7 @@ exports.bucketSchema = {
                             type: 'string',
                         },
                         error_code: templateRefSchema_1.resolvableNumber,
+                        www_bind_apex: templateRefSchema_1.resolvableBoolean,
                     },
                     required: ['code'],
                     additionalProperties: false,

package/dist/src/validator/eventSchema.js

@@ -40,6 +40,7 @@ exports.eventSchema = {
                                 },
                             ],
                         },
+                        www_bind_apex: { type: 'boolean' },
                     },
                     oneOf: [
                         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",