@geek-fun/serverlessinsight 0.8.2 → 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 +327 -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 +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 +216 -124
  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
@@ -206,6 +206,7 @@ exports.zhCN = {
206
206
  FORCE_UNLOCK_WARNING: '\n⚠️ 警告: 强制解锁可能会导致状态损坏,如果另一个操作仍在运行!',
207
207
  FORCE_UNLOCK_CONFIRM: '您确定吗?(yes/no): ',
208
208
  FORCE_UNLOCK_CANCELLED: '强制解锁已取消',
209
+ SAAS_FORCE_UNLOCK_NOT_SUPPORTED: 'SaaS 模式下不支持通过 CLI 强制解锁。请在浏览器中打开 {{consoleUrl}},从部署页面解锁该部署。',
209
210
  PLAN_COMMAND_NOT_SUPPORTED: '此提供商不支持 Plan 命令',
210
211
  // Lock info formatting
211
212
  LOCK_INFO_HEADER: '锁信息:',
@@ -222,6 +223,9 @@ exports.zhCN = {
222
223
  LOCK_TIME_AGO_HOURS: '{{hours}} 小时前',
223
224
  // API Gateway messages
224
225
  APIGW_GROUP_FOUND_REUSING: '找到现有 API 分组:{{groupName}},将复用它',
226
+ APIGW_LOG_ENABLED: '已为 API 网关 {{gatewayId}} 开启访问日志',
227
+ APIGW_LOG_DISABLED: '已为 API 网关 {{gatewayId}} 关闭访问日志',
228
+ APIGW_LOG_DISABLE_FAILED: '关闭 API 网关 {{gatewayId}} 访问日志失败:{{error}}',
225
229
  APIGW_DOMAIN_BINDING_FAILED: '绑定自定义域名失败:{{error}}',
226
230
  APIGW_DOMAIN_UNBIND_FAILED: '解绑域名 {{domain}} 失败:{{error}}',
227
231
  APIGW_WWW_DOMAIN_UNBIND_FAILED: '解绑 www 域名 {{domain}} 失败:{{error}}',
@@ -555,6 +559,7 @@ exports.zhCN = {
555
559
  VOLCENGINE_CREATING_APIGW: '正在创建火山引擎 API 网关 {{gatewayName}}',
556
560
  VOLCENGINE_DELETING_APIGW: '正在删除火山引擎 API 网关 {{gatewayName}}',
557
561
  VOLCENGINE_APIGW_NOT_FOUND: '火山引擎 API 网关 {{gatewayName}} 未找到',
562
+ VOLCENGINE_APIGW_WAITING_RUNNING: '等待 API 网关 {{gatewayName}} 运行中(当前状态:{{status}},第 {{attempt}}/{{maxAttempts}} 次尝试)',
558
563
  // Additional Volcengine-specific messages
559
564
  RESOURCE_STATE_NOT_FOUND: '未找到逻辑 ID 为 {{logicalId}} 的资源状态',
560
565
  RESOURCE_INSTANCE_NOT_FOUND: '未找到逻辑 ID 为 {{logicalId}} 的资源实例',
@@ -575,6 +580,9 @@ exports.zhCN = {
575
580
  UPDATING_FUNCTION_CODE_WITH_TOS: '正在更新函数 {{functionName}} 代码,使用 TOS ({{size}} MB) 到 {{bucket}}/{{key}}',
576
581
  FUNCTION_CODE_UPDATED: '函数 {{functionName}} 代码已更新',
577
582
  FUNCTION_DELETED: '函数 {{functionName}} 已删除',
583
+ FUNCTION_RELEASED: '函数 {{functionId}} 已发布',
584
+ WAITING_FOR_FUNCTION_RELEASE: '等待函数 {{functionId}} 发布完成 (status: {{status}}, attempt {{attempt}}/{{maxAttempts}})...',
585
+ FUNCTION_ALREADY_GONE: '函数 {{functionName}} 已不存在',
578
586
  // TOS Object Storage messages
579
587
  TOS_BUCKET_CREATED: 'TOS 存储桶 {{bucketName}} 创建成功',
580
588
  TOS_BUCKET_DELETED: 'TOS 存储桶 {{bucketName}} 删除成功',
@@ -630,13 +638,16 @@ exports.zhCN = {
630
638
  TLS_PROJECT_CREATED: 'TLS 项目 {{projectName}} 创建成功',
631
639
  TLS_PROJECT_DELETED: 'TLS 项目 {{projectName}} 删除成功',
632
640
  TLS_PROJECT_NOT_FOUND: 'TLS 项目 {{projectName}} 未找到',
641
+ TLS_PROJECT_ALREADY_EXISTS: 'TLS 项目 {{projectName}} 已存在,复用现有项目',
633
642
  TLS_PROJECT_TIMEOUT: '等待 TLS 项目 {{projectName}} 就绪超时',
634
643
  TLS_TOPIC_CREATED: 'TLS 主题 {{topicName}} 创建成功',
635
644
  TLS_TOPIC_DELETED: 'TLS 主题 {{topicName}} 删除成功',
636
645
  TLS_TOPIC_NOT_FOUND: 'TLS 主题 {{topicName}} 未找到',
646
+ TLS_TOPIC_ALREADY_EXISTS: 'TLS 主题 {{topicName}} 已存在,复用现有主题',
637
647
  TLS_TOPIC_TIMEOUT: '等待 TLS 主题 {{topicName}} 就绪超时',
638
648
  TLS_INDEX_CREATED: 'TLS 主题 {{topicName}} 索引创建成功',
639
649
  TLS_INDEX_DELETED: 'TLS 主题 {{topicName}} 索引删除成功',
650
+ TLS_INDEX_ALREADY_EXISTS: 'TLS 主题 {{topicName}} 索引已存在,跳过创建',
640
651
  TLS_PROJECT_FAILED: 'TLS 项目 {{projectName}} 创建失败',
641
652
  TLS_TOPIC_FAILED: 'TLS 主题 {{topicName}} 创建失败',
642
653
  CREATING_TLS_PROJECT: '正在创建 TLS 项目:{{projectName}}',
@@ -675,4 +686,77 @@ exports.zhCN = {
675
686
  COS_BUCKET_POLICY_DELETED: 'COS 存储桶 {{bucketName}} 策略已删除',
676
687
  TOS_BUCKET_POLICY_SET: 'TOS 存储桶 {{bucketName}} 策略已设置',
677
688
  TOS_BUCKET_POLICY_DELETED: 'TOS 存储桶 {{bucketName}} 策略已删除',
689
+ // Auth / Login / Logout / Whoami 消息
690
+ LOGIN_ALREADY_LOGGED_IN: '已登录为 {{userEmail}}(组织: {{orgName}})。重新认证?[y/N]',
691
+ LOGIN_REVOKING_OLD_KEY: '正在撤销旧的 API 密钥...',
692
+ LOGIN_CHOOSE_METHOD: '请选择认证方式:',
693
+ LOGIN_OPTION_BROWSER: '通过 Web 控制台登录(打开浏览器)',
694
+ LOGIN_OPTION_API_KEY: '输入 API 密钥(粘贴已有密钥)',
695
+ LOGIN_SELECT_CHOICE: '请输入选项 (1):',
696
+ LOGIN_ENTER_API_KEY: '请输入您的 API 密钥:',
697
+ LOGIN_VALIDATING_KEY: '正在验证 API 密钥...',
698
+ LOGIN_KEY_INVALID: '无效的 API 密钥,请检查后重试。',
699
+ LOGIN_KEY_FORMAT_INVALID: 'API 密钥格式无效。格式应为:si_<prefix>_<secret>',
700
+ LOGIN_STARTING_SERVER: '正在启动本地服务器以接收认证回调...',
701
+ LOGIN_OPENING_BROWSER: '正在打开浏览器进行控制台授权...',
702
+ LOGIN_BROWSER_UNAVAILABLE: '无法自动打开浏览器。\n请手动在浏览器中访问以下地址:\n{{url}}',
703
+ LOGIN_SERVER_DONE: '已收到授权,正在完成登录...',
704
+ LOGIN_SUCCESS: '✅ 已登录为 {{userEmail}} · 组织: {{orgName}}',
705
+ LOGIN_SUCCESS_KEY: '✅ 已通过 API 密钥认证 · 组织: {{orgName}}',
706
+ LOGIN_TIMEOUT: '登录超时,请重试。',
707
+ LOGIN_SERVER_ERROR: '登录服务器错误:{{error}}',
708
+ LOGIN_CANCELLED: '登录已取消。',
709
+ LOGOUT_REVOKING: '正在撤销 API 密钥...',
710
+ LOGOUT_DELETING_CREDENTIALS: '正在删除存储的凭证...',
711
+ LOGOUT_SUCCESS: '✅ 已退出登录',
712
+ LOGOUT_NOT_LOGGED_IN: '尚未登录。',
713
+ LOGOUT_REVOKE_FAILED: '撤销 API 密钥失败:{{error}}',
714
+ WHOAMI_LOGGED_IN: '已登录为 {{userEmail}}',
715
+ WHOAMI_ORG: '组织: {{orgName}}',
716
+ WHOAMI_CONSOLE: '控制台: {{url}}',
717
+ WHOAMI_API_KEY: 'API 密钥: {{keyPrefix}}...',
718
+ WHOAMI_NOT_LOGGED_IN: '尚未登录。请运行 `si login` 进行认证。',
719
+ WHOAMI_KEY_ACTIVE: '活跃',
720
+ // 凭证消息
721
+ CREDENTIAL_NOT_FOUND: '未找到凭证。',
722
+ CREDENTIAL_CORRUPTED: '凭证文件已损坏,请重新运行 `si login`。',
723
+ CREDENTIAL_FILE_PERMISSION: '警告:credentials.json 权限为 {{perms}},建议设置为 0600',
724
+ CREDENTIAL_KEY_EXPIRED: '存储的 API 密钥已过期,请重新运行 `si login`。',
725
+ CREDENTIAL_KEY_REVOKED: 'API 密钥已被撤销。请运行 `si login` 或更新 SI_API_KEY。',
726
+ CREDENTIAL_KEY_DISABLED: 'API 密钥已被管理员禁用。请联系您的管理员。',
727
+ CREDENTIAL_NETWORK_ERROR: '无法连接到控制台,请检查网络连接。',
728
+ CREDENTIAL_KEY_SCOPE: 'API 密钥没有服务 {{service}} 的 {{permission}} 权限',
729
+ // SaaS 后端消息
730
+ SAAS_BACKEND_LOADING_STATE: '正在从控制台加载状态...',
731
+ SAAS_BACKEND_SAVING_STATE: '正在保存状态到控制台...',
732
+ SAAS_BACKEND_DEPLOYMENT_STARTED: '正在控制台启动部署...',
733
+ SAAS_BACKEND_DEPLOYMENT_EVENT: '部署事件:{{logicalId}} {{action}} {{status}}',
734
+ SAAS_BACKEND_DEPLOYMENT_COMPLETE: '部署已在控制台完成。',
735
+ SAAS_BACKEND_DEPLOYMENT_FAILED: '部署在控制台失败:{{error}}',
736
+ SAAS_BACKEND_LOCK_CHECK: '正在检查部署锁状态...',
737
+ SAAS_BACKEND_NO_CREDENTIALS: 'SaaS 状态后端需要登录 Console。\n请运行 `si login`,或:\n- 设置 SI_API_KEY 环境变量\n- 使用 --si-api-key 参数\n- 在 serverlessinsight.yml 中配置本地或存储桶后端',
738
+ SAAS_BACKEND_CONSOLE_UNREACHABLE: '无法连接到控制台。部署需要控制台连接。',
739
+ // API 错误消息
740
+ API_ERROR_401: 'API 密钥无效或已过期,请运行 `si login` 更新。',
741
+ API_ERROR_403: '访问被拒绝,请联系管理员。',
742
+ API_ERROR_409: '状态冲突:{{message}}',
743
+ API_ERROR_NETWORK: '网络错误:{{message}}。请检查网络连接。',
744
+ API_ERROR_UNKNOWN: 'API 错误 ({{status}}):{{message}}',
745
+ // HTTP trigger messages
746
+ HTTP_TRIGGER_AUTH_TYPE_REQUIRED: "HTTP 触发器 '{{functionName}}' 需要设置 'auth_type'(public 或 iam)",
747
+ CREATING_HTTP_TRIGGER: "正在为函数 '{{functionName}}' 创建 HTTP 触发器 '{{triggerName}}'...",
748
+ HTTP_TRIGGER_CREATED: "HTTP 触发器 '{{triggerName}}' 已为函数 '{{functionName}}' 创建成功",
749
+ UPDATING_HTTP_TRIGGER: "正在重新创建函数 '{{functionName}}' 的 HTTP 触发器...",
750
+ DELETING_HTTP_TRIGGER: "正在删除函数 '{{functionName}}' 的 HTTP 触发器 '{{triggerName}}'...",
751
+ HTTP_TRIGGER_DELETED: "HTTP 触发器 '{{triggerName}}' 已删除",
752
+ HTTP_TRIGGER_NOT_FOUND: "HTTP 触发器 '{{triggerName}}' 在云平台中不存在,跳过删除",
753
+ CREATING_CUSTOM_DOMAIN: "正在创建自定义域名 '{{domainName}}'...",
754
+ CUSTOM_DOMAIN_CREATED: "自定义域名 '{{domainName}}' 已创建",
755
+ UPDATING_CUSTOM_DOMAIN: "正在更新自定义域名 '{{domainName}}'...",
756
+ DELETING_CUSTOM_DOMAIN: "正在删除自定义域名 '{{domainName}}'...",
757
+ CUSTOM_DOMAIN_DELETED: "自定义域名 '{{domainName}}' 已删除",
758
+ DOMAIN_NOT_SUPPORTED_PROVIDER: "当前云平台 '{{provider}}' 不支持自定义域名",
759
+ EVENT_FLUSH_FAILED: '部署事件冲刷失败(部署 {{deploymentId}},{{count}} 条):{{error}}',
760
+ EVENT_REPLAY_FAILED: '事件队列文件 {{file}} 重放失败:{{error}}',
761
+ INVALID_HTTP_TRIGGER_AUTH_TYPE: "无效的 HTTP 触发器 auth_type '{{authType}}',必须为 'public' 或 'iam'",
678
762
  };
@@ -11,6 +11,8 @@ const parseEvent = (events) => {
11
11
  name: event.name,
12
12
  type: event.type,
13
13
  triggers: event.triggers?.map((trigger) => ({ ...trigger, method: trigger.method ?? 'GET' })),
14
+ network: event.network,
15
+ log: (0, parseUtils_1.parseBooleanWithDefault)(event.log, false),
14
16
  domain: event.domain
15
17
  ? {
16
18
  ...event.domain,
@@ -3,74 +3,105 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseFunction = void 0;
4
4
  const lodash_1 = require("lodash");
5
5
  const parseUtils_1 = require("./parseUtils");
6
+ const lang_1 = require("../lang");
7
+ const parseHttpTrigger = (raw, fnKey) => {
8
+ if (!raw)
9
+ return undefined;
10
+ if (!raw.auth_type) {
11
+ throw new Error(lang_1.lang.__('HTTP_TRIGGER_AUTH_TYPE_REQUIRED', { functionName: fnKey }));
12
+ }
13
+ const authType = String(raw.auth_type);
14
+ if (authType !== 'public' && authType !== 'iam') {
15
+ throw new Error(lang_1.lang.__('INVALID_HTTP_TRIGGER_AUTH_TYPE', { authType }));
16
+ }
17
+ return {
18
+ auth_type: authType,
19
+ access: raw.access?.map(String),
20
+ };
21
+ };
22
+ const parseDomain = (raw) => {
23
+ if (!raw)
24
+ return undefined;
25
+ return {
26
+ domain_name: String(raw.domain_name),
27
+ certificate_id: raw.certificate_id ? String(raw.certificate_id) : undefined,
28
+ protocol: (0, parseUtils_1.parseStringWithDefault)(raw.protocol, 'HTTPS'),
29
+ };
30
+ };
6
31
  const parseFunction = (functions) => {
7
32
  if ((0, lodash_1.isEmpty)(functions)) {
8
33
  return undefined;
9
34
  }
10
- return Object.entries(functions).map(([key, func]) => ({
11
- key,
12
- name: func.name,
13
- code: func.code
14
- ? {
15
- runtime: String(func.code.runtime),
16
- handler: func.code.handler,
17
- path: func.code.path,
18
- }
19
- : undefined,
20
- container: func.container
21
- ? {
22
- image: func.container.image,
23
- cmd: func.container.cmd,
24
- port: (0, parseUtils_1.parseNumberWithDefault)(func.container.port, 0),
25
- }
26
- : undefined,
27
- memory: (0, parseUtils_1.parseNumber)(func.memory),
28
- gpu: func.gpu,
29
- timeout: (0, parseUtils_1.parseNumber)(func.timeout),
30
- iam: func.iam
31
- ? {
32
- role: func.iam.role !== undefined
33
- ? typeof func.iam.role === 'string'
34
- ? func.iam.role
35
- : {
36
- ...(func.iam.role.name !== undefined
37
- ? { name: String(func.iam.role.name) }
38
- : {}),
39
- ...(func.iam.role.managed_policies !== undefined
40
- ? { managed_policies: func.iam.role.managed_policies.map(String) }
41
- : {}),
42
- ...(func.iam.role.statements !== undefined
43
- ? {
44
- statements: func.iam.role.statements.map((s) => {
45
- const rawAction = s.action;
46
- const rawResource = s.resource;
47
- return {
48
- sid: s.sid,
49
- effect: s.effect,
50
- action: Array.isArray(rawAction)
51
- ? rawAction.map(String)
52
- : [String(rawAction)],
53
- resource: Array.isArray(rawResource)
54
- ? rawResource.map(String)
55
- : [String(rawResource)],
56
- };
57
- }),
58
- }
59
- : {}),
60
- }
61
- : undefined,
62
- }
63
- : undefined,
64
- environment: func.environment,
65
- log: (0, parseUtils_1.parseBoolean)(func.log),
66
- network: func.network,
67
- storage: {
68
- disk: (0, parseUtils_1.parseNumber)(func.storage?.disk),
69
- nas: func.storage?.nas?.map((nasItem) => ({
70
- mount_path: nasItem.mount_path,
71
- storage_class: nasItem.storage_class,
72
- })),
73
- },
74
- }));
35
+ return Object.entries(functions).map(([key, func]) => {
36
+ const httpTrigger = parseHttpTrigger(func.triggers?.http, key);
37
+ const domain = parseDomain(func.domain);
38
+ return {
39
+ key,
40
+ name: func.name,
41
+ code: func.code
42
+ ? {
43
+ runtime: String(func.code.runtime),
44
+ handler: func.code.handler,
45
+ path: func.code.path,
46
+ }
47
+ : undefined,
48
+ container: func.container
49
+ ? {
50
+ image: func.container.image,
51
+ cmd: func.container.cmd,
52
+ port: (0, parseUtils_1.parseNumberWithDefault)(func.container.port, 0),
53
+ }
54
+ : undefined,
55
+ memory: (0, parseUtils_1.parseNumber)(func.memory),
56
+ gpu: func.gpu,
57
+ timeout: (0, parseUtils_1.parseNumber)(func.timeout),
58
+ iam: func.iam
59
+ ? {
60
+ role: func.iam.role !== undefined
61
+ ? typeof func.iam.role === 'string'
62
+ ? func.iam.role
63
+ : {
64
+ ...(func.iam.role.name !== undefined
65
+ ? { name: String(func.iam.role.name) }
66
+ : {}),
67
+ ...(func.iam.role.managed_policies !== undefined
68
+ ? { managed_policies: func.iam.role.managed_policies.map(String) }
69
+ : {}),
70
+ ...(func.iam.role.statements !== undefined
71
+ ? {
72
+ statements: func.iam.role.statements.map((s) => {
73
+ const rawAction = s.action;
74
+ const rawResource = s.resource;
75
+ return {
76
+ sid: s.sid,
77
+ effect: s.effect,
78
+ action: Array.isArray(rawAction)
79
+ ? rawAction.map(String)
80
+ : [String(rawAction)],
81
+ resource: Array.isArray(rawResource)
82
+ ? rawResource.map(String)
83
+ : [String(rawResource)],
84
+ };
85
+ }),
86
+ }
87
+ : {}),
88
+ }
89
+ : undefined,
90
+ }
91
+ : undefined,
92
+ environment: func.environment,
93
+ log: (0, parseUtils_1.parseBoolean)(func.log),
94
+ network: func.network,
95
+ storage: {
96
+ disk: (0, parseUtils_1.parseNumber)(func.storage?.disk),
97
+ nas: func.storage?.nas?.map((nasItem) => ({
98
+ mount_path: nasItem.mount_path,
99
+ storage_class: nasItem.storage_class,
100
+ })),
101
+ },
102
+ ...(httpTrigger ? { triggers: { http: httpTrigger } } : {}),
103
+ ...(domain ? { domain } : {}),
104
+ };
105
+ });
75
106
  };
76
107
  exports.parseFunction = parseFunction;
@@ -18,11 +18,11 @@ const validateExistence = (path) => {
18
18
  }
19
19
  };
20
20
  const parseBackend = (raw) => {
21
- if (!raw)
22
- return undefined;
21
+ // No backend config → default to SAAS
22
+ if (!raw || !raw.state_manager) {
23
+ return { type: types_1.StateBackendType.SAAS };
24
+ }
23
25
  const stateManager = raw.state_manager;
24
- if (!stateManager)
25
- return undefined;
26
26
  const type = stateManager.type?.toUpperCase();
27
27
  if (type === types_1.StateBackendType.BUCKET_STORE) {
28
28
  if (!stateManager.bucket || !stateManager.key) {
@@ -34,6 +34,9 @@ const parseBackend = (raw) => {
34
34
  key: stateManager.key,
35
35
  };
36
36
  }
37
+ if (type === types_1.StateBackendType.SAAS) {
38
+ return { type: types_1.StateBackendType.SAAS };
39
+ }
37
40
  return { type: types_1.StateBackendType.LOCAL };
38
41
  };
39
42
  const transformYaml = (iacJson, stage) => {
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.executeApigwPlan = void 0;
4
+ const types_1 = require("../../types");
4
5
  const apigwResource_1 = require("./apigwResource");
5
6
  const common_1 = require("../../common");
7
+ const reportResourceEvent_1 = require("../../common/reportResourceEvent");
6
8
  const stateManager_1 = require("../../common/stateManager");
7
9
  const lang_1 = require("../../lang");
8
10
  const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn, currentState) => {
@@ -60,13 +62,26 @@ const executeApigwPlan = async (context, plan, events, serviceName, roleArn, ini
60
62
  const successfulItems = [];
61
63
  let currentState = initialState;
62
64
  for (const item of plan.items) {
65
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
66
+ type: 'resource_pre',
67
+ logicalId: item.logicalId,
68
+ resourceType: item.resourceType,
69
+ action: item.action,
70
+ ...(item.drifted ? { message: 'resource drifted' } : {}),
71
+ });
72
+ const __siStartedAt = Date.now();
63
73
  try {
64
74
  const newState = await executeSingleItem(context, item, eventsMap, serviceName, roleArn, currentState);
65
75
  if (newState !== null) {
66
76
  currentState = newState;
67
77
  successfulItems.push(item);
78
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
79
+ type: 'resource_complete',
80
+ logicalId: item.logicalId,
81
+ durationMs: Date.now() - __siStartedAt,
82
+ });
68
83
  if (onStateChange) {
69
- onStateChange(currentState);
84
+ await onStateChange(currentState);
70
85
  common_1.logger.debug(lang_1.lang.__('STATE_PERSISTED_AFTER_OPERATION', {
71
86
  action: item.action,
72
87
  resourceId: item.logicalId,
@@ -75,6 +90,29 @@ const executeApigwPlan = async (context, plan, events, serviceName, roleArn, ini
75
90
  }
76
91
  }
77
92
  catch (error) {
93
+ (0, reportResourceEvent_1.reportResourceEvent)(context, {
94
+ type: 'resource_failed',
95
+ logicalId: item.logicalId,
96
+ severity: 'error',
97
+ durationMs: Date.now() - __siStartedAt,
98
+ error: {
99
+ message: error instanceof Error ? error.message : String(error),
100
+ },
101
+ });
102
+ if (error instanceof types_1.PartialResourceError) {
103
+ const updatedState = error.updatedState;
104
+ if (onStateChange) {
105
+ await onStateChange(updatedState);
106
+ }
107
+ return {
108
+ state: updatedState,
109
+ partialFailure: {
110
+ failedItem: item,
111
+ error: error.cause,
112
+ successfulItems,
113
+ },
114
+ };
115
+ }
78
116
  return {
79
117
  state: currentState,
80
118
  partialFailure: {
@@ -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) => ({
@@ -42,13 +43,19 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
42
43
  })),
43
44
  domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
44
45
  };
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
46
+ if (!currentState || currentState.status === 'tainted') {
47
+ // No usable local state: probe the provider before planning create.
48
+ // If a same-named group already exists WITHOUT our ownership tag it
49
+ // may belong to another project — fail fast in the plan instead of
50
+ // letting the executor discover it mid-deploy.
51
+ const remoteGroup = await client.apigw.findApiGroupByName(groupConfig.groupName);
52
+ if (remoteGroup?.groupId) {
53
+ if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, remoteGroup.tags)) {
54
+ 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.`);
55
+ }
56
+ if (!currentState) {
57
+ // Resource exists remotely (and is ours) but not in state — drift:
58
+ // import it via update rather than trying to create it again.
52
59
  return {
53
60
  logicalId,
54
61
  action: 'update',
@@ -58,9 +65,6 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
58
65
  };
59
66
  }
60
67
  }
61
- catch {
62
- // Ignore errors when checking remote
63
- }
64
68
  return {
65
69
  logicalId,
66
70
  action: 'create',