@geek-fun/serverlessinsight 0.6.6 → 0.6.7

package/dist/package.json

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

package/dist/src/stack/aliyunStack/ossPlanner.js

@@ -46,14 +46,16 @@ const generateBucketPlan = async (context, state, buckets) => {
                 };
             }
             const currentDefinition = currentState.definition || {};
-            const definitionChanged = !(0, hashUtils_1.attributesEqual)(currentDefinition, desiredDefinition);
-            if (definitionChanged) {
+            const { domainBound, ...comparableDefinition } = currentDefinition;
+            const definitionChanged = !(0, hashUtils_1.attributesEqual)(comparableDefinition, desiredDefinition);
+            const domainBindingPending = domainBound === false;
+            if (definitionChanged || domainBindingPending) {
                 return {
                     logicalId,
                     action: 'update',
                     resourceType: 'ALIYUN_OSS_BUCKET',
                     changes: { before: currentDefinition, after: desiredDefinition },
-                    drifted: true,
+                    ...(definitionChanged ? { drifted: true } : {}),
                 };
             }
             return { logicalId, action: 'noop', resourceType: 'ALIYUN_OSS_BUCKET' };

package/dist/src/stack/aliyunStack/ossResource.js

@@ -132,14 +132,16 @@ const createBucketResource = async (context, bucket, state) => {
     if (!bucketInfo) {
         throw new Error(`Failed to refresh state for bucket: ${config.bucketName}`);
     }
-    const definition = (0, ossTypes_1.extractOssBucketDefinition)(config);
     const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
     const logicalId = `buckets.${bucket.key}`;
     const instances = [buildOssInstanceFromProvider(bucketInfo, sid)];
     const partialResourceState = {
         mode: 'managed',
         region: context.region,
-        definition,
+        definition: {
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(bucket.website?.domain != null ? { domainBound: null } : {}),
+        },
         instances,
         lastUpdated: new Date().toISOString(),
     };
@@ -196,7 +198,12 @@ const createBucketResource = async (context, bucket, state) => {
     const finalResourceState = {
         mode: 'managed',
         region: context.region,
-        definition,
+        definition: {
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(bucket.website?.domain != null
+                ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
+                : {}),
+        },
         instances,
         lastUpdated: new Date().toISOString(),
     };
@@ -225,12 +232,12 @@ const updateBucketResource = async (context, bucket, state) => {
     if (!bucketInfo) {
         throw new Error(`Failed to refresh state for bucket: ${config.bucketName}`);
     }
-    const definition = (0, ossTypes_1.extractOssBucketDefinition)(config);
     const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
     const logicalId = `buckets.${bucket.key}`;
     const instances = [buildOssInstanceFromProvider(bucketInfo, sid)];
     const existingState = state.resources[logicalId];
     const existingDnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
+    let cnameInfo;
     if (bucket.website?.domain) {
         const domainChanged = existingDnsInstance?.domain !== bucket.website.domain;
         if (domainChanged && existingDnsInstance) {
@@ -247,7 +254,7 @@ const updateBucketResource = async (context, bucket, state) => {
                 bucketName: config.bucketName,
             }));
         }
-        const cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
+        cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
         if (cnameInfo) {
             const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
             const dnsInstance = {
@@ -273,7 +280,12 @@ const updateBucketResource = async (context, bucket, state) => {
     const resourceState = {
         mode: 'managed',
         region: context.region,
-        definition,
+        definition: {
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(bucket.website?.domain != null
+                ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
+                : {}),
+        },
         instances,
         lastUpdated: new Date().toISOString(),
     };

package/package.json

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