@geek-fun/serverlessinsight 0.8.1 → 0.8.3

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 (119) hide show
  1. package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +14 -0
  2. package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +14 -0
  3. package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +348 -0
  4. package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +14 -0
  5. package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +114 -0
  6. package/.serverlessinsight/state-insight-volc-destroy-app-insight-volc-destroy.json.backup +1 -0
  7. package/README.md +26 -18
  8. package/README.zh-CN.md +19 -6
  9. package/dist/package.json +3 -1
  10. package/dist/src/commands/deploy.js +87 -4
  11. package/dist/src/commands/destroy.js +61 -10
  12. package/dist/src/commands/forceUnlock.js +8 -0
  13. package/dist/src/commands/index.js +34 -2
  14. package/dist/src/commands/login.js +195 -0
  15. package/dist/src/commands/logout.js +17 -0
  16. package/dist/src/commands/show.js +15 -7
  17. package/dist/src/commands/whoami.js +20 -0
  18. package/dist/src/common/aliyunClient/apigwOperations.js +332 -32
  19. package/dist/src/common/aliyunClient/esOperations.js +43 -29
  20. package/dist/src/common/aliyunClient/fc3Operations.js +481 -207
  21. package/dist/src/common/aliyunClient/ossOperations.js +165 -13
  22. package/dist/src/common/aliyunClient/rdsOperations.js +143 -39
  23. package/dist/src/common/aliyunClient/slsOperations.js +56 -26
  24. package/dist/src/common/aliyunClient/tablestoreOperations.js +25 -22
  25. package/dist/src/common/apiClient.js +102 -0
  26. package/dist/src/common/constants.js +9 -4
  27. package/dist/src/common/credentialStore.js +94 -0
  28. package/dist/src/common/credentials.js +2 -0
  29. package/dist/src/common/eventQueue.js +208 -0
  30. package/dist/src/common/hashUtils.js +87 -11
  31. package/dist/src/common/imsClient.js +1 -0
  32. package/dist/src/common/index.js +3 -0
  33. package/dist/src/common/lockManager.js +61 -54
  34. package/dist/src/common/logger.js +2 -0
  35. package/dist/src/common/polling.js +54 -0
  36. package/dist/src/common/reportResourceEvent.js +8 -0
  37. package/dist/src/common/runtimeMapper.js +11 -12
  38. package/dist/src/common/stateBackend/index.js +10 -1
  39. package/dist/src/common/stateBackend/localStateBackend.js +4 -1
  40. package/dist/src/common/stateBackend/remoteStateBackend.js +6 -3
  41. package/dist/src/common/stateBackend/saasStateBackend.js +266 -0
  42. package/dist/src/common/stateManager.js +135 -13
  43. package/dist/src/common/tencentClient/cosOperations.js +180 -3
  44. package/dist/src/common/tencentClient/esOperations.js +110 -46
  45. package/dist/src/common/tencentClient/index.js +22 -1
  46. package/dist/src/common/tencentClient/scfOperations.js +255 -133
  47. package/dist/src/common/tencentClient/tdsqlcClusterMapper.js +81 -0
  48. package/dist/src/common/tencentClient/tdsqlcOperations.js +93 -99
  49. package/dist/src/common/triggerMapper.js +36 -0
  50. package/dist/src/common/volcengineClient/apigwOperations.js +539 -159
  51. package/dist/src/common/volcengineClient/iamOperations.js +58 -48
  52. package/dist/src/common/volcengineClient/index.js +46 -21
  53. package/dist/src/common/volcengineClient/stsOperations.js +32 -0
  54. package/dist/src/common/volcengineClient/tlsOperations.js +229 -178
  55. package/dist/src/common/volcengineClient/tosOperations.js +78 -19
  56. package/dist/src/common/volcengineClient/vefaasOperations.js +272 -54
  57. package/dist/src/lang/en.js +84 -0
  58. package/dist/src/lang/zh-CN.js +84 -0
  59. package/dist/src/parser/eventParser.js +2 -0
  60. package/dist/src/parser/functionParser.js +96 -65
  61. package/dist/src/parser/index.js +7 -4
  62. package/dist/src/stack/aliyunStack/apigwExecutor.js +39 -1
  63. package/dist/src/stack/aliyunStack/apigwPlanner.js +14 -10
  64. package/dist/src/stack/aliyunStack/apigwResource.js +230 -125
  65. package/dist/src/stack/aliyunStack/apigwTypes.js +16 -3
  66. package/dist/src/stack/aliyunStack/databaseExecutor.js +39 -1
  67. package/dist/src/stack/aliyunStack/databasePlanner.js +13 -1
  68. package/dist/src/stack/aliyunStack/databaseResource.js +135 -40
  69. package/dist/src/stack/aliyunStack/deployer.js +2 -2
  70. package/dist/src/stack/aliyunStack/destroyer.js +2 -2
  71. package/dist/src/stack/aliyunStack/fc3Executor.js +25 -2
  72. package/dist/src/stack/aliyunStack/fc3Planner.js +11 -1
  73. package/dist/src/stack/aliyunStack/fc3Resource.js +327 -64
  74. package/dist/src/stack/aliyunStack/ossExecutor.js +39 -1
  75. package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
  76. package/dist/src/stack/aliyunStack/ossResource.js +267 -219
  77. package/dist/src/stack/aliyunStack/tablestoreExecutor.js +39 -1
  78. package/dist/src/stack/aliyunStack/tablestorePlanner.js +13 -1
  79. package/dist/src/stack/aliyunStack/tablestoreResource.js +54 -20
  80. package/dist/src/stack/alreadyExists.js +26 -0
  81. package/dist/src/stack/ownershipTag.js +40 -0
  82. package/dist/src/stack/rfsStack/index.js +3 -1
  83. package/dist/src/stack/scfStack/cosExecutor.js +39 -1
  84. package/dist/src/stack/scfStack/cosPlanner.js +11 -1
  85. package/dist/src/stack/scfStack/cosResource.js +167 -64
  86. package/dist/src/stack/scfStack/deployer.js +2 -2
  87. package/dist/src/stack/scfStack/destroyer.js +2 -2
  88. package/dist/src/stack/scfStack/esServerlessExecutor.js +39 -1
  89. package/dist/src/stack/scfStack/esServerlessPlanner.js +11 -1
  90. package/dist/src/stack/scfStack/esServerlessResource.js +88 -23
  91. package/dist/src/stack/scfStack/scfExecutor.js +39 -1
  92. package/dist/src/stack/scfStack/scfPlanner.js +12 -2
  93. package/dist/src/stack/scfStack/scfResource.js +484 -14
  94. package/dist/src/stack/scfStack/tdsqlcExecutor.js +39 -1
  95. package/dist/src/stack/scfStack/tdsqlcPlanner.js +12 -1
  96. package/dist/src/stack/scfStack/tdsqlcResource.js +95 -16
  97. package/dist/src/stack/scfStack/tdsqlcTypes.js +5 -1
  98. package/dist/src/stack/volcengineStack/apigwExecutor.js +39 -1
  99. package/dist/src/stack/volcengineStack/apigwPlanner.js +25 -53
  100. package/dist/src/stack/volcengineStack/apigwResource.js +418 -222
  101. package/dist/src/stack/volcengineStack/apigwTypes.js +76 -66
  102. package/dist/src/stack/volcengineStack/deployer.js +49 -14
  103. package/dist/src/stack/volcengineStack/destroyer.js +1 -1
  104. package/dist/src/stack/volcengineStack/index.js +1 -2
  105. package/dist/src/stack/volcengineStack/tosExecutor.js +25 -2
  106. package/dist/src/stack/volcengineStack/tosPlanner.js +11 -1
  107. package/dist/src/stack/volcengineStack/tosResource.js +82 -27
  108. package/dist/src/stack/volcengineStack/tosTypes.js +12 -0
  109. package/dist/src/stack/volcengineStack/vefaasExecutor.js +25 -2
  110. package/dist/src/stack/volcengineStack/vefaasPlanner.js +71 -2
  111. package/dist/src/stack/volcengineStack/vefaasResource.js +148 -98
  112. package/dist/src/stack/volcengineStack/vefaasTypes.js +1 -3
  113. package/dist/src/types/domains/backend.js +1 -0
  114. package/dist/src/types/domains/state.js +29 -1
  115. package/dist/src/validator/eventSchema.js +10 -0
  116. package/dist/src/validator/functionSchema.js +37 -12
  117. package/dist/src/validator/iacSchema.js +1 -0
  118. package/dist/tsconfig.tsbuildinfo +1 -1
  119. package/package.json +3 -1
