@geek-fun/serverlessinsight 0.7.0 → 0.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/README.md +58 -1
  3. package/README.zh-CN.md +3 -1
  4. package/dist/package.json +37 -35
  5. package/dist/src/commands/index.js +1 -3
  6. package/dist/src/commands/local.js +1 -2
  7. package/dist/src/common/aliyunClient/apigwOperations.js +9 -4
  8. package/dist/src/common/aliyunClient/cdnOperations.js +191 -0
  9. package/dist/src/common/aliyunClient/ecsOperations.js +2 -2
  10. package/dist/src/common/aliyunClient/fc3Operations.js +1 -1
  11. package/dist/src/common/aliyunClient/index.js +8 -0
  12. package/dist/src/common/aliyunClient/ossOperations.js +62 -2
  13. package/dist/src/common/aliyunClient/ramOperations.js +1 -1
  14. package/dist/src/common/hashUtils.js +4 -0
  15. package/dist/src/common/iacHelper.js +5 -0
  16. package/dist/src/common/lockManager.js +8 -0
  17. package/dist/src/common/planFormatter.js +4 -0
  18. package/dist/src/common/retryUtils.js +1 -1
  19. package/dist/src/common/stateManager.js +10 -0
  20. package/dist/src/common/volcengineClient/apigwOperations.js +1 -1
  21. package/dist/src/lang/en.js +16 -1
  22. package/dist/src/lang/zh-CN.js +17 -2
  23. package/dist/src/parser/bucketParser.js +111 -46
  24. package/dist/src/stack/aliyunStack/apigwResource.js +310 -47
  25. package/dist/src/stack/aliyunStack/apigwTypes.js +61 -1
  26. package/dist/src/stack/aliyunStack/ossResource.js +401 -69
  27. package/dist/src/stack/aliyunStack/ossTypes.js +58 -16
  28. package/dist/src/stack/localStack/event.js +1 -1
  29. package/dist/src/stack/localStack/functionRunner.js +4 -1
  30. package/dist/src/stack/scfStack/cosTypes.js +3 -6
  31. package/dist/src/stack/volcengineStack/tosTypes.js +1 -3
  32. package/dist/src/types/domains/state.js +3 -0
  33. package/dist/src/validator/bucketSchema.js +124 -56
  34. package/dist/src/validator/eventSchema.js +20 -0
  35. package/dist/tsconfig.tsbuildinfo +1 -1
  36. package/package.json +37 -35
  37. package/samples/README_TENCENT_COS.md +3 -15
  38. package/samples/aliyun-poc-bucket-cdn.yml +63 -0
  39. package/samples/aliyun-poc-bucket.yml +0 -2
  40. package/samples/aliyun-poc-domain.yml +0 -2
  41. package/samples/tencent-poc-cos.yml +0 -2
  42. package/samples/volcengine-poc-bucket.yml +0 -1
@@ -100,25 +100,40 @@ const buildOssInstanceFromProvider = (info, sid) => {
100
100
  };
101
101
  };
102
102
  const resolveBucketDomainCertificate = async (bucket, client) => {
103
+ const domain = bucket.domain;
103
104
  const website = bucket.website;
104
- if (!website)
105
- return undefined;
106
- if (website.domain_certificate_id) {
107
- const certId = website.domain_certificate_id;
105
+ const certId = domain?.certificate_id || website?.domain_certificate_id;
106
+ const certBody = domain?.certificate_body || website?.domain_certificate_body;
107
+ const certKey = domain?.certificate_private_key || website?.domain_certificate_private_key;
108
+ if (certId) {
108
109
  const detail = await client.cas.getCertificate(certId);
109
110
  if (!detail || !detail.cert || !detail.key) {
110
111
  throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: certId }));
111
112
  }
112
113
  return { certificateBody: detail.cert, certificatePrivateKey: detail.key };
113
114
  }
