@geek-fun/serverlessinsight 0.5.7 → 0.5.10
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.
- package/AGENTS.md +372 -0
- package/README.md +2 -2
- package/README.zh-CN.md +11 -8
- package/dist/package.json +1 -1
- package/dist/src/commands/index.js +5 -4
- package/dist/src/common/aliyunClient/apigwOperations.js +96 -9
- package/dist/src/common/aliyunClient/ossOperations.js +68 -0
- package/dist/src/common/aliyunClient/ramOperations.js +65 -20
- package/dist/src/common/tencentClient/cosOperations.js +123 -0
- package/dist/src/lang/en.js +137 -0
- package/dist/src/lang/index.js +6 -0
- package/dist/src/lang/zh-CN.js +136 -0
- package/dist/src/stack/aliyunStack/apigwExecutor.js +15 -9
- package/dist/src/stack/aliyunStack/apigwPlanner.js +15 -2
- package/dist/src/stack/aliyunStack/apigwResource.js +3 -3
- package/dist/src/stack/aliyunStack/apigwTypes.js +4 -3
- package/dist/src/stack/aliyunStack/databaseExecutor.js +24 -9
- package/dist/src/stack/aliyunStack/databaseResource.js +5 -1
- package/dist/src/stack/aliyunStack/deployer.js +11 -2
- package/dist/src/stack/aliyunStack/destroyer.js +5 -1
- package/dist/src/stack/aliyunStack/fc3Executor.js +10 -9
- package/dist/src/stack/aliyunStack/fc3Resource.js +36 -27
- package/dist/src/stack/aliyunStack/ossExecutor.js +9 -9
- package/dist/src/stack/aliyunStack/ossResource.js +19 -3
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +21 -9
- package/dist/src/stack/scfStack/cosExecutor.js +9 -9
- package/dist/src/stack/scfStack/cosResource.js +20 -3
- package/dist/src/stack/scfStack/deployer.js +5 -1
- package/dist/src/stack/scfStack/destroyer.js +5 -1
- package/dist/src/stack/scfStack/esServerlessExecutor.js +21 -9
- package/dist/src/stack/scfStack/esServerlessResource.js +2 -1
- package/dist/src/stack/scfStack/scfExecutor.js +9 -9
- package/dist/src/stack/scfStack/scfResource.js +2 -1
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +9 -9
- package/dist/src/stack/scfStack/tdsqlcResource.js +5 -1
- package/dist/src/validator/bucketSchema.js +4 -0
- package/package.json +1 -1
package/dist/src/lang/zh-CN.js
CHANGED
|
@@ -240,6 +240,10 @@ exports.zhCN = {
|
|
|
240
240
|
APIGW_DOMAIN_BIND_RETRY: '重试域名绑定(第 {{attempt}}/{{max}} 次尝试,等待 DNS 传播)...',
|
|
241
241
|
APIGW_DOMAIN_BIND_RETRY_FAILED: '域名绑定第 {{attempt}} 次重试失败: {{error}}',
|
|
242
242
|
APIGW_DOMAIN_BOUND_AFTER_VERIFICATION: '验证后成功绑定域名: {{domain}}',
|
|
243
|
+
APIGW_DOMAIN_BIND_TIMEOUT_RETRY: '域名绑定请求超时,正在重试(第 {{attempt}}/{{max}} 次尝试)...',
|
|
244
|
+
APIGW_DOMAIN_BIND_TIMEOUT_RETRY_FAILED: '域名绑定超时重试第 {{attempt}} 次失败: {{error}}',
|
|
245
|
+
APIGW_DOMAIN_BIND_TIMEOUT_ALL_FAILED: '域名绑定在 {{max}} 次超时重试后失败: {{error}}',
|
|
246
|
+
APIGW_DOMAIN_BIND_ALREADY_BOUND: '域名 {{domain}} 已绑定(之前的请求可能已成功),继续配置证书',
|
|
243
247
|
APIGW_VERIFICATION_HEADER: '需要域名所有权验证',
|
|
244
248
|
APIGW_VERIFICATION_DOMAIN: '域名: {{domain}}',
|
|
245
249
|
APIGW_VERIFICATION_INSTRUCTIONS: '要验证域名所有权,请添加以下 DNS 记录之一:',
|
|
@@ -271,6 +275,11 @@ exports.zhCN = {
|
|
|
271
275
|
OSS_BUCKET_CNAME_BIND_FAILED: '绑定存储桶 CNAME 失败: {{error}}',
|
|
272
276
|
OSS_BUCKET_CNAME_UNBIND_FAILED: '解绑存储桶 CNAME 失败: {{error}}',
|
|
273
277
|
OSS_BUCKET_CNAME_NEED_VERIFY: '需要验证域名所有权。请在 DNS 控制台添加 TXT 记录后重试。',
|
|
278
|
+
OSS_CORS_RULE_ADDED: '已为自定义域名添加 CORS 规则: {{domain}}',
|
|
279
|
+
OSS_CORS_RULE_EXISTS: '自定义域名的 CORS 规则已存在: {{domain}}',
|
|
280
|
+
OSS_CORS_RULE_ADD_FAILED: '为 {{domain}} 添加 CORS 规则失败: {{error}}',
|
|
281
|
+
OSS_CORS_RULE_REMOVED: '已移除自定义域名的 CORS 规则: {{domain}}',
|
|
282
|
+
OSS_CORS_RULE_REMOVE_FAILED: '移除 {{domain}} 的 CORS 规则失败: {{error}}',
|
|
274
283
|
// Tencent COS DNS messages
|
|
275
284
|
COS_DNS_CNAME_CREATED: '已创建 DNS CNAME 记录: {{domain}} -> {{cname}}',
|
|
276
285
|
COS_DNS_CNAME_EXISTS: 'DNS CNAME 记录已存在: {{domain}} -> {{cname}}',
|
|
@@ -282,9 +291,136 @@ exports.zhCN = {
|
|
|
282
291
|
COS_BUCKET_DOMAIN_BIND_FAILED: '绑定存储桶域名失败: {{error}}',
|
|
283
292
|
COS_BUCKET_DOMAIN_UNBOUND: '已解绑存储桶自定义域名: {{domain}}',
|
|
284
293
|
COS_BUCKET_DOMAIN_UNBIND_FAILED: '解绑存储桶域名失败: {{error}}',
|
|
294
|
+
COS_CORS_RULE_ADDED: '已为自定义域名添加 CORS 规则: {{domain}}',
|
|
295
|
+
COS_CORS_RULE_EXISTS: '自定义域名的 CORS 规则已存在: {{domain}}',
|
|
296
|
+
COS_CORS_RULE_ADD_FAILED: '为 {{domain}} 添加 CORS 规则失败: {{error}}',
|
|
297
|
+
COS_CORS_RULE_REMOVED: '已移除自定义域名的 CORS 规则: {{domain}}',
|
|
298
|
+
COS_CORS_RULE_REMOVE_FAILED: '移除 {{domain}} 的 CORS 规则失败: {{error}}',
|
|
285
299
|
// Dependency graph messages
|
|
286
300
|
DEPENDENCY_GRAPH_GENERATED: '依赖图已生成',
|
|
287
301
|
EXECUTION_ORDER: '执行顺序',
|
|
288
302
|
DOT_GRAPH_OUTPUT: 'DOT 图形输出',
|
|
289
303
|
CYCLE_DETECTED: '检测到循环依赖',
|
|
304
|
+
// Generic executor messages
|
|
305
|
+
CREATING_RESOURCE: '正在创建 {{resourceType}}: {{name}}',
|
|
306
|
+
RESOURCE_CREATED: '成功创建 {{resourceType}}: {{name}}',
|
|
307
|
+
UPDATING_RESOURCE: '正在更新 {{resourceType}}: {{name}}',
|
|
308
|
+
RESOURCE_UPDATED: '成功更新 {{resourceType}}: {{name}}',
|
|
309
|
+
DELETING_RESOURCE: '正在删除 {{resourceType}}: {{name}}',
|
|
310
|
+
RESOURCE_DELETED: '成功删除 {{resourceType}}: {{name}}',
|
|
311
|
+
NO_CHANGESForResource: '{{logicalId}} 无变更',
|
|
312
|
+
STATE_NOT_FOUND_SKIPPING: '未找到 {{logicalId}} 的状态,跳过删除',
|
|
313
|
+
UNKNOWN_ACTION_FOR_RESOURCE: '{{logicalId}} 的未知操作: {{action}}',
|
|
314
|
+
RESOURCE_NOT_FOUND_PROVIDER: '提供商中未找到 {{resourceType}} {{name}},跳过删除',
|
|
315
|
+
// FC3 Resource bootstrap messages
|
|
316
|
+
CREATING_BOOTSTRAP_BUCKET: '正在创建引导 OSS 存储桶: {{bucketName}}',
|
|
317
|
+
UPLOADED_CODE_TO_OSS: '代码已上传至 oss://{{bucketName}}/{{objectName}}',
|
|
318
|
+
CREATING_SLS_PROJECT: '正在创建 SLS 项目: {{projectName}}',
|
|
319
|
+
CREATING_SLS_LOGSTORE: '正在创建 SLS 日志库: {{logstoreName}}',
|
|
320
|
+
CREATING_SLS_INDEX: '正在为 SLS 日志库创建索引: {{logstoreName}}',
|
|
321
|
+
CREATING_RAM_ROLE: '正在创建 RAM 角色: {{roleName}}',
|
|
322
|
+
CREATING_SECURITY_GROUP: '正在创建安全组: {{sgName}}',
|
|
323
|
+
CREATING_NAS_ACCESS_GROUP: '正在创建 NAS 权限组: {{accessGroupName}}',
|
|
324
|
+
CREATING_NAS_ACCESS_RULE: '正在为 NAS 权限组创建访问规则: {{accessGroupName}}',
|
|
325
|
+
CREATING_NAS_FILE_SYSTEM: '正在为 {{name}} 创建 NAS 文件系统',
|
|
326
|
+
CREATING_NAS_MOUNT_TARGET: '正在为 NAS 文件系统创建挂载点: {{fileSystemId}}',
|
|
327
|
+
DELETING_NAS_MOUNT_TARGET: '正在删除 NAS 挂载点: {{id}}',
|
|
328
|
+
DELETING_NAS_FILE_SYSTEM: '正在删除 NAS 文件系统: {{id}}',
|
|
329
|
+
DELETING_NAS_ACCESS_GROUP: '正在删除 NAS 权限组: {{id}}',
|
|
330
|
+
DELETING_SECURITY_GROUP: '正在删除安全组: {{id}}',
|
|
331
|
+
DELETING_RAM_ROLE: '正在删除 RAM 角色: {{id}}',
|
|
332
|
+
DELETING_SLS_INDEX: '正在删除 SLS 索引: {{id}}',
|
|
333
|
+
DELETING_SLS_LOGSTORE: '正在删除 SLS 日志库: {{id}}',
|
|
334
|
+
DELETING_SLS_PROJECT: '正在删除 SLS 项目: {{id}}',
|
|
335
|
+
UNKNOWN_RESOURCE_TYPE: '未知资源类型: {{type}}',
|
|
336
|
+
FAILED_TO_DELETE_RESOURCE: '删除资源 {{type}}:{{id}} 失败: {{error}}',
|
|
337
|
+
// OSS Resource messages
|
|
338
|
+
BINDING_CUSTOM_DOMAIN_TO_BUCKET: '正在绑定自定义域名 {{domain}} 到存储桶 {{bucketName}}',
|
|
339
|
+
// API Gateway Resource messages
|
|
340
|
+
COULD_NOT_FIND_GROUP_CREATING: '未找到现有分组,正在创建新分组: {{error}}',
|
|
341
|
+
DELETING_DNS_RECORD: '正在删除 DNS 记录: {{recordId}}',
|
|
342
|
+
DNS_RECORD_DELETED: '成功删除 DNS 记录: {{recordId}}',
|
|
343
|
+
FAILED_TO_DELETE_DNS_RECORD: '删除 DNS 记录 {{recordId}} 失败: {{error}}',
|
|
344
|
+
// API Gateway Types messages
|
|
345
|
+
CANNOT_RESOLVE_FUNCTION_REF: '无法解析函数引用 {{backendRef}}: 上下文中无 IAC',
|
|
346
|
+
FUNCTION_REF_NOT_RESOLVED: '无法从 IAC 解析函数引用 {{backendRef}}',
|
|
347
|
+
RESOLVED_FUNCTION_REF: '已将函数引用 {{backendRef}} 解析为函数名: {{functionName}}',
|
|
348
|
+
// Show command messages
|
|
349
|
+
LOADING_STATE_FOR: '正在加载应用 {{app}}、服务 {{service}}、阶段 {{stage}} 的状态...',
|
|
350
|
+
NO_RESOURCES_FOUND: '状态中未找到资源。',
|
|
351
|
+
STATE_LOCATION: '状态位置: {{location}}',
|
|
352
|
+
BACKEND_REMOTE: '后端: 远程',
|
|
353
|
+
DEPLOYED_RESOURCES: '已部署资源',
|
|
354
|
+
SUMMARY: '摘要',
|
|
355
|
+
PROVIDER_LABEL: '提供商',
|
|
356
|
+
APP_LABEL: '应用',
|
|
357
|
+
SERVICE_LABEL: '服务',
|
|
358
|
+
STAGE_LABEL: '阶段',
|
|
359
|
+
RESOURCES_LABEL: '资源',
|
|
360
|
+
LAST_UPDATED_LABEL: '最后更新',
|
|
361
|
+
LOCK_STATUS_LOCKED: '锁状态: 被 {{user}} 锁定',
|
|
362
|
+
LOCK_STATUS_UNLOCKED: '锁状态: 未锁定',
|
|
363
|
+
TO_DEPLOY_RESOURCES: '要部署资源,请运行: si deploy',
|
|
364
|
+
REMOTE_BACKEND_FALLBACK: '已配置远程后端但凭证不可用。回退到本地状态。',
|
|
365
|
+
FAILED_TO_LOAD_REMOTE_STATE: '从远程后端加载状态失败,回退到本地状态: {{error}}',
|
|
366
|
+
// Show command category labels
|
|
367
|
+
FUNCTIONS_LABEL: '函数',
|
|
368
|
+
API_GATEWAY_LABEL: 'API 网关',
|
|
369
|
+
STORAGE_LABEL: '存储',
|
|
370
|
+
DATABASES_LABEL: '数据库',
|
|
371
|
+
DNS_RECORDS_LABEL: 'DNS 记录',
|
|
372
|
+
OTHER_RESOURCES_LABEL: '其他资源',
|
|
373
|
+
// Show command resource output labels
|
|
374
|
+
RUNTIME_LABEL: '运行时',
|
|
375
|
+
HANDLER_LABEL: '处理器',
|
|
376
|
+
MEMORY_TIMEOUT_LABEL: '内存: {{memory}}MB, 超时: {{timeout}}s',
|
|
377
|
+
INTERNET_ACCESS_LABEL: '公网访问: {{value}}',
|
|
378
|
+
API_GROUP_LABEL: 'API 分组',
|
|
379
|
+
SUB_DOMAIN_LABEL: '子域名',
|
|
380
|
+
BASE_PATH_LABEL: '基础路径',
|
|
381
|
+
API_LABEL: 'API',
|
|
382
|
+
GROUP_ID_LABEL: '分组 ID',
|
|
383
|
+
BUCKET_LABEL: '存储桶',
|
|
384
|
+
REGION_LABEL: '区域',
|
|
385
|
+
ENDPOINT_LABEL: '端点',
|
|
386
|
+
CUSTOM_DOMAIN_LABEL: '自定义域名',
|
|
387
|
+
CNAME_TARGET_LABEL: 'CNAME 目标',
|
|
388
|
+
ENGINE_LABEL: '引擎',
|
|
389
|
+
STATUS_LABEL: '状态',
|
|
390
|
+
CNAME_LABEL: 'CNAME',
|
|
391
|
+
// Time ago format
|
|
392
|
+
TIME_DAYS_AGO: '{{count}} 天前',
|
|
393
|
+
TIME_HOURS_AGO: '{{count}} 小时前',
|
|
394
|
+
TIME_MINUTES_AGO: '{{count}} 分钟前',
|
|
395
|
+
TIME_JUST_NOW: '刚刚',
|
|
396
|
+
// Deployer/Destroyer execution plan
|
|
397
|
+
EXECUTION_PLAN_ITEM: ' - {{action}}: {{logicalId}} ({{resourceType}})',
|
|
398
|
+
EXECUTION_ORDER_ITEM: ' {{index}}. {{logicalId}} ({{resourceType}}) - {{action}}',
|
|
399
|
+
// Tablestore operations
|
|
400
|
+
TABLE_IS_READY: '表 {{tableName}} 已就绪',
|
|
401
|
+
FAILED_TO_CREATE_TABLE: '创建表 {{tableName}} 失败: {{error}}',
|
|
402
|
+
TABLE_CREATED_SUCCESS: '成功创建表 {{tableName}}',
|
|
403
|
+
FAILED_TO_DESCRIBE_TABLE: '描述表 {{tableName}} 失败: {{error}}',
|
|
404
|
+
FAILED_TO_UPDATE_TABLE: '更新表 {{tableName}} 失败: {{error}}',
|
|
405
|
+
TABLE_UPDATED_SUCCESS: '成功更新表 {{tableName}}',
|
|
406
|
+
TABLE_ALREADY_DELETED: '表 {{tableName}} 已删除或不存在',
|
|
407
|
+
FAILED_TO_DELETE_TABLE: '删除表 {{tableName}} 失败: {{error}}',
|
|
408
|
+
TABLE_DELETED_SUCCESS: '成功删除表 {{tableName}}',
|
|
409
|
+
// ECS operations
|
|
410
|
+
SKIPPING_INVALID_INGRESS_RULE: '跳过无效的入站规则: {{rule}}。{{error}}',
|
|
411
|
+
INGRESS_RULE_EXISTS_SKIPPING: '入站规则已存在,跳过: {{rule}}',
|
|
412
|
+
FAILED_TO_ADD_INGRESS_RULE: '添加入站规则失败: {{rule}}。{{error}}',
|
|
413
|
+
SKIPPING_INVALID_EGRESS_RULE: '跳过无效的出站规则: {{rule}}。{{error}}',
|
|
414
|
+
EGRESS_RULE_EXISTS_SKIPPING: '出站规则已存在,跳过: {{rule}}',
|
|
415
|
+
FAILED_TO_ADD_EGRESS_RULE: '添加出站规则失败: {{rule}}。{{error}}',
|
|
416
|
+
// DNS error
|
|
417
|
+
DNS_ERROR: 'DNS 错误: {{error}}',
|
|
418
|
+
// RAM operations
|
|
419
|
+
RAM_ROLE_ALREADY_EXISTS: 'RAM 角色 "{{roleName}}" 在云端已存在(检测到状态漂移)。' + '正在更新信任策略并复用现有角色。',
|
|
420
|
+
RAM_ROLE_NOT_FOUND_IN_CLOUD: '云提供商中不存在 RAM 角色 "{{roleName}}"。' +
|
|
421
|
+
'该角色可能已被手动删除。' +
|
|
422
|
+
'修复方法:从状态中移除该角色并重新部署。',
|
|
423
|
+
RAM_ROLE_DRIFT_RECOVERY_FAILED: 'RAM 角色 "{{roleName}}" 状态漂移恢复失败:{{error}}。' +
|
|
424
|
+
'角色在云端存在但恢复操作失败。' +
|
|
425
|
+
'修复方法:在云控制台手动确认角色状态,从状态中移除该角色并重新部署。',
|
|
290
426
|
};
|
|
@@ -8,16 +8,16 @@ const lang_1 = require("../../lang");
|
|
|
8
8
|
const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn, currentState) => {
|
|
9
9
|
switch (item.action) {
|
|
10
10
|
case 'noop':
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
12
12
|
return null;
|
|
13
13
|
case 'create': {
|
|
14
14
|
const event = eventsMap.get(item.logicalId);
|
|
15
15
|
if (!event) {
|
|
16
16
|
throw new Error(`Event not found for logical ID: ${item.logicalId}`);
|
|
17
17
|
}
|
|
18
|
-
common_1.logger.info(
|
|
18
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
19
19
|
const newState = await (0, apigwResource_1.createApigwResource)(context, event, serviceName, roleArn, currentState);
|
|
20
|
-
common_1.logger.info(
|
|
20
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'API Gateway resources', name: event.name }));
|
|
21
21
|
return newState;
|
|
22
22
|
}
|
|
23
23
|
case 'update': {
|
|
@@ -25,24 +25,30 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn,
|
|
|
25
25
|
if (!event) {
|
|
26
26
|
throw new Error(`Event not found for logical ID: ${item.logicalId}`);
|
|
27
27
|
}
|
|
28
|
-
common_1.logger.info(
|
|
28
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
29
29
|
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, roleArn, currentState);
|
|
30
|
-
common_1.logger.info(
|
|
30
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'API Gateway resources', name: event.name }));
|
|
31
31
|
return newState;
|
|
32
32
|
}
|
|
33
33
|
case 'delete': {
|
|
34
34
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
35
35
|
if (!state) {
|
|
36
|
-
common_1.logger.warn(
|
|
36
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
|
-
common_1.logger.info(
|
|
39
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', {
|
|
40
|
+
resourceType: 'API Gateway resources',
|
|
41
|
+
name: item.logicalId,
|
|
42
|
+
}));
|
|
40
43
|
const newState = await (0, apigwResource_1.deleteApigwResource)(context, item.logicalId, currentState);
|
|
41
|
-
common_1.logger.info(
|
|
44
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', {
|
|
45
|
+
resourceType: 'API Gateway resources',
|
|
46
|
+
name: item.logicalId,
|
|
47
|
+
}));
|
|
42
48
|
return newState;
|
|
43
49
|
}
|
|
44
50
|
default:
|
|
45
|
-
common_1.logger.warn(
|
|
51
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
46
52
|
return null;
|
|
47
53
|
}
|
|
48
54
|
};
|
|
@@ -5,6 +5,8 @@ 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 DNS_SUB_RESOURCE_SUFFIXES = ['.dns_verification', '.dns_txt_verification'];
|
|
9
|
+
const isDnsSubResource = (logicalId) => DNS_SUB_RESOURCE_SUFFIXES.some((suffix) => logicalId.endsWith(suffix));
|
|
8
10
|
const planEventDeletion = (logicalId, definition) => ({
|
|
9
11
|
logicalId,
|
|
10
12
|
action: 'delete',
|
|
@@ -19,7 +21,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
19
21
|
if (!events || events.length === 0) {
|
|
20
22
|
const allStates = (0, stateManager_1.getAllResources)(state);
|
|
21
23
|
const items = Object.entries(allStates)
|
|
22
|
-
.filter(([logicalId]) => logicalId.startsWith('events.'))
|
|
24
|
+
.filter(([logicalId]) => logicalId.startsWith('events.') && !isDnsSubResource(logicalId))
|
|
23
25
|
.map(([logicalId, resourceState]) => planEventDeletion(logicalId, resourceState.definition));
|
|
24
26
|
return { items };
|
|
25
27
|
}
|
|
@@ -111,7 +113,18 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
111
113
|
// Find resources in state that are no longer in config
|
|
112
114
|
const allStates = (0, stateManager_1.getAllResources)(state);
|
|
113
115
|
const deletionItems = Object.entries(allStates)
|
|
114
|
-
.filter(([logicalId]) =>
|
|
116
|
+
.filter(([logicalId]) => {
|
|
117
|
+
if (!logicalId.startsWith('events.')) {
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
if (desiredLogicalIds.has(logicalId)) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
if (isDnsSubResource(logicalId)) {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
return true;
|
|
127
|
+
})
|
|
115
128
|
.map(([logicalId, resourceState]) => planEventDeletion(logicalId, resourceState.definition));
|
|
116
129
|
return { items: [...eventItems, ...deletionItems] };
|
|
117
130
|
};
|
|
@@ -360,13 +360,13 @@ const cleanupDnsRecords = async (context, eventLogicalId, state) => {
|
|
|
360
360
|
// Only delete if recordId is not 'existing' (which means we didn't create it)
|
|
361
361
|
if (recordId && recordId !== 'existing') {
|
|
362
362
|
try {
|
|
363
|
-
logger_1.logger.info(
|
|
363
|
+
logger_1.logger.info(lang_1.lang.__('DELETING_DNS_RECORD', { recordId }));
|
|
364
364
|
await client.dns.deleteDomainRecord(recordId);
|
|
365
|
-
logger_1.logger.info(
|
|
365
|
+
logger_1.logger.info(lang_1.lang.__('DNS_RECORD_DELETED', { recordId }));
|
|
366
366
|
}
|
|
367
367
|
catch (error) {
|
|
368
368
|
// DNS record might already be deleted or not accessible
|
|
369
|
-
logger_1.logger.warn(
|
|
369
|
+
logger_1.logger.warn(lang_1.lang.__('FAILED_TO_DELETE_DNS_RECORD', { recordId, error: String(error) }));
|
|
370
370
|
}
|
|
371
371
|
}
|
|
372
372
|
state = (0, stateManager_1.removeResource)(state, dnsResourceId);
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.generateApiKey = exports.eventToApigwGroupConfig = void 0;
|
|
4
4
|
const common_1 = require("../../common");
|
|
5
|
+
const lang_1 = require("../../lang");
|
|
5
6
|
/**
|
|
6
7
|
* Convert EventDomain to API Gateway group config
|
|
7
8
|
*/
|
|
@@ -34,18 +35,18 @@ const resolveFunctionReference = (backendRef) => {
|
|
|
34
35
|
// Get IAC from context
|
|
35
36
|
const context = (0, common_1.getContext)();
|
|
36
37
|
if (!context.iac) {
|
|
37
|
-
common_1.logger.warn(
|
|
38
|
+
common_1.logger.warn(lang_1.lang.__('CANNOT_RESOLVE_FUNCTION_REF', { backendRef }));
|
|
38
39
|
return backendRef;
|
|
39
40
|
}
|
|
40
41
|
// Use getIacDefinition to resolve function references
|
|
41
42
|
const functionDef = (0, common_1.getIacDefinition)(context.iac, backendRef);
|
|
42
43
|
if (!functionDef) {
|
|
43
44
|
// Not a function reference or function not found, return as is
|
|
44
|
-
common_1.logger.warn(
|
|
45
|
+
common_1.logger.warn(lang_1.lang.__('FUNCTION_REF_NOT_RESOLVED', { backendRef }));
|
|
45
46
|
return backendRef;
|
|
46
47
|
}
|
|
47
48
|
const functionName = functionDef.name;
|
|
48
|
-
common_1.logger.info(
|
|
49
|
+
common_1.logger.info(lang_1.lang.__('RESOLVED_FUNCTION_REF', { backendRef, functionName }));
|
|
49
50
|
return functionName;
|
|
50
51
|
};
|
|
51
52
|
/**
|
|
@@ -8,23 +8,38 @@ const lang_1 = require("../../lang");
|
|
|
8
8
|
const getResourceTypeName = (resourceType) => resourceType === 'ALIYUN_ES_SERVERLESS' ? 'Elasticsearch Serverless' : 'RDS Serverless';
|
|
9
9
|
const executeCreateAction = async (context, database, resourceType, currentState) => {
|
|
10
10
|
const resourceTypeName = getResourceTypeName(resourceType);
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', {
|
|
12
|
+
resourceType: `${resourceTypeName} database`,
|
|
13
|
+
name: database.name,
|
|
14
|
+
}));
|
|
12
15
|
const newState = await (0, databaseResource_1.createDatabaseResource)(context, database, currentState);
|
|
13
|
-
common_1.logger.info(
|
|
16
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', {
|
|
17
|
+
resourceType: `${resourceTypeName} database`,
|
|
18
|
+
name: database.name,
|
|
19
|
+
}));
|
|
14
20
|
return newState;
|
|
15
21
|
};
|
|
16
22
|
const executeUpdateAction = async (context, database, instanceId, resourceType, currentState) => {
|
|
17
23
|
const resourceTypeName = getResourceTypeName(resourceType);
|
|
18
|
-
common_1.logger.info(
|
|
24
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', {
|
|
25
|
+
resourceType: `${resourceTypeName} database`,
|
|
26
|
+
name: database.name,
|
|
27
|
+
}));
|
|
19
28
|
const newState = await (0, databaseResource_1.updateDatabaseResource)(context, database, instanceId, resourceType, currentState);
|
|
20
|
-
common_1.logger.info(
|
|
29
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', {
|
|
30
|
+
resourceType: `${resourceTypeName} database`,
|
|
31
|
+
name: database.name,
|
|
32
|
+
}));
|
|
21
33
|
return newState;
|
|
22
34
|
};
|
|
23
35
|
const executeDeleteAction = async (context, instanceId, resourceType, logicalId, currentState) => {
|
|
24
36
|
const resourceTypeName = getResourceTypeName(resourceType);
|
|
25
|
-
common_1.logger.info(
|
|
37
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', {
|
|
38
|
+
resourceType: `${resourceTypeName} database`,
|
|
39
|
+
name: instanceId,
|
|
40
|
+
}));
|
|
26
41
|
const newState = await (0, databaseResource_1.deleteDatabaseResource)(context, instanceId, resourceType, logicalId, currentState);
|
|
27
|
-
common_1.logger.info(
|
|
42
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: `${resourceTypeName} database`, name: instanceId }));
|
|
28
43
|
return newState;
|
|
29
44
|
};
|
|
30
45
|
const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
@@ -34,7 +49,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
34
49
|
}
|
|
35
50
|
switch (item.action) {
|
|
36
51
|
case 'noop':
|
|
37
|
-
common_1.logger.info(
|
|
52
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
38
53
|
return null;
|
|
39
54
|
case 'create': {
|
|
40
55
|
const database = databasesMap.get(item.logicalId);
|
|
@@ -62,7 +77,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
62
77
|
case 'delete': {
|
|
63
78
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
64
79
|
if (!state) {
|
|
65
|
-
common_1.logger.warn(
|
|
80
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
66
81
|
return null;
|
|
67
82
|
}
|
|
68
83
|
const instanceId = state.metadata?.instanceId || state.instances?.[0]?.id;
|
|
@@ -73,7 +88,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
73
88
|
return executeDeleteAction(context, instanceId, resourceType, item.logicalId, currentState);
|
|
74
89
|
}
|
|
75
90
|
default:
|
|
76
|
-
common_1.logger.warn(
|
|
91
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
77
92
|
return null;
|
|
78
93
|
}
|
|
79
94
|
};
|
|
@@ -7,6 +7,7 @@ const esServerlessTypes_1 = require("./esServerlessTypes");
|
|
|
7
7
|
const stateManager_1 = require("../../common/stateManager");
|
|
8
8
|
const common_1 = require("../../common");
|
|
9
9
|
const logger_1 = require("../../common/logger");
|
|
10
|
+
const lang_1 = require("../../lang");
|
|
10
11
|
const buildRdsInstanceFromProvider = (info, sid) => {
|
|
11
12
|
return {
|
|
12
13
|
sid,
|
|
@@ -233,7 +234,10 @@ const deleteDatabaseResource = async (context, instanceId, resourceType, logical
|
|
|
233
234
|
errorCode === 'NotFound' ||
|
|
234
235
|
errorMessage.includes('not found') ||
|
|
235
236
|
errorMessage.includes('NotFound')) {
|
|
236
|
-
logger_1.logger.warn(
|
|
237
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
|
|
238
|
+
resourceType: 'Database resource',
|
|
239
|
+
name: instanceId,
|
|
240
|
+
}));
|
|
237
241
|
}
|
|
238
242
|
else {
|
|
239
243
|
throw err;
|
|
@@ -34,7 +34,12 @@ const logDependencyGraph = (orderedItems, dotGraph) => {
|
|
|
34
34
|
common_1.logger.info(lang_1.lang.__('DEPENDENCY_GRAPH_GENERATED'));
|
|
35
35
|
common_1.logger.info(` ${lang_1.lang.__('EXECUTION_ORDER')}:`);
|
|
36
36
|
orderedItems.forEach((item, index) => {
|
|
37
|
-
common_1.logger.info(
|
|
37
|
+
common_1.logger.info(lang_1.lang.__('EXECUTION_ORDER_ITEM', {
|
|
38
|
+
index: String(index + 1),
|
|
39
|
+
logicalId: item.logicalId,
|
|
40
|
+
resourceType: item.resourceType,
|
|
41
|
+
action: item.action,
|
|
42
|
+
}));
|
|
38
43
|
});
|
|
39
44
|
common_1.logger.debug(`${lang_1.lang.__('DOT_GRAPH_OUTPUT')}:\n${dotGraph}`);
|
|
40
45
|
};
|
|
@@ -70,7 +75,11 @@ const deployAliyunStack = async (iac, backend) => {
|
|
|
70
75
|
// Plan execution below still follows the fixed per-resource ordering.
|
|
71
76
|
common_1.logger.info(`${lang_1.lang.__('PLAN_GENERATED')}: ${allItems.length} ${lang_1.lang.__('ACTIONS')}`);
|
|
72
77
|
allItems.forEach((item) => {
|
|
73
|
-
common_1.logger.info(
|
|
78
|
+
common_1.logger.info(lang_1.lang.__('EXECUTION_PLAN_ITEM', {
|
|
79
|
+
action: item.action.toUpperCase(),
|
|
80
|
+
logicalId: item.logicalId,
|
|
81
|
+
resourceType: item.resourceType,
|
|
82
|
+
}));
|
|
74
83
|
});
|
|
75
84
|
common_1.logger.info(lang_1.lang.__('EXECUTING_PLAN'));
|
|
76
85
|
// Execute plans per resource type in a fixed order.
|
|
@@ -59,7 +59,11 @@ const destroyAliyunStack = async (backend) => {
|
|
|
59
59
|
};
|
|
60
60
|
common_1.logger.info(`${lang_1.lang.__('PLAN_GENERATED')}: ${combinedPlan.items.length} ${lang_1.lang.__('ACTIONS')}`);
|
|
61
61
|
combinedPlan.items.forEach((item) => {
|
|
62
|
-
common_1.logger.info(
|
|
62
|
+
common_1.logger.info(lang_1.lang.__('EXECUTION_PLAN_ITEM', {
|
|
63
|
+
action: item.action.toUpperCase(),
|
|
64
|
+
logicalId: item.logicalId,
|
|
65
|
+
resourceType: item.resourceType,
|
|
66
|
+
}));
|
|
63
67
|
});
|
|
64
68
|
// Delete events before functions (events depend on functions)
|
|
65
69
|
const roleArn = (0, common_1.getRoleArnFromState)(state);
|
|
@@ -5,28 +5,29 @@ const types_1 = require("../../types");
|
|
|
5
5
|
const fc3Resource_1 = require("./fc3Resource");
|
|
6
6
|
const common_1 = require("../../common");
|
|
7
7
|
const stateManager_1 = require("../../common/stateManager");
|
|
8
|
+
const lang_1 = require("../../lang");
|
|
8
9
|
const executeCreateAction = async (context, fn, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
10
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
10
11
|
const newState = await (0, fc3Resource_1.createResource)(context, fn, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
12
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'function', name: fn.name }));
|
|
12
13
|
return newState;
|
|
13
14
|
};
|
|
14
15
|
const executeUpdateAction = async (context, fn, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
16
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
16
17
|
const newState = await (0, fc3Resource_1.updateResource)(context, fn, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
18
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'function', name: fn.name }));
|
|
18
19
|
return newState;
|
|
19
20
|
};
|
|
20
21
|
const executeDeleteAction = async (context, functionName, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
22
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'function', name: functionName }));
|
|
22
23
|
const newState = await (0, fc3Resource_1.deleteResource)(context, functionName, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
24
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'function', name: functionName }));
|
|
24
25
|
return newState;
|
|
25
26
|
};
|
|
26
27
|
const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
27
28
|
switch (item.action) {
|
|
28
29
|
case 'noop':
|
|
29
|
-
common_1.logger.info(
|
|
30
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
30
31
|
return null;
|
|
31
32
|
case 'create': {
|
|
32
33
|
const fn = functionsMap.get(item.logicalId);
|
|
@@ -45,14 +46,14 @@ const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
|
45
46
|
case 'delete': {
|
|
46
47
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
47
48
|
if (!state) {
|
|
48
|
-
common_1.logger.warn(
|
|
49
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
49
50
|
return null;
|
|
50
51
|
}
|
|
51
52
|
const functionName = state.definition.functionName;
|
|
52
53
|
return executeDeleteAction(context, functionName, item.logicalId, currentState);
|
|
53
54
|
}
|
|
54
55
|
default:
|
|
55
|
-
common_1.logger.warn(
|
|
56
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
56
57
|
return null;
|
|
57
58
|
}
|
|
58
59
|
};
|