@@ -11,6 +11,8 @@ const logger_1 = require("../../common/logger");
11
11
  const lang_1 = require("../../lang");
12
12
  const domainUtils_1 = require("../../common/domainUtils");
13
13
  const hashUtils_1 = require("../../common/hashUtils");
14
+ const ownershipTag_1 = require("../ownershipTag");
15
+ const alreadyExists_1 = require("../alreadyExists");
14
16
  const getCdnConfig = (event) => {
15
17
  const domainCdn = event.domain?.cdn;
16
18
  if (domainCdn == null) {
@@ -183,6 +185,9 @@ const cleanupApigwCdnResources = async (client, instances, domains) => {
183
185
  logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
184
186
  }
185
187
  catch (error) {
188
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
189
+ throw error;
190
+ }
186
191
  logger_1.logger.warn(lang_1.lang.__('CDN_DOMAIN_DELETE_FAILED', {
187
192
  domain: cdnInstance.domainName,
188
193
  error: String(error),
@@ -197,8 +202,10 @@ const cleanupApigwCdnResources = async (client, instances, domains) => {
197
202
  try {
198
203
  await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
199
204
  }
200
- catch {
201
- // Best effort cleanup
205
+ catch (error) {
206
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
207
+ throw error;
208
+ }
202
209
  }
203
210
  }
204
211
  };
@@ -214,12 +221,17 @@ const buildApigwGroupInstanceFromProvider = (info, stage) => {
214
221
  subDomain: info.subDomain ?? null,
215
222
  instanceId: info.instanceId ?? null,
216
223
  instanceType: info.instanceType ?? null,
224
+ regionId: info.regionId ?? null,
217
225
  status: info.status ?? null,
218
226
  createdTime: info.createdTime ?? null,
219
227
  modifiedTime: info.modifiedTime ?? null,
220
228
  billingStatus: info.billingStatus ?? null,
221
229
  illegalStatus: info.illegalStatus ?? null,
222
230
  trafficLimit: info.trafficLimit ?? null,
231
+ tags: info.tags?.map((tag) => ({
232
+ key: tag.Key ?? null,
233
+ value: tag.Value ?? null,
234
+ })),
223
235
  };
224
236
  };
225
237
  const buildApigwApiInstanceFromProvider = (info, stage, groupId) => {
@@ -237,8 +249,10 @@ const buildApigwApiInstanceFromProvider = (info, stage, groupId) => {
237
249
  requestConfig: info.requestConfig ?? null,
238
250
  serviceConfig: info.serviceConfig ?? null,
239
251
  resultType: info.resultType ?? null,
252
+ resultSample: info.resultSample ?? null,
240
253
  createdTime: info.createdTime ?? null,
241
254
  modifiedTime: info.modifiedTime ?? null,
255
+ deployedInfos: info.deployedInfos ?? null,
242
256
  };
243
257
  };
244
258
  const buildApigwDeploymentInstance = (groupId, apiId, stageName, stage) => {
@@ -289,66 +303,169 @@ const buildDomainBindingConfig = async (domain, groupId, serviceName, eventKey,
289
303
  const createApigwResource = async (context, event, serviceName, roleArn, state) => {
290
304
  const logicalId = `events.${event.key}`;
291
305
  const client = (0, aliyunClient_1.createAliyunClient)(context);
292
- const groupConfig = (0, apigwTypes_1.eventToApigwGroupConfig)(event, serviceName, context.stage);
306
+ const groupConfig = (0, apigwTypes_1.eventToApigwGroupConfig)(event, serviceName, context.stage, context, logicalId);
307
+ // Stamp the ownership tag — the create-time contract that lets a later run
308
+ // (state reset, mid-run failure) idempotently adopt the group we create
309
+ // without risking takeover of a same-named group from another project.
310
+ groupConfig.tags = [
311
+ { key: ownershipTag_1.OWNERSHIP_TAG_KEY, value: (0, ownershipTag_1.buildOwnershipTagValue)(context, logicalId) },
312
+ ];
313
+ const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
293
314
  let groupId;
315
+ const buildResourceDefinition = () => ({
316
+ ...groupDefinition,
317
+ triggers: event.triggers.map((t) => ({
318
+ method: t.method,
319
+ path: t.path,
320
+ backend: t.backend,
321
+ })),
322
+ domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
323
+ });
324
+ // Persist a tainted state BEFORE any cloud side-effect so a group created
325
+ // in cloud but not yet tracked stays tracked if a later step fails.
326
+ let stateAfterDependents = (0, stateManager_1.setResource)(state, logicalId, {
327
+ mode: 'managed',
328
+ region: context.region,
329
+ definition: buildResourceDefinition(),
330
+ instances: [],
331
+ lastUpdated: new Date().toISOString(),
332
+ status: 'tainted',
333
+ });
294
334
  try {
295
335
  const existingGroup = await client.apigw.findApiGroupByName(groupConfig.groupName);
296
336
  if (existingGroup?.groupId) {
297
- logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_FOUND_REUSING', { groupName: groupConfig.groupName }));
298
- groupId = existingGroup.groupId;
337
+ if ((0, ownershipTag_1.isOwnedByStack)(context, logicalId, existingGroup.tags)) {
338
+ logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_FOUND_REUSING', { groupName: groupConfig.groupName }));
339
+ logger_1.logger.info(`API group ${groupConfig.groupName} found and owned by this stack, reusing`);
340
+ groupId = existingGroup.groupId;
341
+ }
342
+ else {
343
+ throw new types_1.PartialResourceError(stateAfterDependents, new Error(`API group ${groupConfig.groupName} already exists but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to adopt — resolve manually.`));
344
+ }
299
345
  }
300
346
  else {
301
- groupId = await client.apigw.createApiGroup(groupConfig);
347
+ try {
348
+ groupId = await client.apigw.createApiGroup(groupConfig);
349
+ }
350
+ catch (error) {
351
+ if ((0, alreadyExists_1.isResourceAlreadyExistsError)(error)) {
352
+ const probe = await client.apigw.findApiGroupByName(groupConfig.groupName);
353
+ if (probe?.groupId && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.tags)) {
354
+ groupId = probe.groupId;
355
+ logger_1.logger.info(`API group ${groupConfig.groupName} exists after create conflict and carries ownership tag (${ownershipTag_1.OWNERSHIP_TAG_KEY}), adopting idempotently`);
356
+ }
357
+ else {
358
+ throw new types_1.PartialResourceError(stateAfterDependents, new Error(`API group ${groupConfig.groupName} already exists but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to adopt — resolve manually.`));
359
+ }
360
+ }
361
+ else {
362
+ throw error;
363
+ }
364
+ }
302
365
  }
303
- }
304
- catch (error) {
305
- logger_1.logger.debug(`Could not find existing group, creating new: ${error}`);
306
- groupId = await client.apigw.createApiGroup(groupConfig);
307
- }
308
- // Get group info for state
309
- const groupInfo = await client.apigw.getApiGroup(groupId);
310
- if (!groupInfo) {
311
- throw new Error(`Failed to get API group info after creation: ${groupId}`);
312
- }
313
- const instances = [
314
- buildApigwGroupInstanceFromProvider(groupInfo, context.stage),
315
- ];
316
- const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
317
- const partialResourceState = {
318
- mode: 'managed',
319
- region: context.region,
320
- definition: {
321
- ...groupDefinition,
322
- triggers: event.triggers.map((t) => ({
323
- method: t.method,
324
- path: t.path,
325
- backend: t.backend,
326
- })),
327
- domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
328
- },
329
- instances,
330
- lastUpdated: new Date().toISOString(),
331
- };
332
- state = (0, stateManager_1.setResource)(state, logicalId, partialResourceState);
333
- // Create APIs and deployments for each trigger
334
- for (const trigger of event.triggers) {
335
- const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage, roleArn);
336
- const apiId = await client.apigw.createApi(apiConfig);
337
- // Get API info for state
338
- const apiInfo = await client.apigw.getApi(groupId, apiId);
339
- if (apiInfo) {
340
- instances.push(buildApigwApiInstanceFromProvider(apiInfo, context.stage, groupId));
366
+ // Get group info for state
367
+ const groupInfo = await client.apigw.getApiGroup(groupId);
368
+ if (!groupInfo) {
369
+ throw new Error(`Failed to get API group info after creation: ${groupId}`);
370
+ }
371
+ const instances = [
372
+ buildApigwGroupInstanceFromProvider(groupInfo, context.stage),
373
+ ];
374
+ // Group id is now known - persist the tainted state carrying the group
375
+ // instance so a retry resumes from here if API creation fails below.
376
+ stateAfterDependents = (0, stateManager_1.setResource)(stateAfterDependents, logicalId, {
377
+ mode: 'managed',
378
+ region: context.region,
379
+ definition: buildResourceDefinition(),
380
+ instances,
381
+ lastUpdated: new Date().toISOString(),
382
+ status: 'tainted',
383
+ });
384
+ let currentState = stateAfterDependents;
385
+ // Create APIs and deployments for each trigger
386
+ for (const trigger of event.triggers) {
387
+ const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage, roleArn);
388
+ const apiId = await client.apigw.createApi(apiConfig);
389
+ // Get API info for state
390
+ const apiInfo = await client.apigw.getApi(groupId, apiId);
391
+ if (apiInfo) {
392
+ instances.push(buildApigwApiInstanceFromProvider(apiInfo, context.stage, groupId));
393
+ }
394
+ // Deploy API to RELEASE stage
395
+ const deploymentConfig = {
396
+ groupId,
397
+ apiId,
398
+ stageName: 'RELEASE',
399
+ description: `${serviceName} API deployment for ${trigger.method} ${trigger.path}`,
400
+ };
401
+ await client.apigw.deployApi(deploymentConfig);
402
+ instances.push(buildApigwDeploymentInstance(groupId, apiId, 'RELEASE', context.stage));
403
+ const updatedResourceState = {
404
+ mode: 'managed',
405
+ region: context.region,
406
+ definition: {
407
+ ...groupDefinition,
408
+ triggers: event.triggers.map((t) => ({
409
+ method: t.method,
410
+ path: t.path,
411
+ backend: t.backend,
412
+ })),
413
+ domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
414
+ },
415
+ instances,
416
+ lastUpdated: new Date().toISOString(),
417
+ };
418
+ currentState = (0, stateManager_1.setResource)(currentState, logicalId, updatedResourceState);
341
419
  }
342
- // Deploy API to RELEASE stage
343
- const deploymentConfig = {
344
- groupId,
345
- apiId,
346
- stageName: 'RELEASE',
347
- description: `${serviceName} API deployment for ${trigger.method} ${trigger.path}`,
348
- };
349
- await client.apigw.deployApi(deploymentConfig);
350
- instances.push(buildApigwDeploymentInstance(groupId, apiId, 'RELEASE', context.stage));
351
- const updatedResourceState = {
420
+ if (event.domain) {
421
+ try {
422
+ const primaryDomain = event.domain.domain_name;
423
+ const wwwBindApex = event.domain.www_bind_apex === true;
424
+ const isCdnEnabled = getIsCdnEnabled(event);
425
+ const originDomain = groupInfo.subDomain;
426
+ if (!originDomain) {
427
+ throw new Error(`API Gateway group ${groupId} has no subDomain for CDN origin`);
428
+ }
429
+ const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
430
+ if (isCdnEnabled) {
431
+ await createApigwCdnDistribution(context, client, event, primaryDomain, originDomain, instances, {
432
+ certificateBody: domainConfig.certificateBody,
433
+ certificatePrivateKey: domainConfig.certificatePrivateKey,
434
+ });
435
+ }
436
+ else {
437
+ currentState = await client.apigw.bindCustomDomain(domainConfig, currentState, logicalId);
438
+ }
439
+ const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
440
+ if (wwwDomain) {
441
+ logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
442
+ const wwwDomainConfig = {
443
+ ...domainConfig,
444
+ domainName: wwwDomain,
445
+ certificateName: domainConfig.certificateName
446
+ ? `${domainConfig.certificateName}-www`
447
+ : undefined,
448
+ };
449
+ if (isCdnEnabled) {
450
+ await createApigwCdnDistribution(context, client, event, wwwDomain, originDomain, instances, {
451
+ certificateBody: wwwDomainConfig.certificateBody,
452
+ certificatePrivateKey: wwwDomainConfig.certificatePrivateKey,
453
+ });
454
+ }
455
+ else {
456
+ currentState = await client.apigw.bindCustomDomain(wwwDomainConfig, currentState, logicalId);
457
+ }
458
+ }
459
+ }
460
+ catch (error) {
461
+ logger_1.logger.error(lang_1.lang.__('APIGW_DOMAIN_BINDING_FAILED', { error: String(error) }));
462
+ logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_APIS_CREATED_DOMAIN_FAILED'));
463
+ logger_1.logger.info(lang_1.lang.__('APIGW_STATE_SAVED_RETRY'));
464
+ throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
465
+ }
466
+ }
467
+ // Update final state with all instances (group + APIs + deployments)
468
+ const finalResourceState = {
352
469
  mode: 'managed',
353
470
  region: context.region,
354
471
  definition: {
@@ -363,72 +480,11 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
363
480
  instances,
364
481
  lastUpdated: new Date().toISOString(),
365
482
  };
366
- state = (0, stateManager_1.setResource)(state, logicalId, updatedResourceState);
483
+ return (0, stateManager_1.setResource)(currentState, logicalId, finalResourceState);
367
484
  }
368
- if (event.domain) {
369
- try {
370
- const primaryDomain = event.domain.domain_name;
371
- const wwwBindApex = event.domain.www_bind_apex === true;
372
- const isCdnEnabled = getIsCdnEnabled(event);
373
- const originDomain = groupInfo.subDomain;
374
- if (!originDomain) {
375
- throw new Error(`API Gateway group ${groupId} has no subDomain for CDN origin`);
376
- }
377
- const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
378
- if (isCdnEnabled) {
379
- await createApigwCdnDistribution(context, client, event, primaryDomain, originDomain, instances, {
380
- certificateBody: domainConfig.certificateBody,
381
- certificatePrivateKey: domainConfig.certificatePrivateKey,
382
- });
383
- }
384
- else {
385
- state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
386
- }
387
- const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
388
- if (wwwDomain) {
389
- logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
390
- const wwwDomainConfig = {
391
- ...domainConfig,
392
- domainName: wwwDomain,
393
- certificateName: domainConfig.certificateName
394
- ? `${domainConfig.certificateName}-www`
395
- : undefined,
396
- };
397
- if (isCdnEnabled) {
398
- await createApigwCdnDistribution(context, client, event, wwwDomain, originDomain, instances, {
399
- certificateBody: wwwDomainConfig.certificateBody,
400
- certificatePrivateKey: wwwDomainConfig.certificatePrivateKey,
401
- });
402
- }
403
- else {
404
- state = await client.apigw.bindCustomDomain(wwwDomainConfig, state, logicalId);
405
- }
406
- }
407
- }
408
- catch (error) {
409
- logger_1.logger.error(lang_1.lang.__('APIGW_DOMAIN_BINDING_FAILED', { error: String(error) }));
410
- logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_APIS_CREATED_DOMAIN_FAILED'));
411
- logger_1.logger.info(lang_1.lang.__('APIGW_STATE_SAVED_RETRY'));
412
- return state;
413
- }
485
+ catch (error) {
486
+ throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
414
487
  }
415
- // Update final state with all instances (group + APIs + deployments)
416
- const finalResourceState = {
417
- mode: 'managed',
418
- region: context.region,
419
- definition: {
420
- ...groupDefinition,
421
- triggers: event.triggers.map((t) => ({
422
- method: t.method,
423
- path: t.path,
424
- backend: t.backend,
425
- })),
426
- domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
427
- },
428
- instances,
429
- lastUpdated: new Date().toISOString(),
430
- };
431
- return (0, stateManager_1.setResource)(state, logicalId, finalResourceState);
432
488
  };
433
489
  exports.createApigwResource = createApigwResource;
434
490
  const readApigwResource = async (context, groupId) => {
@@ -516,6 +572,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
516
572
  if (!cloudGroup?.groupId) {
517
573
  return findCloudGroupOrCreate();
518
574
  }
575
+ if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, cloudGroup.tags)) {
576
+ throw new Error(`API group ${groupConfig.groupName} already exists but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to adopt — resolve manually.`);
577
+ }
519
578
  const cloudApis = await client.apigw.listApisByGroup(cloudGroup.groupId);
520
579
  const built = buildCloudInstance(cloudGroup, cloudApis);
521
580
  groupId = built.groupId;
@@ -596,8 +655,13 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
596
655
  // the domain was previously successfully bound (DNS records exist in state).
597
656
  // This avoids unnecessary DNS verification (minutes-long) on every deploy.
598
657
  // We check DNS sub-resources to avoid skipping after a previously failed binding.
658
+ // Check for ANY DNS sub-resource — covers both primary and www domains.
659
+ // If any domain was previously bound, its DNS record exists in state.
599
660
  const hasBoundDomains = (0, stateManager_1.getResource)(state, `${logicalId}.dns_verification`) !== undefined ||
600
- (0, stateManager_1.getResource)(state, `${logicalId}.dns_txt_verification`) !== undefined;
661
+ (0, stateManager_1.getResource)(state, `${logicalId}.dns_txt_verification`) !== undefined ||
662
+ Object.keys(state.resources ?? {}).some((k) => k.startsWith(`${logicalId}.dns_`) &&
663
+ k !== `${logicalId}.dns_verification` &&
664
+ k !== `${logicalId}.dns_txt_verification`);
601
665
  if (previousDomainDef &&
602
666
  desiredDomainDef &&
603
667
  hasBoundDomains &&
@@ -680,6 +744,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
680
744
  await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
681
745
  }
682
746
  catch (error) {
747
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
748
+ throw error;
749
+ }
683
750
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
684
751
  domain: previousWwwDomain,
685
752
  error: String(error),
@@ -701,6 +768,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
701
768
  await client.apigw.unbindCustomDomain(groupId, previousDomain);
702
769
  }
703
770
  catch (error) {
771
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
772
+ throw error;
773
+ }
704
774
  logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: previousDomain, error: String(error) }));
705
775
  }
