@geek-fun/serverlessinsight 0.8.2 → 0.8.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 (124) hide show
  1. package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +15 -0
  2. package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +33 -0
  3. package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +359 -0
  4. package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +15 -0
  5. package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +154 -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 +5 -2
  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 +363 -30
  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 +90 -28
  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 +13 -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 +10 -4
  41. package/dist/src/common/stateBackend/saasStateBackend.js +266 -0
  42. package/dist/src/common/stateManager.js +186 -14
  43. package/dist/src/common/tencentClient/clsOperations.js +137 -0
  44. package/dist/src/common/tencentClient/cosOperations.js +180 -3
  45. package/dist/src/common/tencentClient/esOperations.js +110 -46
  46. package/dist/src/common/tencentClient/index.js +43 -2
  47. package/dist/src/common/tencentClient/scfOperations.js +266 -133
  48. package/dist/src/common/tencentClient/tdsqlcClusterMapper.js +81 -0
  49. package/dist/src/common/tencentClient/tdsqlcOperations.js +93 -99
  50. package/dist/src/common/triggerMapper.js +36 -0
  51. package/dist/src/common/volcengineClient/apigwOperations.js +539 -159
  52. package/dist/src/common/volcengineClient/iamOperations.js +91 -48
  53. package/dist/src/common/volcengineClient/index.js +46 -21
  54. package/dist/src/common/volcengineClient/stsOperations.js +32 -0
  55. package/dist/src/common/volcengineClient/tlsOperations.js +305 -171
  56. package/dist/src/common/volcengineClient/tosOperations.js +78 -19
  57. package/dist/src/common/volcengineClient/vefaasOperations.js +272 -54
  58. package/dist/src/lang/en.js +107 -1
  59. package/dist/src/lang/zh-CN.js +107 -1
  60. package/dist/src/parser/eventParser.js +2 -0
  61. package/dist/src/parser/functionParser.js +96 -65
  62. package/dist/src/parser/index.js +7 -4
  63. package/dist/src/stack/aliyunStack/apigwExecutor.js +39 -1
  64. package/dist/src/stack/aliyunStack/apigwPlanner.js +16 -10
  65. package/dist/src/stack/aliyunStack/apigwResource.js +334 -125
  66. package/dist/src/stack/aliyunStack/apigwTypes.js +35 -4
  67. package/dist/src/stack/aliyunStack/databaseExecutor.js +39 -1
  68. package/dist/src/stack/aliyunStack/databasePlanner.js +13 -1
  69. package/dist/src/stack/aliyunStack/databaseResource.js +135 -40
  70. package/dist/src/stack/aliyunStack/deployer.js +2 -2
  71. package/dist/src/stack/aliyunStack/destroyer.js +27 -2
  72. package/dist/src/stack/aliyunStack/fc3Executor.js +25 -2
  73. package/dist/src/stack/aliyunStack/fc3Planner.js +11 -1
  74. package/dist/src/stack/aliyunStack/fc3Resource.js +416 -94
  75. package/dist/src/stack/aliyunStack/ossExecutor.js +39 -1
  76. package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
  77. package/dist/src/stack/aliyunStack/ossResource.js +267 -219
  78. package/dist/src/stack/aliyunStack/sharedLogProject.js +137 -0
  79. package/dist/src/stack/aliyunStack/tablestoreExecutor.js +39 -1
  80. package/dist/src/stack/aliyunStack/tablestorePlanner.js +13 -1
  81. package/dist/src/stack/aliyunStack/tablestoreResource.js +54 -20
  82. package/dist/src/stack/alreadyExists.js +26 -0
  83. package/dist/src/stack/ownershipTag.js +58 -0
  84. package/dist/src/stack/rfsStack/index.js +3 -1
  85. package/dist/src/stack/scfStack/cosExecutor.js +39 -1
  86. package/dist/src/stack/scfStack/cosPlanner.js +11 -1
  87. package/dist/src/stack/scfStack/cosResource.js +167 -64
  88. package/dist/src/stack/scfStack/deployer.js +2 -2
  89. package/dist/src/stack/scfStack/destroyer.js +15 -2
  90. package/dist/src/stack/scfStack/esServerlessExecutor.js +39 -1
  91. package/dist/src/stack/scfStack/esServerlessPlanner.js +11 -1
  92. package/dist/src/stack/scfStack/esServerlessResource.js +88 -23
  93. package/dist/src/stack/scfStack/scfExecutor.js +39 -1
  94. package/dist/src/stack/scfStack/scfPlanner.js +21 -3
  95. package/dist/src/stack/scfStack/scfResource.js +686 -24
  96. package/dist/src/stack/scfStack/scfTypes.js +6 -0
  97. package/dist/src/stack/scfStack/sharedLogset.js +126 -0
  98. package/dist/src/stack/scfStack/tdsqlcExecutor.js +39 -1
  99. package/dist/src/stack/scfStack/tdsqlcPlanner.js +12 -1
  100. package/dist/src/stack/scfStack/tdsqlcResource.js +95 -16
  101. package/dist/src/stack/scfStack/tdsqlcTypes.js +5 -1
  102. package/dist/src/stack/volcengineStack/apigwExecutor.js +39 -1
  103. package/dist/src/stack/volcengineStack/apigwPlanner.js +25 -53
  104. package/dist/src/stack/volcengineStack/apigwResource.js +434 -222
  105. package/dist/src/stack/volcengineStack/apigwTypes.js +85 -66
  106. package/dist/src/stack/volcengineStack/deployer.js +49 -14
  107. package/dist/src/stack/volcengineStack/destroyer.js +13 -1
  108. package/dist/src/stack/volcengineStack/index.js +1 -2
  109. package/dist/src/stack/volcengineStack/sharedLogProject.js +190 -0
  110. package/dist/src/stack/volcengineStack/tosExecutor.js +25 -2
  111. package/dist/src/stack/volcengineStack/tosPlanner.js +11 -1
  112. package/dist/src/stack/volcengineStack/tosResource.js +82 -27
  113. package/dist/src/stack/volcengineStack/tosTypes.js +12 -0
  114. package/dist/src/stack/volcengineStack/vefaasExecutor.js +25 -2
  115. package/dist/src/stack/volcengineStack/vefaasPlanner.js +78 -2
  116. package/dist/src/stack/volcengineStack/vefaasResource.js +194 -144
  117. package/dist/src/stack/volcengineStack/vefaasTypes.js +1 -3
  118. package/dist/src/types/domains/backend.js +1 -0
  119. package/dist/src/types/domains/state.js +32 -1
  120. package/dist/src/validator/eventSchema.js +10 -0
  121. package/dist/src/validator/functionSchema.js +37 -12
  122. package/dist/src/validator/iacSchema.js +1 -0
  123. package/dist/tsconfig.tsbuildinfo +1 -1
  124. package/package.json +5 -2