114
- if (website.domain_certificate_body && website.domain_certificate_private_key) {
115
- const body = (0, certUtils_1.readPemContent)(website.domain_certificate_body);
116
- const key = (0, certUtils_1.readPemContent)(website.domain_certificate_private_key);
117
- (0, certUtils_1.warnInlinePem)(website.domain_certificate_private_key);
115
+ if (certBody && certKey) {
116
+ const body = (0, certUtils_1.readPemContent)(certBody);
117
+ const key = (0, certUtils_1.readPemContent)(certKey);
118
+ (0, certUtils_1.warnInlinePem)(certKey);
118
119
  return { certificateBody: body, certificatePrivateKey: key };
119
120
  }
120
121
  return undefined;
121
122
  };
123
+ const getIsCdnEnabled = (bucket) => {
124
+ if (!bucket.domain?.cdn)
125
+ return false;
126
+ if (typeof bucket.domain.cdn === 'boolean')
127
+ return bucket.domain.cdn;
128
+ return bucket.domain.cdn.enabled;
129
+ };
130
+ const getIsAccelerateEnabled = (bucket) => {
131
+ return bucket.domain?.accelerate === true;
132
+ };
133
+ const getDomainName = (bucket) => {
134
+ return bucket.domain?.domain_name || bucket.website?.domain;
135
+ };
136
+ /* istanbul ignore next */
122
137
  const createBucketResource = async (context, bucket, state) => {
123
138
  const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
124
139
  const client = (0, aliyunClient_1.createAliyunClient)(context);
@@ -131,7 +146,7 @@ const createBucketResource = async (context, bucket, state) => {
131
146
  // Refresh state from provider to get bucket info
132
147
  let bucketInfo = await client.oss.getBucket(config.bucketName);
133
148
  if (!bucketInfo) {
134
- throw new Error(`Failed to refresh state for bucket: ${config.bucketName}`);
149
+ throw new Error(lang_1.lang.__('FAILED_TO_REFRESH_STATE', { resourceType: 'bucket', name: config.bucketName }));
135
150
  }
136
151
  const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
137
152
  const logicalId = `buckets.${bucket.key}`;
@@ -150,34 +165,148 @@ const createBucketResource = async (context, bucket, state) => {
150
165
  lastUpdated: new Date().toISOString(),
151
166
  };
152
167
  state = (0, common_1.setResource)(state, logicalId, partialResourceState);
168
+ const domainName = getDomainName(bucket);
169
+ const isCdnEnabled = getIsCdnEnabled(bucket);
170
+ const isAccelerateEnabled = getIsAccelerateEnabled(bucket);
153
171
  let cnameInfo;
154
- if (bucket.website?.domain) {
172
+ // Enable transfer acceleration if requested
173
+ if (isAccelerateEnabled) {
174
+ logger_1.logger.info(lang_1.lang.__('ENABLING_OSS_TRANSFER_ACCELERATION', { bucketName: config.bucketName }));
175
+ const accelEnabled = await client.oss.enableTransferAcceleration(config.bucketName);
176
+ if (!accelEnabled) {
177
+ throw new Error(lang_1.lang.__('FAILED_TO_ENABLE_ACCELERATION', { bucketName: config.bucketName }));
178
+ }
179
+ }
180
+ if (domainName) {
155
181
  const certificate = await resolveBucketDomainCertificate(bucket, client);
156
- const primaryDomain = bucket.website.domain;
157
- const wwwBindApex = bucket.website.www_bind_apex ?? false;
182
+ const primaryDomain = domainName;
183
+ const wwwBindApex = bucket.domain?.www_bind_apex ?? bucket.website?.www_bind_apex ?? false;
184
+ const mainDomain = (0, domainUtils_1.extractMainDomain)(primaryDomain);
185
+ const hostRecord = (0, domainUtils_1.extractHostRecord)(primaryDomain, mainDomain);
158
186
  logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
159
187
  domain: primaryDomain,
160
188
  bucketName: config.bucketName,
161
189
  }));
162
- if (certificate) {
163
- logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
190
+ // Resolve CDN config from bucket.domain.cdn object form
191
+ const cdnObj = typeof bucket.domain?.cdn === 'object' ? bucket.domain?.cdn : undefined;
192
+ const resolvedCdnType = cdnObj?.cdn_type ?? 'web';
193
+ const resolvedScope = cdnObj?.scope ?? 'global';
194
+ if (isCdnEnabled) {
195
+ const originEndpoint = isAccelerateEnabled
196
+ ? await client.oss.getAccelerateEndpoint(config.bucketName)
197
+ : await client.oss.getBucketCnameEndpoint(config.bucketName);
198
+ logger_1.logger.info(lang_1.lang.__('CREATING_CDN_DISTRIBUTION', {
164
199
  domain: primaryDomain,
165
- bucketName: config.bucketName,
200
+ origin: originEndpoint,
166
201
  }));
202
+ await client.cdn.addCdnDomain({
203
+ domainName: primaryDomain,
204
+ cdnType: resolvedCdnType,
205
+ sources: [{ type: 'oss', content: originEndpoint }],
206
+ scope: resolvedScope,
207
+ });
208
+ if (cdnObj) {
209
+ if (cdnObj.cache_ttl != null || cdnObj.ignore_query_string != null) {
210
+ await client.cdn.applyCacheConfig(primaryDomain, cdnObj.cache_ttl, cdnObj.ignore_query_string);
211
+ }
212
+ if (cdnObj.origin_protocol) {
213
+ await client.cdn.applyProtocolConfig(primaryDomain, cdnObj.origin_protocol);
214
+ }
215
+ if (cdnObj.compression != null) {
216
+ await client.cdn.applyCompression(primaryDomain, cdnObj.compression);
217
+ }
218
+ if (cdnObj.force_redirect_https != null) {
219
+ await client.cdn.applyHttpsRedirect(primaryDomain, cdnObj.force_redirect_https);
220
+ }
221
+ }
222
+ const cdnDomainInfo = await client.cdn.describeCdnDomainDetail(primaryDomain);
223
+ const cdnCname = cdnDomainInfo?.cname;
224
+ if (certificate) {
225
+ logger_1.logger.info(lang_1.lang.__('CDN_DEPLOYING_CERTIFICATE', { domain: primaryDomain }));
226
+ await client.cdn.setDomainServerCertificate(primaryDomain, {
227
+ serverCertificate: certificate.certificateBody,
228
+ privateKey: certificate.certificatePrivateKey,
229
+ serverCertificateStatus: 'on',
230
+ });
231
+ }
232
+ if (cdnCname) {
233
+ const cdnInstance = {
234
+ sid: (0, common_1.buildSid)('aliyun', 'cdn', context.stage, primaryDomain),
235
+ id: primaryDomain,
236
+ type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
237
+ domainName: primaryDomain,
238
+ cname: cdnCname,
239
+ };
240
+ instances.push(cdnInstance);
241
+ // Create DNS CNAME pointing to CDN distribution target
242
+ const dnsRecordId = await client.dns.addDomainRecord({
243
+ domainName: mainDomain,
244
+ rr: hostRecord,
245
+ type: 'CNAME',
246
+ value: cdnCname,
247
+ ttl: 600,
248
+ });
249
+ const dnsInstance = {
250
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
251
+ id: dnsRecordId || primaryDomain,
252
+ type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
253
+ domain: primaryDomain,
254
+ cname: cdnCname,
255
+ dnsRecordId: dnsRecordId || undefined,
256
+ };
257
+ instances.push(dnsInstance);
258
+ }
259
+ // Bind custom domain to OSS bucket for back-to-origin (internal, not DNS-facing)
260
+ cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate, true);
167
261
  }
168
- cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
169
- if (cnameInfo) {
170
- const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
262
+ else if (isAccelerateEnabled) {
263
+ // Accelerate-only: create DNS pointing to accelerated endpoint
264
+ const accelerateEndpoint = await client.oss.getAccelerateEndpoint(config.bucketName);
265
+ const dnsRecordId = await client.dns.addDomainRecord({
266
+ domainName: mainDomain,
267
+ rr: hostRecord,
268
+ type: 'CNAME',
269
+ value: accelerateEndpoint,
270
+ ttl: 600,
271
+ });
171
272
  const dnsInstance = {
172
- sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
173
- id: instanceId,
174
- type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
273
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
274
+ id: dnsRecordId || primaryDomain,
275
+ type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
175
276
  domain: primaryDomain,
176
- cname: cnameInfo.cname,
177
- ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
178
- ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
277
+ cname: accelerateEndpoint,
278
+ dnsRecordId: dnsRecordId || undefined,
179
279
  };
180
280
  instances.push(dnsInstance);
281
+ cnameInfo = {
282
+ domain: primaryDomain,
283
+ cname: accelerateEndpoint,
284
+ dnsRecordId: dnsRecordId || undefined,
285
+ bucketCnameBound: false,
286
+ };
287
+ }
288
+ else {
289
+ // Direct OSS domain binding (existing behavior)
290
+ if (certificate) {
291
+ logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
292
+ domain: primaryDomain,
293
+ bucketName: config.bucketName,
294
+ }));
295
+ }
296
+ cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
297
+ if (cnameInfo) {
298
+ const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
299
+ const dnsInstance = {
300
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
301
+ id: instanceId,
302
+ type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
303
+ domain: primaryDomain,
304
+ cname: cnameInfo.cname,
305
+ ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
306
+ ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
307
+ };
308
+ instances.push(dnsInstance);
309
+ }
181
310
  }