706
776
  if (existingDomain.wwwBindApex === true) {
@@ -710,6 +780,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
710
780
  await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
711
781
  }
712
782
  catch (error) {
783
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
784
+ throw error;
785
+ }
713
786
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
714
787
  domain: previousWwwDomain,
715
788
  error: String(error),
@@ -765,6 +838,9 @@ const deleteApigwResource = async (context, logicalId, state) => {
765
838
  await client.apigw.unbindCustomDomain(groupId, primaryDomain);
766
839
  }
767
840
  catch (error) {
841
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
842
+ throw error;
843
+ }
768
844
  logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: primaryDomain, error: String(error) }));
769
845
  }
770
846
  if (existingDomain.wwwBindApex === true) {
@@ -774,6 +850,9 @@ const deleteApigwResource = async (context, logicalId, state) => {
774
850
  await client.apigw.unbindCustomDomain(groupId, wwwDomain);
775
851
  }
776
852
  catch (error) {
853
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
854
+ throw error;
855
+ }
777
856
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
778
857
  domain: wwwDomain,
779
858
  error: String(error),
@@ -788,8 +867,14 @@ const deleteApigwResource = async (context, logicalId, state) => {
788
867
  try {
789
868
  await client.apigw.abolishApi(deployment.groupId || groupId, deployment.apiId, deployment.stageName || 'RELEASE');
790
869
  }
791
- catch {
792
- // Deployment might already be abolished
870
+ catch (error) {
871
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
872
+ throw error;
873
+ }
874
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
875
+ resourceType: 'API deployment',
876
+ name: `${deployment.apiId}/${deployment.stageName}`,
877
+ }));
793
878
  }