@@ -5,6 +5,7 @@ const aliyunClient_1 = require("../../common/aliyunClient");
5
5
  const apigwTypes_1 = require("./apigwTypes");
6
6
  const stateManager_1 = require("../../common/stateManager");
7
7
  const hashUtils_1 = require("../../common/hashUtils");
8
+ const ownershipTag_1 = require("../ownershipTag");
8
9
  const DNS_SUB_RESOURCE_SUFFIXES = ['.dns_verification', '.dns_txt_verification'];
9
10
  const isDnsSubResource = (logicalId) => DNS_SUB_RESOURCE_SUFFIXES.some((suffix) => logicalId.endsWith(suffix));
10
11
  const planEventDeletion = (logicalId, definition) => ({
@@ -33,6 +34,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
33
34
  const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
34
35
  const client = (0, aliyunClient_1.createAliyunClient)(context);
35
36
  // Build desired definition including triggers
37
+ const logSnapshot = (0, apigwTypes_1.buildEventLogSnapshot)(event, context);
36
38
  const desiredDefinition = {
37
39
  ...groupDefinition,
38
40
  triggers: event.triggers.map((t) => ({
@@ -41,14 +43,21 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
41
43
  backend: t.backend,
42
44
  })),
43
45
  domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
46
+ ...(logSnapshot ? { log: logSnapshot } : {}),
44
47
  };
45
- if (!currentState) {
46
- // No state exists, check if resource exists remotely
47
- try {
48
- const remoteGroup = await client.apigw.findApiGroupByName(groupConfig.groupName);
49
- if (remoteGroup) {
50
- // Resource exists remotely but not in state - this is drift
51
- // We should update (import) it rather than try to create again
48
+ if (!currentState || currentState.status === 'tainted') {
49
+ // No usable local state: probe the provider before planning create.
50
+ // If a same-named group already exists WITHOUT our ownership tag it
51
+ // may belong to another project — fail fast in the plan instead of
52
+ // letting the executor discover it mid-deploy.
53
+ const remoteGroup = await client.apigw.findApiGroupByName(groupConfig.groupName);
54
+ if (remoteGroup?.groupId) {
55
+ if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, remoteGroup.tags)) {
56
+ throw new Error(`API group ${groupConfig.groupName} already exists in provider but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to create — resolve manually.`);
57
+ }
58
+ if (!currentState) {
59
+ // Resource exists remotely (and is ours) but not in state — drift:
60
+ // import it via update rather than trying to create it again.
52
61
  return {
53
62
  logicalId,
54
63
  action: 'update',
@@ -58,9 +67,6 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
58
67
  };
59
68
  }
60
69
  }
61
- catch {
62
- // Ignore errors when checking remote
63
- }
64
70
  return {
65
71
  logicalId,
66
72
  action: 'create',
@@ -11,6 +11,9 @@ 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");
16
+ const sharedLogProject_1 = require("./sharedLogProject");
14
17
  const getCdnConfig = (event) => {
15
18
  const domainCdn = event.domain?.cdn;
16
19
  if (domainCdn == null) {
@@ -183,6 +186,9 @@ const cleanupApigwCdnResources = async (client, instances, domains) => {
183
186
  logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
184
187
  }
185
188
  catch (error) {
189
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
190
+ throw error;
191
+ }
186
192
  logger_1.logger.warn(lang_1.lang.__('CDN_DOMAIN_DELETE_FAILED', {
187
193
  domain: cdnInstance.domainName,
188
194
  error: String(error),
@@ -197,8 +203,10 @@ const cleanupApigwCdnResources = async (client, instances, domains) => {
197
203
  try {
198
204
  await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
199
205
  }
200
- catch {
201
- // Best effort cleanup
206
+ catch (error) {
207
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
208
+ throw error;
209
+ }
202
210
  }
203
211
  }
204
212
  };
@@ -214,12 +222,17 @@ const buildApigwGroupInstanceFromProvider = (info, stage) => {
214
222
  subDomain: info.subDomain ?? null,
215
223
  instanceId: info.instanceId ?? null,
216
224
  instanceType: info.instanceType ?? null,
225
+ regionId: info.regionId ?? null,
217
226
  status: info.status ?? null,
218
227
  createdTime: info.createdTime ?? null,
219
228
  modifiedTime: info.modifiedTime ?? null,
220
229
  billingStatus: info.billingStatus ?? null,
221
230
  illegalStatus: info.illegalStatus ?? null,
222
231
  trafficLimit: info.trafficLimit ?? null,
232
+ tags: info.tags?.map((tag) => ({
233
+ key: tag.Key ?? null,
234
+ value: tag.Value ?? null,
235
+ })),
223
236
  };
224
237
  };
225
238
  const buildApigwApiInstanceFromProvider = (info, stage, groupId) => {
@@ -237,8 +250,10 @@ const buildApigwApiInstanceFromProvider = (info, stage, groupId) => {
237
250
  requestConfig: info.requestConfig ?? null,
238
251
  serviceConfig: info.serviceConfig ?? null,
239
252
  resultType: info.resultType ?? null,
253
+ resultSample: info.resultSample ?? null,
240
254
  createdTime: info.createdTime ?? null,
241
255
  modifiedTime: info.modifiedTime ?? null,
256
+ deployedInfos: info.deployedInfos ?? null,
242
257
  };
243
258
  };
244
259
  const buildApigwDeploymentInstance = (groupId, apiId, stageName, stage) => {
@@ -251,6 +266,78 @@ const buildApigwDeploymentInstance = (groupId, apiId, stageName, stage) => {
251
266
  stageName,
252
267
  };
253
268
  };
269
+ const buildLogConfigInstance = (context, slsProject, slsLogStore) => ({
270
+ sid: (0, common_1.buildSid)('aliyun', 'apigw-log-config', context.stage, `${context.region}:PROVIDER`),
271
+ type: 'ALIYUN_APIGW_LOG_CONFIG',
272
+ id: `${context.region}:PROVIDER`,
273
+ attributes: { slsProject, slsLogStore },
274
+ });
275
+ const ensureGatewayLogConfig = async (context, client, state) => {
276
+ const slsLogStore = `${context.service}-${context.stage}-apigw-logs`;
277
+ const ours = { slsProject: (0, sharedLogProject_1.buildSharedProjectName)(context.app, context.stage), slsLogStore };
278
+ const existing = await client.apigw.describeGatewayLogConfig();
279
+ const matchesOurs = existing &&
280
+ existing.slsProject === ours.slsProject &&
281
+ existing.slsLogStore === ours.slsLogStore;
282
+ if (matchesOurs) {
283
+ // The PROVIDER singleton already targets our shared project. Enforce the
284
+ // app-ownership invariant on both the tracked and untracked paths: only an
285
+ // app-owned project is reused or adopted; a foreign/untagged one is refused
286
+ // and a missing project (stale config) falls through to (re)creation.
287
+ const project = await client.sls.getProject(ours.slsProject);
288
+ if (project) {
289
+ if (!(await (0, sharedLogProject_1.isSharedProjectOwnedByApp)(context, client, ours.slsProject))) {
290
+ throw new Error(lang_1.lang.__('SLS_PROJECT_FOREIGN_OWNED', { projectName: ours.slsProject }));
291
+ }
292
+ const known = (0, stateManager_1.getSharedResource)(state, context.stage, sharedLogProject_1.SHARED_LOG_PROJECT_KEY);
293
+ return {
294
+ instance: buildLogConfigInstance(context, ours.slsProject, ours.slsLogStore),
295
+ sharedProject: known ?? (0, sharedLogProject_1.adoptSharedSlsProjectState)(context, ours.slsProject),
296
+ };
297
+ }
298
+ }
299
+ else if (existing) {
300
+ logger_1.logger.warn(lang_1.lang.__('SLS_LOG_CONFIG_FOREIGN', {
301
+ slsProject: existing.slsProject ?? '',
302
+ slsLogStore: existing.slsLogStore ?? '',
303
+ }));
304
+ return {};
305
+ }
306
+ const shared = await (0, sharedLogProject_1.ensureSharedSlsProject)(context, client, state);
307
+ const sharedProject = (0, sharedLogProject_1.buildSharedProjectResourceState)(context, shared);
308
+ await (0, sharedLogProject_1.ensureGatewayLogstore)(context, client, shared.projectName);
309
+ await client.apigw.createGatewayLogConfig({
310
+ slsProject: shared.projectName,
311
+ slsLogStore,
312
+ });
313
+ return {
314
+ instance: buildLogConfigInstance(context, shared.projectName, slsLogStore),
315
+ sharedProject,
316
+ };
317
+ };
318
+ const releaseGatewayLogstoreIfNeeded = async (client, attrs) => {
319
+ const { slsProject, slsLogStore } = (attrs ?? {});
320
+ if (!slsProject || !slsLogStore) {
321
+ return;
322
+ }
323
+ const currentConfig = await client.apigw.describeGatewayLogConfig();
324
+ if (currentConfig?.slsLogStore === slsLogStore && currentConfig?.slsProject === slsProject) {
325
+ logger_1.logger.warn(lang_1.lang.__('APIGW_LOG_CONFIG_STILL_REFERENCES_STORE', { slsLogStore }));
326
+ return;
327
+ }
328
+ try {
329
+ await client.sls.deleteIndex(slsProject, slsLogStore);
330
+ }
331
+ catch {
332
+ // logstore already gone — index deletion is best-effort
333
+ }
334
+ try {
335
+ await client.sls.deleteLogstore(slsProject, slsLogStore);
336
+ }
337
+ catch {
338
+ // logstore already gone
339
+ }
340
+ };
254
341
  const resolveDomainCertificate = async (domain, serviceName, eventKey, stage, client) => {
255
342
  if (domain.certificate_id) {
256
343
  const certId = domain.certificate_id;
@@ -289,66 +376,184 @@ const buildDomainBindingConfig = async (domain, groupId, serviceName, eventKey,
289
376
  const createApigwResource = async (context, event, serviceName, roleArn, state) => {
290
377
  const logicalId = `events.${event.key}`;
291
378
  const client = (0, aliyunClient_1.createAliyunClient)(context);
292
- const groupConfig = (0, apigwTypes_1.eventToApigwGroupConfig)(event, serviceName, context.stage);
379
+ const groupConfig = (0, apigwTypes_1.eventToApigwGroupConfig)(event, serviceName, context.stage, context, logicalId);
380
+ // Stamp the ownership tag — the create-time contract that lets a later run
381
+ // (state reset, mid-run failure) idempotently adopt the group we create
382
+ // without risking takeover of a same-named group from another project.
383
+ groupConfig.tags = [
384
+ { key: ownershipTag_1.OWNERSHIP_TAG_KEY, value: (0, ownershipTag_1.buildOwnershipTagValue)(context, logicalId) },
385
+ ];
386
+ const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
293
387
  let groupId;
388
+ const logSnapshot = (0, apigwTypes_1.buildEventLogSnapshot)(event, context);
389
+ const buildResourceDefinition = () => ({
390
+ ...groupDefinition,
391
+ triggers: event.triggers.map((t) => ({
392
+ method: t.method,
393
+ path: t.path,
394
+ backend: t.backend,
395
+ })),
396
+ domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
397
+ ...(logSnapshot ? { log: logSnapshot } : {}),
398
+ });
399
+ // Persist a tainted state BEFORE any cloud side-effect so a group created
400
+ // in cloud but not yet tracked stays tracked if a later step fails.
401
+ let stateAfterDependents = (0, stateManager_1.setResource)(state, logicalId, {
402
+ mode: 'managed',
403
+ region: context.region,
404
+ definition: buildResourceDefinition(),
405
+ instances: [],
406
+ lastUpdated: new Date().toISOString(),
407
+ status: 'tainted',
408
+ });
294
409
  try {
295
410
  const existingGroup = await client.apigw.findApiGroupByName(groupConfig.groupName);
296
411
  if (existingGroup?.groupId) {
297
- logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_FOUND_REUSING', { groupName: groupConfig.groupName }));
298
- groupId = existingGroup.groupId;
412
+ if ((0, ownershipTag_1.isOwnedByStack)(context, logicalId, existingGroup.tags)) {
413
+ logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_FOUND_REUSING', { groupName: groupConfig.groupName }));
414
+ logger_1.logger.info(`API group ${groupConfig.groupName} found and owned by this stack, reusing`);
415
+ groupId = existingGroup.groupId;
416
+ }
417
+ else {
418
+ 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.`));
419
+ }
299
420
  }
300
421
  else {
301
- groupId = await client.apigw.createApiGroup(groupConfig);
422
+ try {
423
+ groupId = await client.apigw.createApiGroup(groupConfig);
424
+ }
425
+ catch (error) {
426
+ if ((0, alreadyExists_1.isResourceAlreadyExistsError)(error)) {
427
+ const probe = await client.apigw.findApiGroupByName(groupConfig.groupName);
428
+ if (probe?.groupId && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.tags)) {
429
+ groupId = probe.groupId;
430
+ logger_1.logger.info(`API group ${groupConfig.groupName} exists after create conflict and carries ownership tag (${ownershipTag_1.OWNERSHIP_TAG_KEY}), adopting idempotently`);
431
+ }
432
+ else {
433
+ 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.`));
434
+ }
435
+ }
436
+ else {
437
+ throw error;
438
+ }
439
+ }
302
440
  }
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));
441
+ // Get group info for state
442
+ const groupInfo = await client.apigw.getApiGroup(groupId);
443
+ if (!groupInfo) {
444
+ throw new Error(`Failed to get API group info after creation: ${groupId}`);
341
445
  }
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 = {
446
+ const instances = [
447
+ buildApigwGroupInstanceFromProvider(groupInfo, context.stage),
448
+ ];
449
+ // Group id is now known - persist the tainted state carrying the group
450
+ // instance so a retry resumes from here if API creation fails below.
451
+ stateAfterDependents = (0, stateManager_1.setResource)(stateAfterDependents, logicalId, {
452
+ mode: 'managed',
453
+ region: context.region,
454
+ definition: buildResourceDefinition(),
455
+ instances,
456
+ lastUpdated: new Date().toISOString(),
457
+ status: 'tainted',
458
+ });
459
+ let currentState = stateAfterDependents;
460
+ if (event.log) {
461
+ const logResult = await ensureGatewayLogConfig(context, client, stateAfterDependents);
462
+ if (logResult?.sharedProject) {
463
+ stateAfterDependents = (0, stateManager_1.setSharedResource)(stateAfterDependents, context.stage, sharedLogProject_1.SHARED_LOG_PROJECT_KEY, logResult.sharedProject);
464
+ // Keep currentState in sync so the shared project survives into the
465
+ // final returned state (the create path returns from currentState).
466
+ currentState = stateAfterDependents;
467
+ }
468
+ if (logResult?.instance) {
469
+ instances.push(logResult.instance);
470
+ }
471
+ }
472
+ // Create APIs and deployments for each trigger
473
+ for (const trigger of event.triggers) {
474
+ const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage, roleArn);
475
+ const apiId = await client.apigw.createApi(apiConfig);
476
+ // Get API info for state
477
+ const apiInfo = await client.apigw.getApi(groupId, apiId);
478
+ if (apiInfo) {
479
+ instances.push(buildApigwApiInstanceFromProvider(apiInfo, context.stage, groupId));
480
+ }
481
+ // Deploy API to RELEASE stage
482
+ const deploymentConfig = {
483
+ groupId,
484
+ apiId,
485
+ stageName: 'RELEASE',
486
+ description: `${serviceName} API deployment for ${trigger.method} ${trigger.path}`,
487
+ };
488
+ await client.apigw.deployApi(deploymentConfig);
489
+ instances.push(buildApigwDeploymentInstance(groupId, apiId, 'RELEASE', context.stage));
490
+ const updatedResourceState = {
491
+ mode: 'managed',
492
+ region: context.region,
493
+ definition: {
494
+ ...groupDefinition,
495
+ triggers: event.triggers.map((t) => ({
496
+ method: t.method,
497
+ path: t.path,
498
+ backend: t.backend,
499
+ })),
500
+ domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
501
+ ...(logSnapshot ? { log: logSnapshot } : {}),
502
+ },
503
+ instances,
504
+ lastUpdated: new Date().toISOString(),
505
+ };
506
+ currentState = (0, stateManager_1.setResource)(currentState, logicalId, updatedResourceState);
507
+ }
508
+ if (event.domain) {
509
+ try {
510
+ const primaryDomain = event.domain.domain_name;
511
+ const wwwBindApex = event.domain.www_bind_apex === true;
512
+ const isCdnEnabled = getIsCdnEnabled(event);
513
+ const originDomain = groupInfo.subDomain;
514
+ if (!originDomain) {
515
+ throw new Error(`API Gateway group ${groupId} has no subDomain for CDN origin`);
516
+ }
517
+ const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
518
+ if (isCdnEnabled) {
519
+ await createApigwCdnDistribution(context, client, event, primaryDomain, originDomain, instances, {
520
+ certificateBody: domainConfig.certificateBody,
521
+ certificatePrivateKey: domainConfig.certificatePrivateKey,
522
+ });
523
+ }
524
+ else {
525
+ currentState = await client.apigw.bindCustomDomain(domainConfig, currentState, logicalId);
526
+ }
527
+ const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
528
+ if (wwwDomain) {
529
+ logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
530
+ const wwwDomainConfig = {
531
+ ...domainConfig,
532
+ domainName: wwwDomain,
533
+ certificateName: domainConfig.certificateName
534
+ ? `${domainConfig.certificateName}-www`
535
+ : undefined,
536
+ };
537
+ if (isCdnEnabled) {
538
+ await createApigwCdnDistribution(context, client, event, wwwDomain, originDomain, instances, {
539
+ certificateBody: wwwDomainConfig.certificateBody,
540
+ certificatePrivateKey: wwwDomainConfig.certificatePrivateKey,
541
+ });
542
+ }
543
+ else {
544
+ currentState = await client.apigw.bindCustomDomain(wwwDomainConfig, currentState, logicalId);
545
+ }
546
+ }
547
+ }
548
+ catch (error) {
549
+ logger_1.logger.error(lang_1.lang.__('APIGW_DOMAIN_BINDING_FAILED', { error: String(error) }));
550
+ logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_APIS_CREATED_DOMAIN_FAILED'));
551
+ logger_1.logger.info(lang_1.lang.__('APIGW_STATE_SAVED_RETRY'));
552
+ throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
553
+ }
554
+ }
555
+ // Update final state with all instances (group + APIs + deployments)
556
+ const finalResourceState = {
352
557
  mode: 'managed',
353
558
  region: context.region,
354
559
  definition: {
@@ -359,76 +564,16 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
359
564
  backend: t.backend,
360
565
  })),
361
566
  domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
567
+ ...(logSnapshot ? { log: logSnapshot } : {}),
362
568
  },
363
569
  instances,
364
570
  lastUpdated: new Date().toISOString(),
365
571
  };
366
- state = (0, stateManager_1.setResource)(state, logicalId, updatedResourceState);
572
+ return (0, stateManager_1.setResource)(currentState, logicalId, finalResourceState);
367
573
  }
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
- }
574
+ catch (error) {
575
+ throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
414
576
  }
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
577
  };
433
578
  exports.createApigwResource = createApigwResource;
434
579
  const readApigwResource = async (context, groupId) => {
@@ -516,6 +661,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
516
661
  if (!cloudGroup?.groupId) {
517
662
  return findCloudGroupOrCreate();
518
663
  }
664
+ if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, cloudGroup.tags)) {
665
+ 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.`);
666
+ }
519
667
  const cloudApis = await client.apigw.listApisByGroup(cloudGroup.groupId);
520
668
  const built = buildCloudInstance(cloudGroup, cloudApis);
521
669
  groupId = built.groupId;
@@ -589,6 +737,23 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
589
737
  }
590
738
  }
591
739
  }
740
+ const logSnapshot = (0, apigwTypes_1.buildEventLogSnapshot)(event, context);
741
+ let sharedProjectState;
742
+ if (event.log) {
743
+ const logResult = await ensureGatewayLogConfig(context, client, state);
744
+ if (logResult?.sharedProject) {
745
+ sharedProjectState = logResult.sharedProject;
746
+ }
747
+ if (logResult?.instance) {
748
+ instances.push(logResult.instance);
749
+ }
750
+ }
751
+ else {
752
+ const previousLogInstance = (existingState?.instances ?? []).find((i) => i.type === 'ALIYUN_APIGW_LOG_CONFIG');
753
+ if (previousLogInstance) {
754
+ await releaseGatewayLogstoreIfNeeded(client, previousLogInstance.attributes);
755
+ }
756
+ }
592
757
  if (event.domain) {
593
758
  const desiredDomainDef = (0, apigwTypes_1.extractEventDomainDefinition)(event.domain);
594
759
  const previousDomainDef = existingState?.definition?.domain;
@@ -685,6 +850,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
685
850
  await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
686
851
  }
687
852
  catch (error) {
853
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
854
+ throw error;
855
+ }
688
856
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
689
857
  domain: previousWwwDomain,
690
858
  error: String(error),
@@ -706,6 +874,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
706
874
  await client.apigw.unbindCustomDomain(groupId, previousDomain);
707
875
  }
708
876
  catch (error) {
877
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
878
+ throw error;
879
+ }
709
880
  logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: previousDomain, error: String(error) }));
710
881
  }
711
882
  if (existingDomain.wwwBindApex === true) {
@@ -715,6 +886,9 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
715
886
  await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
716
887
  }
717
888
  catch (error) {
889
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
890
+ throw error;
891
+ }
718
892
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
719
893
  domain: previousWwwDomain,
720
894
  error: String(error),
@@ -737,11 +911,15 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
737
911
  backend: t.backend,
738
912
  })),
739
913
  domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
914
+ ...(logSnapshot ? { log: logSnapshot } : {}),
740
915
  },
741
916
  instances,
742
917
  lastUpdated: new Date().toISOString(),
743
918
  };
744
- return (0, stateManager_1.setResource)(state, logicalId, resourceState);
919
+ const finalState = sharedProjectState
920
+ ? (0, stateManager_1.setSharedResource)(state, context.stage, sharedLogProject_1.SHARED_LOG_PROJECT_KEY, sharedProjectState)
921
+ : state;
922
+ return (0, stateManager_1.setResource)(finalState, logicalId, resourceState);
745
923
  };
746
924
  exports.updateApigwResource = updateApigwResource;
747
925
  const deleteApigwResource = async (context, logicalId, state) => {
@@ -770,6 +948,9 @@ const deleteApigwResource = async (context, logicalId, state) => {
770
948
  await client.apigw.unbindCustomDomain(groupId, primaryDomain);
771
949
  }
772
950
  catch (error) {
951
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
952
+ throw error;
953
+ }
773
954
  logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: primaryDomain, error: String(error) }));
774
955
  }
775
956
  if (existingDomain.wwwBindApex === true) {
@@ -779,6 +960,9 @@ const deleteApigwResource = async (context, logicalId, state) => {
779
960
  await client.apigw.unbindCustomDomain(groupId, wwwDomain);
780
961
  }
781
962
  catch (error) {
963
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
964
+ throw error;
965
+ }
782
966
  logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
783
967
  domain: wwwDomain,
784
968
  error: String(error),
@@ -793,8 +977,14 @@ const deleteApigwResource = async (context, logicalId, state) => {
793
977
  try {
794
978
  await client.apigw.abolishApi(deployment.groupId || groupId, deployment.apiId, deployment.stageName || 'RELEASE');
795
979
  }
796
- catch {
797
- // Deployment might already be abolished
980
+ catch (error) {
981
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
982
+ throw error;
983
+ }
984
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
985
+ resourceType: 'API deployment',
986
+ name: `${deployment.apiId}/${deployment.stageName}`,
987
+ }));
798
988
  }
799
989
  }
800
990
  const apis = existingInstances.filter((i) => i.type === 'ALIYUN_APIGW_API');
@@ -802,15 +992,34 @@ const deleteApigwResource = async (context, logicalId, state) => {
802
992
  try {
803
993
  await client.apigw.deleteApi(groupId, api.id);
804
994
  }
805
- catch {
806
- // API might already be deleted
995
+ catch (error) {
996
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
997
+ throw error;
998
+ }
999
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
1000
+ resourceType: 'API',
1001
+ name: api.id,
1002
+ }));
807
1003
  }
808
1004
  }
809
1005
  try {
810
1006
  await client.apigw.deleteApiGroup(groupId);
811
1007
  }
812
- catch {
813
- // Group might already be deleted
1008
+ catch (error) {
1009
+ if (!(0, aliyunClient_1.isApigwNotFoundError)(error)) {
1010
+ throw error;
1011
+ }
1012
+ logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
1013
+ resourceType: 'API Gateway group',
1014
+ name: groupId,
1015
+ }));
1016
+ }
1017
+ // The PROVIDER log configuration is a regional singleton — never deleted.
1018
+ // Tear down the per-service gateway logstore only when the singleton no
1019
+ // longer references it; otherwise it must be retained.
1020
+ const logConfigInstance = existingInstances.find((i) => i.type === 'ALIYUN_APIGW_LOG_CONFIG');
1021
+ if (logConfigInstance) {
1022
+ await releaseGatewayLogstoreIfNeeded(client, logConfigInstance.attributes);
814
1023
  }
815
1024
  return (0, stateManager_1.removeResource)(state, logicalId);
816
1025
  };