182
311
  const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
183
312
  if (wwwDomain) {
@@ -185,20 +314,83 @@ const createBucketResource = async (context, bucket, state) => {
185
314
  domain: wwwDomain,
186
315
  bucketName: config.bucketName,
187
316
  }));
188
- const wwwCnameInfo = await client.oss.bindCustomDomain(config.bucketName, wwwDomain, certificate);
189
- if (wwwCnameInfo) {
190
- const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
191
- const wwwDnsInstance = {
192
- sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwInstanceId),
193
- id: wwwInstanceId,
194
- type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
195
- domain: wwwDomain,
196
- cname: wwwCnameInfo.cname,
197
- isWwwVariant: true,
198
- ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
199
- ...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
200
- };
201
- instances.push(wwwDnsInstance);
317
+ if (isCdnEnabled) {
318
+ const originEndpoint = isAccelerateEnabled
319
+ ? await client.oss.getAccelerateEndpoint(config.bucketName)
320
+ : await client.oss.getBucketCnameEndpoint(config.bucketName);
321
+ await client.cdn.addCdnDomain({
322
+ domainName: wwwDomain,
323
+ cdnType: resolvedCdnType,
324
+ sources: [{ type: 'oss', content: originEndpoint }],
325
+ scope: resolvedScope,
326
+ });
327
+ const wwwCdnInfo = await client.cdn.describeCdnDomainDetail(wwwDomain);
328
+ if (cdnObj) {
329
+ if (cdnObj.cache_ttl != null || cdnObj.ignore_query_string != null) {
330
+ await client.cdn.applyCacheConfig(wwwDomain, cdnObj.cache_ttl, cdnObj.ignore_query_string);
331
+ }
332
+ if (cdnObj.origin_protocol) {
333
+ await client.cdn.applyProtocolConfig(wwwDomain, cdnObj.origin_protocol);
334
+ }
335
+ if (cdnObj.compression != null) {
336
+ await client.cdn.applyCompression(wwwDomain, cdnObj.compression);
337
+ }
338
+ if (cdnObj.force_redirect_https != null) {
339
+ await client.cdn.applyHttpsRedirect(wwwDomain, cdnObj.force_redirect_https);
340
+ }
341
+ }
342
+ if (certificate) {
343
+ await client.cdn.setDomainServerCertificate(wwwDomain, {
344
+ serverCertificate: certificate.certificateBody,
345
+ privateKey: certificate.certificatePrivateKey,
346
+ serverCertificateStatus: 'on',
347
+ });
348
+ }
349
+ if (wwwCdnInfo?.cname) {
350
+ const wwwMainDomain = (0, domainUtils_1.extractMainDomain)(wwwDomain);
351
+ const wwwHostRecord = (0, domainUtils_1.extractHostRecord)(wwwDomain, wwwMainDomain);
352
+ const wwwDnsRecordId = await client.dns.addDomainRecord({
353
+ domainName: wwwMainDomain,
354
+ rr: wwwHostRecord,
355
+ type: 'CNAME',
356
+ value: wwwCdnInfo.cname,
357
+ ttl: 600,
358
+ });
359
+ const wwwCdnInstance = {
360
+ sid: (0, common_1.buildSid)('aliyun', 'cdn', context.stage, wwwDomain),
361
+ id: wwwDomain,
362
+ type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
363
+ domainName: wwwDomain,
364
+ cname: wwwCdnInfo.cname,
365
+ };
366
+ instances.push(wwwCdnInstance);
367
+ const wwwDnsInstance = {
368
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwDnsRecordId || wwwDomain),
369
+ id: wwwDnsRecordId || wwwDomain,
370
+ type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
371
+ domain: wwwDomain,
372
+ cname: wwwCdnInfo.cname,
373
+ dnsRecordId: wwwDnsRecordId || undefined,
374
+ };
375
+ instances.push(wwwDnsInstance);
376
+ }
377
+ }
378
+ else {
379
+ const wwwCnameInfo = await client.oss.bindCustomDomain(config.bucketName, wwwDomain, certificate);
380
+ if (wwwCnameInfo) {
381
+ const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
382
+ const wwwDnsInstance = {
383
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwInstanceId),
384
+ id: wwwInstanceId,
385
+ type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
386
+ domain: wwwDomain,
387
+ cname: wwwCnameInfo.cname,
388
+ isWwwVariant: true,
389
+ ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
390
+ ...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
391
+ };
392
+ instances.push(wwwDnsInstance);
393
+ }
202
394
  }