794
879
  }
795
880
  const apis = existingInstances.filter((i) => i.type === 'ALIYUN_APIGW_API');
@@ -797,15 +882,27 @@ const deleteApigwResource = async (context, logicalId, state) => {
797
882
  try {
798
883
  await client.apigw.deleteApi(groupId, api.id);
799
884
  }
800
- catch {
801
- // API might already be deleted
885
+ catch (error) {
886
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
887
+ throw error;
888
+ }
889
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
890
+ resourceType: 'API',
891
+ name: api.id,
892
+ }));
802
893
  }
803
894
  }
804
895
  try {
805
896
  await client.apigw.deleteApiGroup(groupId);
806
897
  }
807
- catch {
808
- // Group might already be deleted
898
+ catch (error) {
899
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
900
+ throw error;
901
+ }
902
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
903
+ resourceType: 'API Gateway group',
904
+ name: groupId,
905
+ }));
809
906
  }
810
907
  return (0, stateManager_1.removeResource)(state, logicalId);
811
908
  };
@@ -815,10 +912,18 @@ exports.deleteApigwResource = deleteApigwResource;
815
912
  */
816
913
  const cleanupDnsRecords = async (context, eventLogicalId, state) => {
817
914
  const client = (0, aliyunClient_1.createAliyunClient)(context);
915
+ // Backward-compatible: always check old-style fixed keys, then scan for
916
+ // domain-specific keys (primary + www + any) created by the new code.
818
917
  const dnsResourceIds = [
819
918
  `${eventLogicalId}.dns_verification`,
820
919
  `${eventLogicalId}.dns_txt_verification`,
821
920
  ];
921
+ const dnsPrefix = `${eventLogicalId}.dns_`;
922
+ for (const key of Object.keys(state.resources ?? {})) {
923
+ if (key.startsWith(dnsPrefix) && !dnsResourceIds.includes(key)) {
924
+ dnsResourceIds.push(key);
925
+ }
926
+ }
822
927
  for (const dnsResourceId of dnsResourceIds) {
823
928
  const dnsState = (0, stateManager_1.getResource)(state, dnsResourceId);
824
929
  if (!dnsState) {
@@ -3,14 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.extractEventDomainDefinition = exports.inferProtocolConfig = exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.generateApiKey = exports.eventToApigwGroupConfig = void 0;
4
4
  const common_1 = require("../../common");
5
5
  const lang_1 = require("../../lang");
6
+ const ownershipTag_1 = require("../ownershipTag");
6
7
  /**
7
8
  * Convert EventDomain to API Gateway group config
9
+ *
10
+ * When a context + logicalId are supplied, the config carries the ownership
11
+ * tag that lets a later run idempotently adopt the group created here (state
12
+ * reset or mid-run failure) without risking takeover of a same-named group
13
+ * that belongs to another project.
8
14
  */
9
- const eventToApigwGroupConfig = (event, serviceName, stage) => {
10
- return {
15
+ const eventToApigwGroupConfig = (event, serviceName, stage, context, logicalId) => {
16
+ const groupConfig = {
11
17
  groupName: `${serviceName}-${stage}-agw-group`.replace(/_/g, '-'),
12
18
  description: `API Gateway group for ${serviceName}`,
13
19
  };
20
+ if (context && logicalId) {
21
+ groupConfig.tags = [
22
+ { key: ownershipTag_1.OWNERSHIP_TAG_KEY, value: (0, ownershipTag_1.buildOwnershipTagValue)(context, logicalId) },
23
+ ];
24
+ }
25
+ return groupConfig;
14
26
  };
15
27
  exports.eventToApigwGroupConfig = eventToApigwGroupConfig;
16
28
  /**
@@ -61,7 +73,8 @@ const triggerToApigwApiConfig = (event, trigger, groupId, serviceName, region, s
61
73
  const protocolConfig = (0, exports.inferProtocolConfig)(event.domain?.protocol);
62
74
  return {
63
75
  groupId,
64
- apiName: `${event.name}-${stage}-agw-api-${apiKey}`.replace(/_/g, '-'),
76
+ // Aliyun CreateApi requires 4-50 chars of [A-Za-z0-9_] — no hyphens.
77
+ apiName: `${event.name.replace(/-/g, '_')}_${stage}_agw_api_${apiKey}`.slice(0, 50),
65
78
  visibility: 'PRIVATE',
66
79
  authType: 'ANONYMOUS',
67
80
  requestConfig: {
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.executeDatabasePlan = void 0;
4
+ const types_1 = require("../../types");
4
5
  const databaseResource_1 = require("./databaseResource");
5
6
  const common_1 = require("../../common");
7
+ const reportResourceEvent_1 = require("../../common/reportResourceEvent");
6
8
  const stateManager_1 = require("../../common/stateManager");
7
9
  const lang_1 = require("../../lang");
8
10
  const getResourceTypeName = (resourceType) => resourceType === 'ALIYUN_ES_SERVERLESS' ? 'Elasticsearch Serverless' : 'RDS Serverless';
@@ -97,13 +99,26 @@ const executeDatabasePlan = async (context, plan, databases, initialState, onSta
97
99
  const successfulItems = [];
98
100
  let currentState = initialState;
99
101
  for (const item of plan.items) {
102
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
103
+ type: 'resource_pre',
104
+ logicalId: item.logicalId,
105
+ resourceType: item.resourceType,
106
+ action: item.action,
107
+ ...(item.drifted ? { message: 'resource drifted' } : {}),
108
+ });
109
+ const __siStartedAt = Date.now();
100
110
  try {
101
111
  const newState = await executeSingleItem(context, item, databasesMap, currentState);
102
112
  if (newState !== null) {
103
113
  currentState = newState;
104
114
  successfulItems.push(item);
115
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
116
+ type: 'resource_complete',
117
+ logicalId: item.logicalId,
118
+ durationMs: Date.now() - __siStartedAt,
119
+ });
105
120
  if (onStateChange) {
106
- onStateChange(currentState);
121
+ await onStateChange(currentState);
107
122
  common_1.logger.debug(lang_1.lang.__('STATE_PERSISTED_AFTER_OPERATION', {
108
123
  action: item.action,
109
124
  resourceId: item.logicalId,
@@ -112,6 +127,29 @@ const executeDatabasePlan = async (context, plan, databases, initialState, onSta
112
127
  }
113
128
  }
114
129
  catch (error) {
130
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
131
+ type: 'resource_failed',
132
+ logicalId: item.logicalId,
133
+ severity: 'error',
134
+ durationMs: Date.now() - __siStartedAt,
135
+ error: {
136
+ message: error instanceof Error ? error.message : String(error),
137
+ },
138
+ });
139
+ if (error instanceof types_1.PartialResourceError) {
140
+ const updatedState = error.updatedState;
141
+ if (onStateChange) {
142
+ await onStateChange(updatedState);
143
+ }
144
+ return {
145
+ state: updatedState,
146
+ partialFailure: {
147
+ failedItem: item,
148
+ error: error.cause,
149
+ successfulItems,
150
+ },
151
+ };
152
+ }
115
153
  return {
116
154
  state: currentState,
117
155
  partialFailure: {
@@ -6,6 +6,8 @@ const rdsTypes_1 = require("./rdsTypes");
6
6
  const esServerlessTypes_1 = require("./esServerlessTypes");
7
7
  const stateManager_1 = require("../../common/stateManager");
8
8
  const hashUtils_1 = require("../../common/hashUtils");
9
+ const ownershipTag_1 = require("../ownershipTag");
10
+ const toOwnershipTagShape = (tags) => tags?.map((t) => ({ Key: t.key, Value: t.value }));
9
11
  const planDatabaseDeletion = (logicalId, definition, resourceType) => ({
10
12
  logicalId,
11
13
  action: 'delete',
@@ -64,7 +66,17 @@ const generateDatabasePlan = async (context, state, databases) => {
64
66
  const currentState = (0, stateManager_1.getResource)(state, logicalId);
65
67
  const resourceType = getResourceType(database);
66
68
  const desiredDefinition = getDesiredDefinition(database);
67
- if (!currentState) {
69
+ if (!currentState || currentState.status === 'tainted') {
70
+ // No usable local state: probe the provider before planning create.
71
+ // If a same-named resource already exists WITHOUT our ownership tag it
72
+ // may belong to another project — fail fast in the plan instead of
73
+ // letting the executor discover it mid-deploy.
74
+ const remote = resourceType === 'ALIYUN_ES_SERVERLESS'
75
+ ? await client.es.getApp(database.name)
76
+ : await client.rds.getInstanceByName(database.name);
77
+ if (remote && !(0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTagShape(remote.tags))) {
78
+ throw new Error(`${resourceType} ${database.name} already exists in provider but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to create — resolve manually.`);
79
+ }
68
80
  return {
69
81
  logicalId,
70
82
  action: 'create',