@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
@@ -1,32 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.extractEventDomainDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.generateApiKey = exports.eventToApigwGroupConfig = void 0;
3
+ exports.resolveFunctionReference = exports.buildEventResourceDefinition = exports.extractEventDomainDefinition = exports.triggerToApigwRouteConfig = exports.triggerToApigwUpstreamConfig = exports.eventToApigwServiceConfig = exports.eventToApigwGatewayConfig = exports.resolveFunctionKey = exports.buildRouteName = exports.buildUpstreamName = exports.buildServiceName = exports.buildGatewayName = void 0;
4
4
  const common_1 = require("../../common");
5
5
  const lang_1 = require("../../lang");
6
6
  /**
7
- * Convert EventDomain to API Gateway group config
7
+ * Gateway instance name — reused for find-by-name adoption across deploys.
8
8
  */
9
- const eventToApigwGroupConfig = (event, serviceName, stage) => {
10
- return {
11
- groupName: `${serviceName}-${stage}-apigw`.replace(/_/g, '-'),
12
- description: `API Gateway for ${serviceName}`,
13
- protocol: event.domain?.protocol ?? 'HTTP',
14
- };
9
+ const buildGatewayName = (serviceName, stage) => `${serviceName}-${stage}-apigw`.replace(/_/g, '-');
10
+ exports.buildGatewayName = buildGatewayName;
11
+ const buildServiceName = (event, stage) => `${event.name}-${stage}-service`.replace(/_/g, '-');
12
+ exports.buildServiceName = buildServiceName;
13
+ const buildUpstreamName = (event, backendRef, stage) => {
14
+ const fnKey = (0, exports.resolveFunctionKey)(backendRef);
15
+ return `${event.name}-${stage}-upstream-${fnKey.replace(/_/g, '-')}`;
15
16
  };
16
- exports.eventToApigwGroupConfig = eventToApigwGroupConfig;
17
- /**
18
- * Generate a unique API key from method and path
19
- * Uses URL encoding to preserve path structure and avoid collisions
20
- */
21
- const generateApiKey = (method, path) => {
22
- const sanitizedPath = path
23
- .replace(/\//g, '__')
17
+ exports.buildUpstreamName = buildUpstreamName;
18
+ const buildRouteName = (event, method, path) => {
19
+ const sanitized = path
20
+ .replace(/\//g, '_')
24
21
  .replace(/[^a-zA-Z0-9_]/g, '_')
25
- .replace(/^__/, '')
26
- .replace(/__$/, '');
27
- return `${method}_${sanitizedPath}`;
22
+ .replace(/^_+|_+$/g, '');
23
+ return `${event.name}-${method}_${sanitized}`.replace(/_/g, '-').slice(0, 63);
28
24
  };
29
- exports.generateApiKey = generateApiKey;
25
+ exports.buildRouteName = buildRouteName;
30
26
  /**
31
27
  * Resolves a function reference like ${functions.xxx} to the actual function name
32
28
  */
@@ -41,66 +37,80 @@ const resolveFunctionReference = (backendRef) => {
41
37
  common_1.logger.warn(lang_1.lang.__('FUNCTION_REF_NOT_RESOLVED', { backendRef }));
42
38
  return backendRef;
43
39
  }
44
- const functionName = functionDef.name;
45
- common_1.logger.info(lang_1.lang.__('RESOLVED_FUNCTION_REF', { backendRef, functionName }));
46
- return functionName;
40
+ return functionDef.name;
47
41
  };
42
+ exports.resolveFunctionReference = resolveFunctionReference;
48
43
  /**
49
- * Convert EventDomain trigger to API Gateway API config
44
+ * Extracts the function key (e.g. 'api_function') from a ${functions.xxx} backend ref.
50
45
  */
51
- const triggerToApigwApiConfig = (event, trigger, gatewayId, _serviceName, _region, stage) => {
52
- const method = trigger.method;
53
- const path = trigger.path;
54
- const backend = trigger.backend;
55
- const resolvedFunctionName = resolveFunctionReference(backend);
56
- const apiKey = (0, exports.generateApiKey)(method, path);
46
+ const resolveFunctionKey = (backendRef) => {
47
+ const match = /^\$\{functions\.([\w.]+)}$/.exec(String(backendRef ?? ''));
48
+ return match?.[1] ?? backendRef;
49
+ };
50
+ exports.resolveFunctionKey = resolveFunctionKey;
51
+ const eventToApigwGatewayConfig = (event, serviceName, stage, ownershipValue) => {
52
+ return {
53
+ gatewayName: (0, exports.buildGatewayName)(serviceName, stage),
54
+ type: 'serverless',
55
+ ...(event.network && {
56
+ network: { vpcId: event.network.vpc_id, subnetIds: event.network.subnet_ids },
57
+ }),
58
+ logConfig: event.log ? { enable: true, projectId: '', topicId: '' } : undefined,
59
+ Tags: [{ Key: 'si-owned-by', Value: ownershipValue }],
60
+ };
61
+ };
62
+ exports.eventToApigwGatewayConfig = eventToApigwGatewayConfig;
63
+ const eventToApigwServiceConfig = (event, serviceName, stage, gatewayId) => {
57
64
  return {
58
65
  gatewayId,
59
- apiName: `${event.name}-${stage}-api-${apiKey}`.replace(/_/g, '-'),
60
- method,
61
- path,
62
- backendFunctionName: resolvedFunctionName,
63
- backendType: 'veFaaS',
64
- requestTimeout: 60,
66
+ serviceName: (0, exports.buildServiceName)(event, stage),
67
+ protocol: ['HTTP'],
68
+ description: `API Gateway for ${serviceName}`,
65
69
  };
66
70
  };
67
- exports.triggerToApigwApiConfig = triggerToApigwApiConfig;
68
- /**
69
- * Extract definition from API Gateway group config for state comparison
70
- */
71
- const extractApigwGroupDefinition = (config) => {
71
+ exports.eventToApigwServiceConfig = eventToApigwServiceConfig;
72
+ const triggerToApigwUpstreamConfig = (event, trigger, serviceName, stage, gatewayId, functionId) => {
72
73
  return {
73
- groupName: config.groupName,
74
- description: config.description ?? null,
75
- protocol: config.protocol ?? null,
74
+ gatewayId,
75
+ upstreamName: (0, exports.buildUpstreamName)(event, String(trigger.backend), stage),
76
+ sourceType: 'VeFaas',
77
+ functionId,
78
+ protocol: 'HTTP',
76
79
  };
77
80
  };
78
- exports.extractApigwGroupDefinition = extractApigwGroupDefinition;
79
- /**
80
- * Extract definition from API Gateway API config for state comparison
81
- */
82
- const extractApigwApiDefinition = (config) => {
81
+ exports.triggerToApigwUpstreamConfig = triggerToApigwUpstreamConfig;
82
+ const triggerToApigwRouteConfig = (event, trigger, serviceId, upstreamId) => {
83
83
  return {
84
- apiName: config.apiName,
85
- gatewayId: config.gatewayId,
86
- method: config.method,
87
- path: config.path,
88
- backendFunctionName: config.backendFunctionName,
89
- backendType: config.backendType,
84
+ serviceId,
85
+ routeName: (0, exports.buildRouteName)(event, String(trigger.method), String(trigger.path)),
86
+ method: trigger.method,
87
+ path: String(trigger.path),
88
+ upstreamId,
90
89
  };
91
90
  };
92
- exports.extractApigwApiDefinition = extractApigwApiDefinition;
93
- const extractEventDomainDefinition = (domain) => {
94
- if (!domain) {
95
- return null;
96
- }
91
+ exports.triggerToApigwRouteConfig = triggerToApigwRouteConfig;
92
+ const extractEventDomainDefinition = (event) => {
97
93
  return {
98
- domainName: domain.domain_name,
99
- wwwBindApex: domain.www_bind_apex === true,
100
- certificateId: domain.certificate_id ?? null,
101
- certificateBody: domain.certificate_body ?? null,
102
- certificatePrivateKey: domain.certificate_private_key ? '(managed)' : null,
103
- protocol: domain.protocol ?? null,
94
+ gatewayName: event.name,
95
+ ...(event.network && {
96
+ network: { vpcId: event.network.vpc_id, subnetIds: event.network.subnet_ids },
97
+ }),
98
+ logEnabled: event.log === true || event.log === 'true',
99
+ triggers: event.triggers.map((t) => ({
100
+ method: String(t.method),
101
+ path: String(t.path),
102
+ backend: String(t.backend),
103
+ })),
104
+ domain: event.domain
105
+ ? {
106
+ domainName: event.domain.domain_name,
107
+ certificateId: event.domain.certificate_id,
108
+ }
109
+ : undefined,
104
110
  };
105
111
  };
106
112
  exports.extractEventDomainDefinition = extractEventDomainDefinition;
113
+ const buildEventResourceDefinition = (event) => {
114
+ return (0, exports.extractEventDomainDefinition)(event);
115
+ };
116
+ exports.buildEventResourceDefinition = buildEventResourceDefinition;
@@ -9,13 +9,36 @@ const tosPlanner_1 = require("./tosPlanner");
9
9
  const tosExecutor_1 = require("./tosExecutor");
10
10
  const apigwPlanner_1 = require("./apigwPlanner");
11
11
  const apigwExecutor_1 = require("./apigwExecutor");
12
+ // Volcengine error responses can echo large request payloads (e.g. the base64
13
+ // function code) in Error.Message — cap what reaches the user.
14
+ const truncateMessage = (message, max = 2000) => {
15
+ if (!message)
16
+ return '';
17
+ return message.length > max
18
+ ? `${message.slice(0, max)}… (truncated ${message.length} chars)`
19
+ : message;
20
+ };
21
+ // Enrich cloud API errors with the action name + RequestId so users can open a
22
+ // support ticket / debug against the console. The message itself is truncated
23
+ // to avoid dumping base64 payloads, but the actionable bits are always shown.
24
+ const formatApiError = (error) => {
25
+ const err = error;
26
+ const parts = [truncateMessage(error.message)];
27
+ if (err.action && !err.message.includes(err.action)) {
28
+ parts.unshift(`Action: ${err.action}`);
29
+ }
30
+ if (err.requestId) {
31
+ parts.push(`RequestId: ${err.requestId}`);
32
+ }
33
+ return parts.join(' | ');
34
+ };
12
35
  const deployVolcengineStack = async (iac, backend) => {
13
36
  const context = (0, common_1.getContext)();
14
37
  common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK'));
15
38
  let state = await backend.loadState('volcengine', iac.app, iac.service, context.stage);
16
- const onStateChange = (newState) => {
39
+ const onStateChange = async (newState) => {
17
40
  state = newState;
18
- backend.saveState(state, iac.app, iac.service, context.stage);
41
+ await backend.saveState(state, iac.app, iac.service, context.stage);
19
42
  };
20
43
  common_1.logger.info(lang_1.lang.__('GENERATING_PLAN'));
21
44
  const functionPlan = await (0, vefaasPlanner_1.generateFunctionPlan)(context, state, iac.functions);
@@ -25,10 +48,14 @@ const deployVolcengineStack = async (iac, backend) => {
25
48
  if (bucketResult.partialFailure) {
26
49
  const error = bucketResult.partialFailure.error;
27
50
  error.isPartialFailure = true;
28
- common_1.logger.error(lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
29
- resourceType: 'Bucket',
30
- name: bucketResult.partialFailure.failedItem.logicalId,
31
- }));
51
+ common_1.logger.error(`${lang_1.lang.__('FAILED_TO_EXECUTE_ACTION', {
52
+ action: bucketResult.partialFailure.failedItem.action,
53
+ logicalId: bucketResult.partialFailure.failedItem.logicalId,
54
+ error: formatApiError(error),
55
+ })}\n\n${lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
56
+ successCount: String(bucketResult.partialFailure.successfulItems.length),
57
+ failedResource: bucketResult.partialFailure.failedItem.logicalId,
58
+ })}`);
32
59
  throw error;
33
60
  }
34
61
  state = bucketResult.state;
@@ -36,10 +63,14 @@ const deployVolcengineStack = async (iac, backend) => {
36
63
  if (functionResult.partialFailure) {
37
64
  const error = functionResult.partialFailure.error;
38
65
  error.isPartialFailure = true;
39
- common_1.logger.error(lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
40
- resourceType: 'Function',
41
- name: functionResult.partialFailure.failedItem.logicalId,
42
- }));
66
+ common_1.logger.error(`${lang_1.lang.__('FAILED_TO_EXECUTE_ACTION', {
67
+ action: functionResult.partialFailure.failedItem.action,
68
+ logicalId: functionResult.partialFailure.failedItem.logicalId,
69
+ error: formatApiError(error),
70
+ })}\n\n${lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
71
+ successCount: String(functionResult.partialFailure.successfulItems.length),
72
+ failedResource: functionResult.partialFailure.failedItem.logicalId,
73
+ })}`);
43
74
  throw error;
44
75
  }
45
76
  state = functionResult.state;
@@ -47,10 +78,14 @@ const deployVolcengineStack = async (iac, backend) => {
47
78
  if (apigwResult.partialFailure) {
48
79
  const error = apigwResult.partialFailure.error;
49
80
  error.isPartialFailure = true;
50
- common_1.logger.error(lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
51
- resourceType: 'API Gateway',
52
- name: apigwResult.partialFailure.failedItem.logicalId,
53
- }));
81
+ common_1.logger.error(`${lang_1.lang.__('FAILED_TO_EXECUTE_ACTION', {
82
+ action: apigwResult.partialFailure.failedItem.action,
83
+ logicalId: apigwResult.partialFailure.failedItem.logicalId,
84
+ error: formatApiError(error),
85
+ })}\n\n${lang_1.lang.__('PARTIAL_DEPLOYMENT_FAILURE', {
86
+ successCount: String(apigwResult.partialFailure.successfulItems.length),
87
+ failedResource: apigwResult.partialFailure.failedItem.logicalId,
88
+ })}`);
54
89
  throw error;
55
90
  }
56
91
  await backend.saveState(apigwResult.state, iac.app, iac.service, context.stage);
@@ -17,7 +17,7 @@ const destroyVolcengineStack = async (backend) => {
17
17
  let state = await backend.loadState(providerName, context.app, context.service, context.stage);
18
18
  const allResources = (0, stateManager_1.getAllResources)(state);
19
19
  const eventEntries = Object.entries(allResources).filter(([logicalId, resourceState]) => logicalId.startsWith('events.') &&
20
- resourceState.instances?.some((i) => i.type === 'VOLCENGINE_APIGW_GROUP' || i.type === 'VOLCENGINE_APIGW_API'));
20
+ resourceState.instances?.some((i) => typeof i.type === 'string' && i.type.startsWith('VOLCENGINE_APIGW_')));
21
21
  for (const [logicalId] of eventEntries) {
22
22
  try {
23
23
  common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'API Gateway', name: logicalId }));
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.deleteApigwResource = exports.updateApigwResource = exports.readApigwResource = exports.createApigwResource = exports.deleteTosResource = exports.updateTosResource = exports.readTosResource = exports.createTosResource = exports.deleteVefaasResource = exports.updateVefaasResource = exports.readVefaasResource = exports.createVefaasResource = void 0;
17
+ exports.deleteApigwResource = exports.updateApigwResource = exports.createApigwResource = exports.deleteTosResource = exports.updateTosResource = exports.readTosResource = exports.createTosResource = exports.deleteVefaasResource = exports.updateVefaasResource = exports.readVefaasResource = exports.createVefaasResource = void 0;
18
18
  __exportStar(require("./planner"), exports);
19
19
  __exportStar(require("./deployer"), exports);
20
20
  __exportStar(require("./destroyer"), exports);
@@ -37,7 +37,6 @@ __exportStar(require("./tosExecutor"), exports);
37
37
  __exportStar(require("./apigwTypes"), exports);
38
38
  var apigwResource_1 = require("./apigwResource");
39
39
  Object.defineProperty(exports, "createApigwResource", { enumerable: true, get: function () { return apigwResource_1.createApigwResource; } });
40
- Object.defineProperty(exports, "readApigwResource", { enumerable: true, get: function () { return apigwResource_1.readApigwResource; } });
41
40
  Object.defineProperty(exports, "updateApigwResource", { enumerable: true, get: function () { return apigwResource_1.updateApigwResource; } });
42
41
  Object.defineProperty(exports, "deleteApigwResource", { enumerable: true, get: function () { return apigwResource_1.deleteApigwResource; } });
43
42
  __exportStar(require("./apigwPlanner"), exports);
@@ -4,6 +4,7 @@ exports.executeBucketPlan = void 0;
4
4
  const types_1 = require("../../types");
5
5
  const tosResource_1 = require("./tosResource");
6
6
  const common_1 = require("../../common");
7
+ const reportResourceEvent_1 = require("../../common/reportResourceEvent");
7
8
  const stateManager_1 = require("../../common/stateManager");
8
9
  const lang_1 = require("../../lang");
9
10
  const executeCreateAction = async (context, bucket, currentState) => {
@@ -62,13 +63,26 @@ const executeBucketPlan = async (context, plan, buckets, initialState, onStateCh
62
63
  const successfulItems = [];
63
64
  let currentState = initialState;
64
65
  for (const item of plan.items) {
66
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
67
+ type: 'resource_pre',
68
+ logicalId: item.logicalId,
69
+ resourceType: item.resourceType,
70
+ action: item.action,
71
+ ...(item.drifted ? { message: 'resource drifted' } : {}),
72
+ });
73
+ const __siStartedAt = Date.now();
65
74
  try {
66
75
  const newState = await executeSingleItem(context, item, bucketsMap, currentState);
67
76
  if (newState !== null) {
68
77
  currentState = newState;
69
78
  successfulItems.push(item);
79
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
80
+ type: 'resource_complete',
81
+ logicalId: item.logicalId,
82
+ durationMs: Date.now() - __siStartedAt,
83
+ });
70
84
  if (onStateChange) {
71
- onStateChange(currentState);
85
+ await onStateChange(currentState);
72
86
  common_1.logger.debug(lang_1.lang.__('STATE_PERSISTED_AFTER_OPERATION', {
73
87
  action: item.action,
74
88
  resourceId: item.logicalId,
@@ -77,10 +91,19 @@ const executeBucketPlan = async (context, plan, buckets, initialState, onStateCh
77
91
  }
78
92
  }
79
93
  catch (error) {
94
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
95
+ type: 'resource_failed',
96
+ logicalId: item.logicalId,
97
+ severity: 'error',
98
+ durationMs: Date.now() - __siStartedAt,
99
+ error: {
100
+ message: error instanceof Error ? error.message : String(error),
101
+ },
102
+ });
80
103
  if (error instanceof types_1.PartialResourceError) {
81
104
  const updatedState = error.updatedState;
82
105
  if (onStateChange) {
83
- onStateChange(updatedState);
106
+ await onStateChange(updatedState);
84
107
  }
85
108
  return {
86
109
  state: updatedState,
@@ -9,6 +9,7 @@ const volcengineClient_1 = require("../../common/volcengineClient");
9
9
  const tosTypes_1 = require("./tosTypes");
10
10
  const stateManager_1 = require("../../common/stateManager");
11
11
  const common_1 = require("../../common");
12
+ const ownershipTag_1 = require("../ownershipTag");
12
13
  const planBucketDeletion = (logicalId, definition) => ({
13
14
  logicalId,
14
15
  action: 'delete',
@@ -39,7 +40,16 @@ const generateBucketPlan = async (context, state, buckets) => {
39
40
  }
40
41
  })();
41
42
  const desiredDefinition = (0, tosTypes_1.extractTosBucketDefinition)(config, websiteCodeHash);
42
- if (!currentState) {
43
+ if (!currentState || currentState.status === 'tainted') {
44
+ // No usable local state: probe the provider before planning create.
45
+ // If a same-named bucket already exists WITHOUT our ownership tag it
46
+ // may belong to another project — fail fast in the plan instead of
47
+ // letting the executor discover it mid-deploy.
48
+ const client = (0, volcengineClient_1.createVolcengineClient)(context);
49
+ const remoteBucket = await client.tos.getBucket(bucket.name);
50
+ if (remoteBucket && !(0, ownershipTag_1.isOwnedByStack)(context, logicalId, remoteBucket.Tags)) {
51
+ throw new Error(`Bucket ${bucket.name} already exists in provider but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to create — resolve manually.`);
52
+ }
43
53
  return {
44
54
  logicalId,
45
55
  action: 'create',
@@ -6,10 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.deleteResource = exports.updateResource = exports.readResource = exports.createResource = void 0;
7
7
  const volcengineClient_1 = require("../../common/volcengineClient");
8
8
  const common_1 = require("../../common");
9
+ const types_1 = require("../../types");
9
10
  const tosTypes_1 = require("./tosTypes");
10
11
  const logger_1 = require("../../common/logger");
11
12
  const lang_1 = require("../../lang");
12
13
  const node_path_1 = __importDefault(require("node:path"));
14
+ const ownershipTag_1 = require("../ownershipTag");
15
+ const alreadyExists_1 = require("../alreadyExists");
13
16
  const buildTosBucketPolicyJson = (iam) => {
14
17
  if (!iam?.resource?.statements || iam.resource.statements.length === 0)
15
18
  return null;
@@ -42,26 +45,80 @@ const applyBucketPolicy = async (client, bucket) => {
42
45
  logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLIED', { bucketName: bucket.name }));
43
46
  };
44
47
  const deleteBucketPolicy = async (client, bucketName) => {
45
- try {
46
- await client.tos.deleteBucketPolicy(bucketName);
47
- logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_DELETED', { bucketName }));
48
- }
49
- catch {
50
- // Best effort cleanup
51
- }
48
+ await client.tos.deleteBucketPolicy(bucketName);
49
+ logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_DELETED', { bucketName }));
52
50
  };
53
51
  const createResource = async (context, bucket, state) => {
54
52
  const config = (0, tosTypes_1.bucketToTosConfig)(bucket);
55
53
  const client = (0, volcengineClient_1.createVolcengineClient)(context);
56
- const bucketInfo = await client.tos.createBucket(config);
57
54
  const sid = (0, common_1.buildSid)('volcengine', 'tos', context.stage, bucket.name);
58
55
  const logicalId = `buckets.${bucket.key}`;
56
+ // Stamp the ownership tag (sent as the x-tos-tagging header on CreateBucket)
57
+ // so a later run can idempotently adopt this bucket, and an unrelated
58
+ // same-named bucket is never adopted.
59
+ config.Tags = [{ Key: ownershipTag_1.OWNERSHIP_TAG_KEY, Value: (0, ownershipTag_1.buildOwnershipTagValue)(context, logicalId) }];
59
60
  const websiteCodeHash = bucket.website?.code
60
61
  ? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
61
62
  : undefined;
62
- const instances = [(0, tosTypes_1.buildTosInstanceFromProvider)(bucketInfo, sid)];
63
- if (bucket.website?.code) {
64
- try {
63
+ const existingResourceState = (0, common_1.getResource)(state, logicalId);
64
+ const isTainted = existingResourceState?.status === 'tainted';
65
+ const existingBucketOnRetry = isTainted ? await client.tos.getBucket(bucket.name) : null;
66
+ if (existingBucketOnRetry) {
67
+ logger_1.logger.info(`Bucket ${bucket.name} already exists in provider (tainted recovery), skipping create`);
68
+ }
69
+ const taintedResourceState = {
70
+ mode: 'managed',
71
+ region: context.region,
72
+ definition: (0, tosTypes_1.extractTosBucketDefinition)(config, websiteCodeHash),
73
+ instances: existingBucketOnRetry
74
+ ? [(0, tosTypes_1.buildTosInstanceFromProvider)(existingBucketOnRetry, sid)]
75
+ : [
76
+ {
77
+ type: 'VOLCENGINE_TOS_BUCKET',
78
+ sid,
79
+ id: bucket.name,
80
+ bucketName: bucket.name,
81
+ attributes: {},
82
+ },
83
+ ],
84
+ status: 'tainted',
85
+ lastUpdated: new Date().toISOString(),
86
+ };
87
+ const stateAfterDependents = (0, common_1.setResource)(state, logicalId, taintedResourceState);
88
+ try {
89
+ let bucketInfo;
90
+ if (existingBucketOnRetry) {
91
+ bucketInfo = existingBucketOnRetry;
92
+ }
93
+ else {
94
+ try {
95
+ await client.tos.createBucket(config);
96
+ }
97
+ catch (error) {
98
+ // TOS CreateBucket may be idempotent for the same account; a collision
99
+ // (BucketAlreadyExists) surfaces only for a bucket owned by another
100
+ // account. Treat it as non-fatal and fall through to the ownership probe
101
+ // below — an untagged pre-existing bucket is refused there.
102
+ if (!(0, alreadyExists_1.isResourceAlreadyExistsError)(error, ['BucketAlreadyExists'])) {
103
+ throw error;
104
+ }
105
+ logger_1.logger.info(`Bucket ${bucket.name} already exists in provider, verifying ownership tag before adopting`);
106
+ }
107
+ // CreateBucket succeeding does NOT prove the bucket is ours: a pre-existing
108
+ // bucket is returned idempotently. Only a bucket carrying our ownership tag
109
+ // may be adopted; an untagged one may belong to another project and must
110
+ // fail loudly rather than be silently taken over.
111
+ const probe = await client.tos.getBucket(bucket.name);
112
+ if (!probe) {
113
+ throw new Error(`Failed to refresh state for bucket: ${bucket.name}`);
114
+ }
115
+ if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.Tags)) {
116
+ throw new types_1.PartialResourceError(stateAfterDependents, new Error(`Bucket ${bucket.name} already exists in provider but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to adopt — resolve manually.`));
117
+ }
118
+ bucketInfo = probe;
119
+ }
120
+ const instances = [(0, tosTypes_1.buildTosInstanceFromProvider)(bucketInfo, sid)];
121
+ if (bucket.website?.code) {
65
122
  const codePath = node_path_1.default.resolve(process.cwd(), bucket.website.code);
66
123
  await client.tos.uploadFiles(bucket.name, codePath);
67
124
  const refreshedInfo = await client.tos.getBucket(bucket.name);
@@ -69,23 +126,21 @@ const createResource = async (context, bucket, state) => {
69
126
  instances[0] = (0, tosTypes_1.buildTosInstanceFromProvider)(refreshedInfo, sid);
70
127
  }
71
128
  }
72
- catch (error) {
73
- logger_1.logger.error(lang_1.lang.__('TOS_BUCKET_FILE_UPLOAD_FAILED_STATE_SAVED', {
74
- error: error instanceof Error ? error.message : String(error),
75
- }));
76
- logger_1.logger.info(lang_1.lang.__('TOS_BUCKET_TRACKED_CAN_RETRY'));
77
- }
129
+ // Apply IAM bucket policy if configured
130
+ await applyBucketPolicy(client, bucket);
131
+ const resourceState = {
132
+ mode: 'managed',
133
+ region: context.region,
134
+ definition: (0, tosTypes_1.extractTosBucketDefinition)(config, websiteCodeHash),
135
+ instances,
136
+ status: 'ready',
137
+ lastUpdated: new Date().toISOString(),
138
+ };
139
+ return (0, common_1.setResource)(stateAfterDependents, logicalId, resourceState);
140
+ }
141
+ catch (error) {
142
+ throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
78
143
  }
79
- // Apply IAM bucket policy if configured
80
- await applyBucketPolicy(client, bucket);
81
- const resourceState = {
82
- mode: 'managed',
83
- region: context.region,
84
- definition: (0, tosTypes_1.extractTosBucketDefinition)(config, websiteCodeHash),
85
- instances,
86
- lastUpdated: new Date().toISOString(),
87
- };
88
- return (0, common_1.setResource)(state, logicalId, resourceState);
89
144
  };
90
145
  exports.createResource = createResource;
91
146
  const readResource = async (context, bucketName) => {
@@ -67,6 +67,18 @@ const buildTosInstanceFromProvider = (info, sid) => {
67
67
  errorDocument: info.websiteConfig.errorDocument ?? null,
68
68
  }
69
69
  : null,
70
+ Tags: info.Tags ?? null,
71
+ owner: info.owner ?? null,
72
+ projectName: info.projectName ?? null,
73
+ bucketType: info.type ?? null,
74
+ azRedundancy: info.azRedundancy ?? null,
75
+ extranetS3Endpoint: info.extranetS3Endpoint ?? null,
76
+ intranetS3Endpoint: info.intranetS3Endpoint ?? null,
77
+ versioning: info.versioning ?? null,
78
+ crossRegionReplication: info.crossRegionReplication ?? null,
79
+ transferAcceleration: info.transferAcceleration ?? null,
80
+ accessMonitor: info.accessMonitor ?? null,
81
+ serverSideEncryptionConfiguration: info.serverSideEncryptionConfiguration ?? null,
70
82
  };
71
83
  };
72
84
  exports.buildTosInstanceFromProvider = buildTosInstanceFromProvider;
@@ -5,6 +5,7 @@ const types_1 = require("../../types");
5
5
  const vefaasResource_1 = require("./vefaasResource");
6
6
  const common_1 = require("../../common");
7
7
  const stateManager_1 = require("../../common/stateManager");
8
+ const reportResourceEvent_1 = require("../../common/reportResourceEvent");
8
9
  const lang_1 = require("../../lang");
9
10
  const executeCreateAction = async (context, fn, currentState) => {
10
11
  common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'function', name: fn.name }));
@@ -62,21 +63,43 @@ const executeFunctionPlan = async (context, plan, functions, initialState, onSta
62
63
  const successfulItems = [];
63
64
  let currentState = initialState;
64
65
  for (const item of plan.items) {
66
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
67
+ type: 'resource_pre',
68
+ logicalId: item.logicalId,
69
+ resourceType: item.resourceType,
70
+ action: item.action,
71
+ ...(item.drifted ? { message: 'resource drifted' } : {}),
72
+ });
73
+ const startedAt = Date.now();
65
74
  try {
66
75
  const newState = await executeSingleItem(context, item, functionsMap, currentState);
67
76
  if (newState !== null) {
68
77
  currentState = newState;
69
78
  successfulItems.push(item);
79
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
80
+ type: 'resource_complete',
81
+ logicalId: item.logicalId,
82
+ durationMs: Date.now() - startedAt,
83
+ });
70
84
  if (onStateChange) {
71
- onStateChange(currentState);
85
+ await onStateChange(currentState);
72
86
  }
73
87
  }
74
88
  }
75
89
  catch (error) {
90
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
91
+ type: 'resource_failed',
92
+ logicalId: item.logicalId,
93
+ severity: 'error',
94
+ durationMs: Date.now() - startedAt,
95
+ error: {
96
+ message: error instanceof Error ? error.message : String(error),
97
+ },
98
+ });
76
99
  if (error instanceof types_1.PartialResourceError) {
77
100
  const updatedState = error.updatedState;
78
101
  if (onStateChange) {
79
- onStateChange(updatedState);
102
+ await onStateChange(updatedState);
80
103
  }
81
104
  return {
82
105
  state: updatedState,