203
395
  }
204
396
  // Refresh bucket info to capture auto-added CORS rule
@@ -207,7 +399,6 @@ const createBucketResource = async (context, bucket, state) => {
207
399
  instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
208
400
  }
209
401
  }
210
- // Upload static files if code path is specified
211
402
  if (bucket.website?.code) {
212
403
  try {
213
404
  const codePath = node_path_1.default.resolve(process.cwd(), bucket.website.code);
@@ -219,7 +410,7 @@ const createBucketResource = async (context, bucket, state) => {
219
410
  }
220
411
  }
221
412
  catch (error) {
222
- logger_1.logger.error(`Failed to upload files to bucket, but bucket was created and saved to state: ${error}`);
413
+ logger_1.logger.error(lang_1.lang.__('FAILED_TO_UPLOAD_BUCKET_FILES', { error: String(error) }));
223
414
  logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_TRACKED_CAN_RETRY'));
224
415
  }
225
416
  }
@@ -228,9 +419,7 @@ const createBucketResource = async (context, bucket, state) => {
228
419
  region: context.region,
229
420
  definition: {
230
421
  ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
231
- ...(bucket.website?.domain != null
232
- ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
233
- : {}),
422
+ ...(domainName != null ? { domainBound: cnameInfo?.bucketCnameBound ?? null } : {}),
234
423
  },
235
424
  instances,
236
425
  lastUpdated: new Date().toISOString(),
@@ -238,11 +427,13 @@ const createBucketResource = async (context, bucket, state) => {
238
427
  return (0, common_1.setResource)(state, logicalId, finalResourceState);
239
428
  };
240
429
  exports.createBucketResource = createBucketResource;
430
+ /* istanbul ignore next */
241
431
  const readBucketResource = async (context, bucketName) => {
242
432
  const client = (0, aliyunClient_1.createAliyunClient)(context);
243
433
  return await client.oss.getBucket(bucketName);
244
434
  };
245
435
  exports.readBucketResource = readBucketResource;
436
+ /* istanbul ignore next */
246
437
  const updateBucketResource = async (context, bucket, state) => {
247
438
  const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
248
439
  const client = (0, aliyunClient_1.createAliyunClient)(context);
@@ -258,7 +449,7 @@ const updateBucketResource = async (context, bucket, state) => {
258
449
  }
259
450
  const bucketInfo = await client.oss.getBucket(config.bucketName);
260
451
  if (!bucketInfo) {
261
- throw new Error(`Failed to refresh state for bucket: ${config.bucketName}`);
452
+ throw new Error(lang_1.lang.__('FAILED_TO_REFRESH_STATE', { resourceType: 'bucket', name: config.bucketName }));
262
453
  }
263
454
  const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
264
455
  const logicalId = `buckets.${bucket.key}`;
@@ -267,17 +458,41 @@ const updateBucketResource = async (context, bucket, state) => {
267
458
  ? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
268
459
  : undefined;
269
460
  const existingState = state.resources[logicalId];
270
- const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
461
+ const domName = getDomainName(bucket);
462
+ const isCdnEnabled = getIsCdnEnabled(bucket);
463
+ const isAccelerateEnabled = getIsAccelerateEnabled(bucket);
464
+ const existingCdnInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION);
465
+ const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME ||
466
+ i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME);
271
467
  const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
272
468
  const existingWwwDnsInstance = existingDnsInstances?.find((i) => i.isWwwVariant);
273
469
  let cnameInfo;
274
- if (bucket.website?.domain) {
275
- const primaryDomain = bucket.website.domain;
276
- const wwwBindApex = bucket.website.www_bind_apex ?? false;
470
+ if (domName) {
471
+ const primaryDomain = domName;
472
+ const wwwBindApex = bucket.domain?.www_bind_apex ?? bucket.website?.www_bind_apex ?? false;
277
473
  const domainChanged = existingPrimaryDnsInstance?.domain !== primaryDomain;
278
- if (domainChanged && existingDnsInstances) {
279
- for (const instance of existingDnsInstances) {
280
- await client.oss.unbindCustomDomain(config.bucketName, instance.domain, instance.dnsRecordId, instance.txtRecordId);
474
+ if (domainChanged) {
475
+ // For CDN/accelerate buckets, don't delete old resources since we can't recreate them in update.
476
+ // The user must destroy+recreate to change the CDN domain.
477
+ if (!isCdnEnabled && !isAccelerateEnabled) {
478
+ // Clean up old CDN distributions
479
+ if (existingCdnInstances) {
480
+ for (const cdnInstance of existingCdnInstances) {
481
+ try {
482
+ await client.cdn.deleteCdnDomain(cdnInstance.domainName);
483
+ }
484
+ catch {
485
+ /* best effort */
486
+ }
487
+ }
488
+ }
489
+ // Clean up old DNS bindings
490
+ if (existingDnsInstances) {
491
+ for (const instance of existingDnsInstances) {
492
+ const ossInstance = instance;
493
+ await client.oss.unbindCustomDomain(config.bucketName, ossInstance.domain, ossInstance.dnsRecordId, ossInstance.txtRecordId);
494
+ }
495
+ }
281
496
  }
282
497
  }
283
498
  const certificate = await resolveBucketDomainCertificate(bucket, client);
@@ -291,19 +506,105 @@ const updateBucketResource = async (context, bucket, state) => {
291
506
  bucketName: config.bucketName,
292
507
  }));
293
508
  }
294
- cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
295
- if (cnameInfo) {
296
- const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
297
- const dnsInstance = {
298
- sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
299
- id: instanceId,
300
- type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
301
- domain: primaryDomain,
302
- cname: cnameInfo.cname,
303
- ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
304
- ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
305
- };
306
- instances.push(dnsInstance);
509
+ // Fail fast if CDN/accelerate was enabled but is now being removed
510
+ // (must use destroy+recreate to change CDN/accelerate configuration)
511
+ if (!isCdnEnabled && !isAccelerateEnabled) {
512
+ const existingDef = existingState?.definition;
513
+ const cdnWasEnabled = existingDef?.cdnEnabled === true;
514
+ const accelWasEnabled = existingDef?.accelerateEnabled === true;
515
+ if (cdnWasEnabled || accelWasEnabled) {
516
+ throw new Error(lang_1.lang.__('CDN_ACCELERATE_CONFIG_CHANGED', {
517
+ bucketName: config.bucketName,
518
+ }));
519
+ }
520
+ }
521
+ if (isCdnEnabled || isAccelerateEnabled) {
522
+ const existingDef = existingState?.definition;
523
+ const cdnWasEnabled = existingDef?.cdnEnabled === true;
524
+ const accelWasEnabled = existingDef?.accelerateEnabled === true;
525
+ const oldDomain = existingDef?.domain;
526
+ const oldCdnType = existingDef?.cdnType;
527
+ const oldCdnScope = existingDef?.cdnScope;
528
+ const oldCacheTtl = existingDef?.cdnCacheTtl;
529
+ const oldIgnoreQS = existingDef?.cdnIgnoreQueryString;
530
+ const oldOriginProto = existingDef?.cdnOriginProtocol;
531
+ const oldCompression = existingDef?.cdnCompression;
532
+ const oldHttpsRedirect = existingDef?.cdnForceRedirectHttps;
533
+ const enableChanged = cdnWasEnabled !== isCdnEnabled || accelWasEnabled !== isAccelerateEnabled;
534
+ const domainChanged = oldDomain !== primaryDomain;
535
+ if (enableChanged || domainChanged) {
536
+ throw new Error(lang_1.lang.__('CDN_ACCELERATE_CONFIG_CHANGED', {
537
+ bucketName: config.bucketName,
538
+ }));
539
+ }
540
+ const cdnConfig = typeof bucket.domain?.cdn === 'object' ? bucket.domain.cdn : undefined;
541
+ const resolvedCdnType = cdnConfig?.cdn_type ?? 'web';
542
+ const resolvedScope = cdnConfig?.scope ?? 'global';
543
+ if (isCdnEnabled) {
544
+ if (oldCdnType !== (cdnConfig?.cdn_type ?? 'web') ||
545
+ oldCdnScope !== (cdnConfig?.scope ?? 'global')) {
546
+ await client.cdn.modifyCdnDomain({
547
+ domainName: primaryDomain,
548
+ cdnType: resolvedCdnType,
549
+ scope: resolvedScope,
550
+ sources: [
551
+ {
552
+ type: 'oss',
553
+ content: isAccelerateEnabled
554
+ ? await client.oss.getAccelerateEndpoint(config.bucketName)
555
+ : await client.oss.getBucketCnameEndpoint(config.bucketName),
556
+ },
557
+ ],
558
+ });
559
+ }
560
+ if (oldCacheTtl !== cdnConfig?.cache_ttl ||
561
+ oldIgnoreQS !== cdnConfig?.ignore_query_string) {
562
+ await client.cdn.applyCacheConfig(primaryDomain, cdnConfig?.cache_ttl, cdnConfig?.ignore_query_string);
563
+ }
564
+ if (oldOriginProto !== cdnConfig?.origin_protocol) {
565
+ await client.cdn.applyProtocolConfig(primaryDomain, cdnConfig?.origin_protocol);
566
+ }
567
+ if (oldCompression !== cdnConfig?.compression) {
568
+ await client.cdn.applyCompression(primaryDomain, cdnConfig?.compression);
569
+ }
570
+ if (oldHttpsRedirect !== cdnConfig?.force_redirect_https) {
571
+ await client.cdn.applyHttpsRedirect(primaryDomain, cdnConfig?.force_redirect_https);
572
+ }
573
+ }
574
+ const existingCdnDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION ||
575
+ i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME);
576
+ const filteredInstances = wwwBindApex
577
+ ? (existingCdnDnsInstances ?? [])
578
+ : (existingCdnDnsInstances ?? []).filter((i) => !i.isWwwVariant);
579
+ if (filteredInstances.length > 0) {
580
+ instances.push(...filteredInstances);
581
+ }
582
+ return (0, common_1.setResource)(state, logicalId, {
583
+ mode: 'managed',
584
+ region: context.region,
585
+ definition: {
586
+ ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
587
+ ...(domName != null ? { domainBound: cnameInfo?.bucketCnameBound ?? null } : {}),
588
+ },
589
+ instances,
590
+ lastUpdated: new Date().toISOString(),
591
+ });
592
+ }
593
+ else {
594
+ cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
595
+ if (cnameInfo) {
596
+ const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
597
+ const dnsInstance = {
598
+ sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
599
+ id: instanceId,
600
+ type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
601
+ domain: primaryDomain,
602
+ cname: cnameInfo.cname,
603
+ ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
604
+ ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
605
+ };
606
+ instances.push(dnsInstance);
607
+ }
307
608
  }
308
609
  const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
309
610
  if (wwwDomain) {
@@ -328,7 +629,8 @@ const updateBucketResource = async (context, bucket, state) => {
328
629
  }
329
630
  }
330
631
  else if (existingWwwDnsInstance && !wwwBindApex) {
331
- await client.oss.unbindCustomDomain(config.bucketName, existingWwwDnsInstance.domain, existingWwwDnsInstance.dnsRecordId, existingWwwDnsInstance.txtRecordId);
632
+ const wwwInstance = existingWwwDnsInstance;
633
+ await client.oss.unbindCustomDomain(config.bucketName, wwwInstance.domain, wwwInstance.dnsRecordId, wwwInstance.txtRecordId);
332
634
  }
333
635
  const refreshedInfo = await client.oss.getBucket(config.bucketName);
334
636
  if (refreshedInfo) {
@@ -337,7 +639,8 @@ const updateBucketResource = async (context, bucket, state) => {
337
639
  }
338
640
  else if (existingDnsInstances) {
339
641
  for (const instance of existingDnsInstances) {
340
- await client.oss.unbindCustomDomain(config.bucketName, instance.domain, instance.dnsRecordId, instance.txtRecordId);
642
+ const ossInstance = instance;
643
+ await client.oss.unbindCustomDomain(config.bucketName, ossInstance.domain, ossInstance.dnsRecordId, ossInstance.txtRecordId);
341
644
  }
342
645
  }
343
646
  const resourceState = {
@@ -345,9 +648,7 @@ const updateBucketResource = async (context, bucket, state) => {
345
648
  region: context.region,
346
649
  definition: {
347
650
  ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
348
- ...(bucket.website?.domain != null
349
- ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
350
- : {}),
651
+ ...(domName != null ? { domainBound: cnameInfo?.bucketCnameBound ?? null } : {}),
351
652
  },
352
653
  instances,
353
654
  lastUpdated: new Date().toISOString(),
@@ -355,10 +656,41 @@ const updateBucketResource = async (context, bucket, state) => {
355
656
  return (0, common_1.setResource)(state, logicalId, resourceState);
356
657
  };
357
658
  exports.updateBucketResource = updateBucketResource;
659
+ /* istanbul ignore next */
358
660
  const deleteBucketResource = async (context, bucketName, logicalId, state) => {
359
661
  const client = (0, aliyunClient_1.createAliyunClient)(context);
360
662
  const existingState = state.resources[logicalId];
361
663
  const dnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
664
+ // Clean up CDN distributions if any
665
+ const cdnInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION);
666
+ if (cdnInstances) {
667
+ for (const cdnInstance of cdnInstances) {
668
+ try {
669
+ await client.cdn.deleteCdnDomain(cdnInstance.domainName);
670
+ logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
671
+ }
672
+ catch (error) {
673
+ logger_1.logger.warn(lang_1.lang.__('CDN_DOMAIN_DELETE_FAILED', {
674
+ domain: cdnInstance.domainName,
675
+ error: String(error),
676
+ }));
677
+ }
678
+ }
679
+ }
680
+ // Clean up CDN DNS CNAME records
681
+ const cdnDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME);
682
+ if (cdnDnsInstances && client.dns) {
683
+ for (const dnsInstance of cdnDnsInstances) {
684
+ if (dnsInstance.dnsRecordId) {
685
+ try {
686
+ await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
687
+ }
688
+ catch {
689
+ // Best effort cleanup
690
+ }
691
+ }
692
+ }
693
+ }
362
694
  if (dnsInstances) {
363
695
  for (const dnsInstance of dnsInstances) {
364
696
  await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId, dnsInstance.txtRecordId);