@geek-fun/serverlessinsight 0.8.9 → 0.9.1
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/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +1 -1
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +123 -0
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +4 -4
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +93 -0
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +148 -0
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/CHANGELOG.md +29 -0
- package/README.md +2 -2
- package/README.zh-CN.md +2 -2
- package/dist/package.json +2 -2
- package/dist/src/commands/deploy.js +12 -4
- package/dist/src/commands/destroy.js +8 -2
- package/dist/src/commands/forceUnlock.js +5 -5
- package/dist/src/commands/index.js +114 -53
- package/dist/src/commands/login.js +12 -1
- package/dist/src/commands/migrate.js +287 -0
- package/dist/src/commands/plan.js +7 -1
- package/dist/src/commands/show.js +37 -25
- package/dist/src/common/aliyunClient/apigwOperations.js +4 -4
- package/dist/src/common/aliyunClient/ecsOperations.js +22 -13
- package/dist/src/common/aliyunClient/fc3Operations.js +12 -3
- package/dist/src/common/aliyunClient/nasOperations.js +4 -3
- package/dist/src/common/aliyunClient/ossOperations.js +52 -8
- package/dist/src/common/aliyunClient/slsOperations.js +3 -2
- package/dist/src/common/aliyunClient/tablestoreOperations.js +22 -11
- package/dist/src/common/apiClient.js +22 -5
- package/dist/src/common/context.js +5 -4
- package/dist/src/common/lockManager.js +1 -1
- package/dist/src/common/migrationMarker.js +34 -0
- package/dist/src/common/nameBuilder.js +13 -1
- package/dist/src/common/planCompare.js +31 -1
- package/dist/src/common/planFormatter.js +69 -54
- package/dist/src/common/refreshPlanner.js +31 -8
- package/dist/src/common/runtimeMapper.js +7 -3
- package/dist/src/common/stateBackend/cosStateBackend.js +1 -1
- package/dist/src/common/stateBackend/index.js +5 -2
- package/dist/src/common/stateBackend/localStateBackend.js +8 -2
- package/dist/src/common/stateBackend/ossStateBackend.js +1 -1
- package/dist/src/common/stateBackend/remoteStateBackend.js +19 -2
- package/dist/src/common/stateBackend/saasStateBackend.js +83 -5
- package/dist/src/common/stateManager.js +56 -5
- package/dist/src/common/tencentClient/cosOperations.js +1 -1
- package/dist/src/common/tencentClient/scfOperations.js +2 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +2 -2
- package/dist/src/common/volcengineClient/index.js +6 -2
- package/dist/src/common/volcengineClient/vefaasOperations.js +3 -3
- package/dist/src/lang/en.js +231 -7
- package/dist/src/lang/zh-CN.js +230 -7
- package/dist/src/parser/index.js +1 -1
- package/dist/src/stack/aliyunStack/apigwExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/apigwPlanner.js +26 -5
- package/dist/src/stack/aliyunStack/apigwResource.js +22 -10
- package/dist/src/stack/aliyunStack/databaseExecutor.js +5 -5
- package/dist/src/stack/aliyunStack/databasePlanner.js +8 -3
- package/dist/src/stack/aliyunStack/databaseResource.js +28 -12
- package/dist/src/stack/aliyunStack/deployer.js +30 -13
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/aliyunStack/fc3Executor.js +2 -2
- package/dist/src/stack/aliyunStack/fc3Planner.js +46 -25
- package/dist/src/stack/aliyunStack/fc3Resource.js +80 -31
- package/dist/src/stack/aliyunStack/ossExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/ossPlanner.js +6 -1
- package/dist/src/stack/aliyunStack/ossResource.js +14 -3
- package/dist/src/stack/aliyunStack/rdsTypes.js +5 -1
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/tablestorePlanner.js +2 -1
- package/dist/src/stack/aliyunStack/tablestoreResource.js +5 -4
- package/dist/src/stack/aliyunStack/tablestoreTypes.js +3 -2
- package/dist/src/stack/deploy.js +12 -7
- package/dist/src/stack/localStack/functionRunner.js +5 -4
- package/dist/src/stack/scfStack/cosExecutor.js +2 -2
- package/dist/src/stack/scfStack/cosPlanner.js +6 -1
- package/dist/src/stack/scfStack/cosResource.js +8 -4
- package/dist/src/stack/scfStack/deployer.js +21 -6
- package/dist/src/stack/scfStack/esServerlessExecutor.js +5 -5
- package/dist/src/stack/scfStack/esServerlessPlanner.js +6 -1
- package/dist/src/stack/scfStack/esServerlessResource.js +12 -4
- package/dist/src/stack/scfStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/scfStack/scfExecutor.js +2 -2
- package/dist/src/stack/scfStack/scfPlanner.js +26 -27
- package/dist/src/stack/scfStack/scfResource.js +38 -13
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +5 -5
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +6 -1
- package/dist/src/stack/scfStack/tdsqlcResource.js +12 -4
- package/dist/src/stack/volcengineStack/apigwExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/apigwPlanner.js +5 -1
- package/dist/src/stack/volcengineStack/apigwResource.js +7 -4
- package/dist/src/stack/volcengineStack/deployer.js +15 -4
- package/dist/src/stack/volcengineStack/tosExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/tosPlanner.js +6 -1
- package/dist/src/stack/volcengineStack/tosResource.js +11 -4
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +39 -11
- package/dist/src/stack/volcengineStack/vefaasResource.js +11 -3
- package/dist/src/validator/rootSchema.js +29 -2
- package/dist/src/validator/semanticValidation.js +24 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/src/lang/zh-CN.js
CHANGED
|
@@ -109,17 +109,29 @@ exports.zhCN = {
|
|
|
109
109
|
PLAN_WILL_CREATE: '将被创建',
|
|
110
110
|
PLAN_WILL_UPDATE: '将就地更新',
|
|
111
111
|
PLAN_WILL_DESTROY: '将被销毁',
|
|
112
|
-
|
|
112
|
+
PLAN_WILL_RECREATE: '将被重建',
|
|
113
113
|
PLAN_NO_CHANGES: '无变更',
|
|
114
114
|
PLAN_HEADER: 'ServerlessInsight 将执行以下操作:',
|
|
115
|
-
|
|
116
|
-
PLAN_LEGEND_UPDATE: ' ~ 就地更新',
|
|
117
|
-
PLAN_LEGEND_DESTROY: ' - 销毁',
|
|
118
|
-
PLAN_SUMMARY: '计划: 新增 {{createCount}} 个,变更 {{updateCount}} 个,销毁 {{deleteCount}} 个。',
|
|
115
|
+
PLAN_SUMMARY: '计划: 新增 {{addCount}},变更 {{modifyCount}},移除 {{removeCount}},重建 {{recreateCount}},无变更 {{unchangedCount}}。',
|
|
119
116
|
PLAN_UNCHANGED_ATTRS: '({{count}} 个未变更属性已隐藏)',
|
|
120
117
|
PLAN_COMPUTED_VALUE: '(部署后可知)',
|
|
118
|
+
PLAN_REVERT_ANNOTATION: '(云端已改,将按配置恢复)',
|
|
121
119
|
PLAN_DRIFTED_MARKER: '(云端已漂移——与本配置不一致,将按配置纠正)',
|
|
122
|
-
|
|
120
|
+
PLAN_LIVE_READ_FAILED: '读取 {{logicalId}} 云端状态失败,降级为创建计划: {{error}}',
|
|
121
|
+
PLAN_DRIFT_ROLE_MISSING: '云端 IAM 角色缺失',
|
|
122
|
+
PLAN_DRIFT_ROLE_POLICY: '云端 IAM 角色策略被修改',
|
|
123
|
+
PLAN_DRIFT_LOGSTORE: '云端函数日志资源被修改',
|
|
124
|
+
PLAN_DRIFT_SG_RULES: '云端安全组规则被修改',
|
|
125
|
+
PLAN_DRIFT_NAS_MOUNT: '云端 NAS 挂载点被删除',
|
|
126
|
+
PLAN_DRIFT_TLS_TOPIC: '云端日志主题配置被修改',
|
|
127
|
+
PLAN_DRIFT_CLS_TOPIC: '云端日志主题配置被修改',
|
|
128
|
+
PLAN_DRIFT_TRIGGERS: '云端 API 触发器被修改',
|
|
129
|
+
RESOURCE_EXISTS_NOT_OWNED: '{{resourceType}} {{resourceName}} 已存在于云端但归属本 stack(缺少 {{tagKey}} 标签),拒绝创建——请手动处理。',
|
|
130
|
+
RESOURCE_EXISTS_NOT_OWNED_ADOPT: '{{resourceType}} {{resourceName}} 已存在于云端但归属本 stack(缺少 {{tagKey}} 标签),拒绝收养——请手动处理。',
|
|
131
|
+
TABLESTORE_EXISTS_UNVERIFIABLE: '表 {{tableName}} 已存在于云端但无法校验归属(Tablestore 不支持表级标签),拒绝收养——请手动处理。',
|
|
132
|
+
TABLESTORE_EXISTS_UNVERIFIABLE_PROBE: '表 {{tableName}} 已存在于云端但无法校验归属(无表级标签),拒绝收养——请手动处理。',
|
|
133
|
+
TAINTED_RECOVERY_SKIP_CREATE: '{{resourceType}} {{resourceName}} 已存在(tainted 恢复),跳过创建并刷新状态',
|
|
134
|
+
OWNERSHIP_VERIFYING: '{{resourceType}} {{resourceName}} 已存在,正在校验归属标签后收养',
|
|
123
135
|
// TDSQL-C 数据库消息
|
|
124
136
|
TDSQL_CLUSTER_CREATION_INITIATED: 'TDSQL-C 集群创建已启动',
|
|
125
137
|
TDSQL_CLUSTER_CREATION_FAILED: '创建 TDSQL-C 集群失败',
|
|
@@ -313,7 +325,9 @@ exports.zhCN = {
|
|
|
313
325
|
'DNS CNAME 配置后,请在 OSS 控制台注册 {{domain}}: ' +
|
|
314
326
|
'https://oss.console.aliyun.com/bucket/oss-{{region}}/{{bucket}}/domain/cname',
|
|
315
327
|
OSS_BUCKET_CNAME_BOUND: '已绑定自定义域名到存储桶: {{domain}}',
|
|
316
|
-
OSS_BUCKET_CNAME_EXISTS: '
|
|
328
|
+
OSS_BUCKET_CNAME_EXISTS: '自定义域名已绑定到存储桶(经 ListCname 核实): {{domain}}',
|
|
329
|
+
OSS_BUCKET_CNAME_CONFLICT: '绑定自定义域名 {{domain}} 到存储桶 {{bucketName}} 失败: 该域名已绑定到其他存储桶或被用作图片处理域名({{error}})。' +
|
|
330
|
+
'请先解除冲突的绑定后重试。',
|
|
317
331
|
OSS_BUCKET_CNAME_UNBOUND: '已解绑存储桶自定义域名: {{domain}}',
|
|
318
332
|
OSS_BUCKET_CNAME_BIND_FAILED: '绑定存储桶 CNAME 失败: {{error}}',
|
|
319
333
|
OSS_BUCKET_CNAME_UNBIND_FAILED: '解绑存储桶 CNAME 失败: {{error}}',
|
|
@@ -423,6 +437,8 @@ exports.zhCN = {
|
|
|
423
437
|
// Pre-deploy semantic validation (issue #222)
|
|
424
438
|
PARSE_BACKEND_BUCKET_STORE_FIELDS_REQUIRED: '后端类型 BUCKET_STORE 需要同时提供 "bucket" 和 "key" 字段',
|
|
425
439
|
SEMANTIC_DUPLICATE_TRIGGER: '事件 "{{eventKey}}" 中存在重复触发器: {{method}} {{path}} 定义了不止一次',
|
|
440
|
+
SEMANTIC_CONTAINER_CODE_CONFLICT: '函数 "{{fnKey}}" 不能同时定义 "container" 与 "code"——两者互斥',
|
|
441
|
+
SEMANTIC_FUNCTION_SOURCE_REQUIRED: '函数 "{{fnKey}}" 必须定义 "code" 或 "container" 之一',
|
|
426
442
|
SEMANTIC_DUPLICATE_GENERATED_API_NAME: '生成的 API Gateway apiName "{{apiName}}" 在 "{{firstPath}}" 与 "{{secondPath}}" 之间发生冲突;请缩短事件名称或区分触发器的 method/path',
|
|
427
443
|
SEMANTIC_DUPLICATE_ROUTE_NAME: '生成的 API Gateway route name "{{routeName}}" 在 "{{firstPath}}" 与 "{{secondPath}}" 之间发生冲突;请缩短事件名称或区分触发器的 method/path',
|
|
428
444
|
SEMANTIC_UNRESOLVED_FUNCTION_BACKEND: '事件 "{{eventKey}}" 的触发器后端 "{{reference}}" 未匹配到配置中的任何函数定义',
|
|
@@ -786,12 +802,55 @@ exports.zhCN = {
|
|
|
786
802
|
SAAS_BACKEND_LOCK_CHECK: '正在检查部署锁状态...',
|
|
787
803
|
SAAS_BACKEND_NO_CREDENTIALS: 'SaaS 状态后端需要登录 Console。\n请运行 `si login`,或:\n- 设置 SI_API_KEY 环境变量\n- 使用 --si-api-key 参数\n- 在 serverlessinsight.yml 中配置本地或存储桶后端',
|
|
788
804
|
SAAS_BACKEND_CONSOLE_UNREACHABLE: '无法连接到控制台。部署需要控制台连接。',
|
|
805
|
+
SAAS_ORG_MISMATCH: 'YAML 声明的 org "{{declared}}" 与当前 API key 所属的 org "{{actual}}" 不一致。\n请确认使用的凭据(可运行 `si login` 重新登录,或修正 YAML 中的 org 声明)。未写入任何数据。',
|
|
806
|
+
SAAS_ORG_FROM_CREDENTIALS: '目标 org:{{orgName}}(来自凭据;可在 YAML 顶层声明 org 以显式固定目标组织)',
|
|
807
|
+
SAAS_STATE_ORG_MISMATCH: 'state 记录的归属 org({{stateOrgId}})与当前凭据所属 org({{keyOrgId}})不一致——可能是拿错了 API key,或该组织被删除后以同名重建。\n请核对凭据(`si login`)或组织状态后再试;未写入任何数据。',
|
|
789
808
|
// API 错误消息
|
|
790
809
|
API_ERROR_401: 'API 密钥无效或已过期,请运行 `si login` 更新。',
|
|
791
810
|
API_ERROR_403: '访问被拒绝,请联系管理员。',
|
|
811
|
+
API_ERROR_404: '资源不存在。如果预期存在状态,请检查 app/service/stage 名称。',
|
|
792
812
|
API_ERROR_409: '状态冲突:{{message}}',
|
|
793
813
|
API_ERROR_NETWORK: '网络错误:{{message}}。请检查网络连接。',
|
|
794
814
|
API_ERROR_UNKNOWN: 'API 错误 ({{status}}):{{message}}',
|
|
815
|
+
// ===== `si migrate`——旧 state 迁移到 Console(docs/state-migration-saas.md)=====
|
|
816
|
+
CMD_MIGRATE_DESC: '将 local/bucket 状态迁移到 Console(一次性操作;请先升级所有写入者的 CLI)',
|
|
817
|
+
OPT_FORCE: '即使目标 stage 在 Console 已有状态,也作为新版本导入(保留历史)',
|
|
818
|
+
OPT_NO_MARKER: '不在旧 state 中写入迁移标记(不推荐:cutover 完成前旧后端仍可写入)',
|
|
819
|
+
OPT_DRY_RUN: '仅展示迁移映射与影响,不写任何一端',
|
|
820
|
+
OPT_ROLLBACK: '清除旧 state 中的迁移标记(显式回退)',
|
|
821
|
+
MIGRATE_NO_BACKEND_SOURCE: '没有可迁移的旧状态:该 stack 未配置 backend.state_manager(默认已走 Console),或已显式配置为 SAAS。',
|
|
822
|
+
MIGRATE_NEED_CREDENTIALS: '需要 Console 凭据。请先运行 `si login`,或传入 --si-api-key。',
|
|
823
|
+
MIGRATE_PREFLIGHT_OK: 'Console 身份确认:org {{orgName}}({{orgId}})',
|
|
824
|
+
MIGRATE_WRITER_CONFIRMATION: '所有写入者(全部 CI 镜像与同事本机)是否都已升级到本版 CLI?旧版 CLI 无法识别迁移标记。确认后继续 (y/N)',
|
|
825
|
+
MIGRATE_CONFIRMATION: '按上述计划执行迁移?(y/N)',
|
|
826
|
+
MIGRATE_DRY_RUN_NOTICE: 'Dry run——未写任何一端(未上传 Console,未写标记)。',
|
|
827
|
+
MIGRATE_TARGETS_HEADER: '迁移目标(org:{{orgName}})——已存在的目标按名称映射,其余将自动创建:',
|
|
828
|
+
MIGRATE_TARGET_APP_EXISTS: ' app "{{app}}" → 已存在,按名映射({{appId}})',
|
|
829
|
+
MIGRATE_TARGET_APP_CREATE: ' app "{{app}}" → 将自动创建',
|
|
830
|
+
MIGRATE_TARGET_SERVICE_EXISTS: ' service "{{service}}" → 已存在,按名映射({{serviceId}},provider {{provider}})',
|
|
831
|
+
MIGRATE_TARGET_SERVICE_CREATE: ' service "{{service}}" → 将自动创建(provider {{provider}})',
|
|
832
|
+
MIGRATE_TARGET_STAGE_NEW: ' stage {{stage}}:{{count}} 个资源 → 将注册 stage,导入为 v1',
|
|
833
|
+
MIGRATE_TARGET_STAGE_EMPTY: ' stage {{stage}}:{{count}} 个资源 → 导入为 v1',
|
|
834
|
+
MIGRATE_TARGET_STAGE_EXISTS: ' stage {{stage}}:{{count}} 个资源 → Console 已有 v{{version}};--force 将作为新版本导入,否则该 stage 失败',
|
|
835
|
+
MIGRATE_TARGETS_HINT: '目标按名称匹配。如需控制迁移去向(成员、命名等),可先在 Console 手动创建 app/service——si migrate 会映射到同名目标,不会重复创建。',
|
|
836
|
+
MIGRATE_PROVIDER_MISMATCH_TARGET: 'service "{{service}}" 已存在且 provider 为 "{{existingProvider}}",与 YAML 的 "{{ymlProvider}}" 不一致——不支持向其导入 {{ymlProvider}} 状态。',
|
|
837
|
+
MIGRATE_NOTHING_TO_MIGRATE: '旧状态中没有任何已部署资源可迁移。',
|
|
838
|
+
MIGRATE_STAGE_NOT_FOUND: '旧状态中不存在 stage "{{stage}}"。',
|
|
839
|
+
MIGRATE_PROVIDER_MISMATCH: 'provider 不一致:state 为 "{{stateProvider}}",YAML 为 "{{ymlProvider}}"。',
|
|
840
|
+
MIGRATE_ALREADY_MARKED: '旧状态已带迁移标记——继续执行(重复上传会被幂等去重)。',
|
|
841
|
+
MIGRATE_UPLOADING: '正在上传 stage {{stage}} 到 Console...',
|
|
842
|
+
MIGRATE_UPLOADED: ' ✓ stage {{stage}} → 版本 {{version}}{{deduped}}(app {{appId}},service {{serviceId}})',
|
|
843
|
+
MIGRATE_UPLOADED_DEDUPLICATED: '(内容未变,已去重)',
|
|
844
|
+
MIGRATE_VERIFY_FAILED: 'stage {{stage}} 回读校验失败——未写迁移标记。请对比 Console 状态版本与旧状态后重新执行 `si migrate`。',
|
|
845
|
+
MIGRATE_CONFLICT: '目标 stage 在 Console 已有状态。如确认覆盖采纳,请加 --force(将作为新版本导入,历史保留)。',
|
|
846
|
+
MIGRATE_MARKER_WRITTEN: '已写迁移标记:旧状态转为只读(managedBy=saas)。',
|
|
847
|
+
MIGRATE_MARKER_SKIPPED: '警告:使用了 --no-marker。cutover 完成前旧后端仍可写入——请立即完成 YAML 切换。',
|
|
848
|
+
MIGRATE_ROLLBACK_NO_MARKER: '旧状态没有迁移标记——无需回滚。',
|
|
849
|
+
MIGRATE_ROLLBACK_DONE: '已清除迁移标记,旧后端恢复可写。',
|
|
850
|
+
MIGRATE_ROLLBACK_DONE_HINT: '如果已从 YAML 中删除 backend.state_manager 段,经旧后端部署前请先恢复该段。',
|
|
851
|
+
MIGRATE_CUTOVER_STEPS: 'cutover 清单:\n 1. 从 serverlessinsight.yml 删除 backend.state_manager 段,并在顶层添加 org 声明(org: <slug>,slug 见 Console 组织设置)后合并\n 2. 运行 `si plan`——必须显示无变更(这是迁移无损的证明)\n 3. 恢复部署;此后部署时间线由 Console 接管',
|
|
852
|
+
MIGRATION_MARKER_REFUSED: '该状态已迁移至 ServerlessInsight Console(managedBy=saas),旧后端已关闭变更。\n • 继续使用 Console:从 YAML 中删除 backend.state_manager 段并在顶层声明 org: <slug> 后重新部署。\n • 确需经旧后端操作:运行 `si migrate --rollback` 清除标记。',
|
|
853
|
+
MIGRATION_MARKER_WARN: '该状态已迁移至 Console(managedBy=saas)——此处展示的是只读副本,可能已过期。请勿从该后端部署。',
|
|
795
854
|
// HTTP trigger messages
|
|
796
855
|
HTTP_TRIGGER_AUTH_TYPE_REQUIRED: "HTTP 触发器 '{{functionName}}' 需要设置 'auth_type'(public 或 iam)",
|
|
797
856
|
CREATING_HTTP_TRIGGER: "正在为函数 '{{functionName}}' 创建 HTTP 触发器 '{{triggerName}}'...",
|
|
@@ -809,4 +868,168 @@ exports.zhCN = {
|
|
|
809
868
|
EVENT_FLUSH_FAILED: '部署事件冲刷失败(部署 {{deploymentId}},{{count}} 条):{{error}}',
|
|
810
869
|
EVENT_REPLAY_FAILED: '事件队列文件 {{file}} 重放失败:{{error}}',
|
|
811
870
|
INVALID_HTTP_TRIGGER_AUTH_TYPE: "无效的 HTTP 触发器 auth_type '{{authType}}',必须为 'public' 或 'iam'",
|
|
871
|
+
// ===== Issue #251: previously hardcoded messages (now i18n) =====
|
|
872
|
+
UNSUPPORTED_PROVIDER: '不支持的 provider:{{provider}}',
|
|
873
|
+
FORCE_UNLOCK_NO_LOCATION_MODE: '无 location 模式不支持该操作',
|
|
874
|
+
SHOW_LOADING_STATE: '正在加载状态:app {{app}},service {{service}},stage {{stage}}...',
|
|
875
|
+
SHOW_SAAS_BACKEND_FALLBACK: 'SaaS 后端不可用:{{error}},改用本地状态。',
|
|
876
|
+
SHOW_REMOTE_BACKEND_FALLBACK: '从远端后端加载状态失败:{{error}},改用本地状态。',
|
|
877
|
+
SHOW_NO_RESOURCES: '状态中没有任何资源。',
|
|
878
|
+
SHOW_STATE_LOCATION: '状态文件位置:{{stateLocation}}',
|
|
879
|
+
SHOW_BACKEND_REMOTE: '后端:远端',
|
|
880
|
+
SHOW_DEPLOY_HINT: '要部署资源,请执行:si deploy',
|
|
881
|
+
SHOW_HEADER_DEPLOYED: '已部署资源',
|
|
882
|
+
SHOW_CATEGORY_HEADER: '📦 {{label}}',
|
|
883
|
+
SHOW_HEADER_SUMMARY: '概览',
|
|
884
|
+
SHOW_SUMMARY_PROVIDER: ' 提供商: {{value}}',
|
|
885
|
+
SHOW_SUMMARY_APP: ' 应用: {{value}}',
|
|
886
|
+
SHOW_SUMMARY_SERVICE: ' 服务: {{value}}',
|
|
887
|
+
SHOW_SUMMARY_STAGE: ' 阶段: {{value}}',
|
|
888
|
+
SHOW_SUMMARY_RESOURCES: ' 资源数: {{value}}',
|
|
889
|
+
SHOW_SUMMARY_LAST_UPDATED: ' 最后更新: {{value}}',
|
|
890
|
+
SHOW_LOCKED_BY: '锁状态:被 {{user}} 锁定',
|
|
891
|
+
SHOW_UNLOCKED: '锁状态:未锁定',
|
|
892
|
+
APIGW_CHECKING_DNS_STATUS: '正在检查 DNS 记录状态...',
|
|
893
|
+
APIGW_GROUP_CREATE_NO_ID: '创建 API 网关分组失败:未返回 groupId',
|
|
894
|
+
APIGW_API_CREATE_NO_ID: '创建 API 失败:未返回 apiId',
|
|
895
|
+
APIGW_GROUP_NO_SUBDOMAIN: 'API 分组 {{groupName}} 没有 subDomain,无法配置域名绑定',
|
|
896
|
+
SG_INVALID_RULE_FORMAT: '安全组规则格式无效:{{rule}}',
|
|
897
|
+
SG_CREATE_FAILED: '创建安全组失败',
|
|
898
|
+
SG_SKIP_INVALID_INGRESS: '跳过无效的入方向规则:{{rule}}。{{error}}',
|
|
899
|
+
SG_INGRESS_ALREADY_EXISTS: '入方向规则已存在,跳过:{{rule}}',
|
|
900
|
+
SG_ADD_INGRESS_FAILED: '添加入方向规则失败:{{rule}}。{{error}}',
|
|
901
|
+
SG_SKIP_INVALID_EGRESS: '跳过无效的出方向规则:{{rule}}。{{error}}',
|
|
902
|
+
SG_EGRESS_ALREADY_EXISTS: '出方向规则已存在,跳过:{{rule}}',
|
|
903
|
+
SG_ADD_EGRESS_FAILED: '添加出方向规则失败:{{rule}}。{{error}}',
|
|
904
|
+
SG_AUTHORIZE_RULE_FAILED: '为 {{target}} 授权 {{ruleType}} 规则失败:{{error}}',
|
|
905
|
+
SG_REVOKE_RULE_FAILED: '为 {{target}} 回收 {{ruleType}} 规则失败:{{error}}',
|
|
906
|
+
SG_GET_INGRESS_FAILED: '获取入方向规则失败:{{error}}',
|
|
907
|
+
SG_GET_EGRESS_FAILED: '获取出方向规则失败:{{error}}',
|
|
908
|
+
FC3_FUNCTION_FAILED_STATE: 'FC3 函数 {{functionName}} 处于 Failed 状态(原因:{{reason}})',
|
|
909
|
+
FC3_TIMEOUT_ACTIVE: '等待 FC3 函数 {{functionName}} 变为 Active 超时',
|
|
910
|
+
FC3_TIMEOUT_DELETED: '等待 FC3 函数 {{functionName}} 删除超时',
|
|
911
|
+
NAS_CREATE_FS_FAILED: '创建 NAS 文件系统失败',
|
|
912
|
+
NAS_CREATE_MOUNT_TARGET_FAILED: '创建 NAS 挂载点失败',
|
|
913
|
+
NAS_LIST_MOUNT_TARGETS_FAILED: '列出挂载点失败:{{error}}',
|
|
914
|
+
DNS_OPERATION_ERROR: 'DNS 操作出错:{{error}}',
|
|
915
|
+
SLS_WAITING_PROJECT: '等待 SLS Project {{projectName}} 就绪(当前状态:{{status}})',
|
|
916
|
+
SLS_WAITING_LOGSTORE: '等待 SLS Logstore {{projectName}}/{{logstoreName}} 就绪...',
|
|
917
|
+
OTS_WAITING_TABLE: '等待表 {{tableName}} 就绪...(第 {{attempt}}/{{maxAttempts}} 次)',
|
|
918
|
+
OTS_TABLE_READY: '表 {{tableName}} 已就绪',
|
|
919
|
+
OTS_TABLE_TIMEOUT: '等待表 {{tableName}} 就绪超时',
|
|
920
|
+
OTS_CREATE_TABLE_FAILED: '创建表 {{tableName}} 失败:{{error}}',
|
|
921
|
+
OTS_TABLE_CREATED: '表 {{tableName}} 创建成功',
|
|
922
|
+
OTS_DESCRIBE_TABLE_FAILED: '查询表 {{tableName}} 失败:{{error}}',
|
|
923
|
+
OTS_UPDATE_TABLE_FAILED: '更新表 {{tableName}} 失败:{{error}}',
|
|
924
|
+
OTS_TABLE_UPDATED: '表 {{tableName}} 更新成功',
|
|
925
|
+
OTS_TABLE_ALREADY_DELETED: '表 {{tableName}} 已删除或不存在',
|
|
926
|
+
OTS_DELETE_TABLE_FAILED: '删除表 {{tableName}} 失败:{{error}}',
|
|
927
|
+
OTS_TABLE_DELETED: '表 {{tableName}} 删除成功',
|
|
928
|
+
CONTEXT_NO_IAC_FILE: '未找到 IaC 文件。已尝试:{{attemptedList}}',
|
|
929
|
+
CONTEXT_NOT_FOUND: '上下文不存在',
|
|
930
|
+
CONTEXT_IAC_REQUIRES_CONTEXT: '必须先设置上下文才能设置 IAC',
|
|
931
|
+
RUNTIME_UNSUPPORTED_STANDARD: '不支持的标准 runtime:{{standardRuntime}}',
|
|
932
|
+
SAAS_BACKEND_SET_STAGE_FIRST: 'SaaS 状态后端:请先调用 loadState() 设置 stage',
|
|
933
|
+
SAAS_BACKEND_NO_DEPLOYMENT: 'SaaS 状态后端:没有可用的部署,请先调用 loadState()',
|
|
934
|
+
SCF_RESOLVE_UIN_FAILED: '无法解析腾讯云账号 Uin,无法为资源打标签',
|
|
935
|
+
VOLC_APIGW_CREATE_FAILED: 'API 网关 {{gatewayId}} 创建失败{{reason}}',
|
|
936
|
+
VOLC_APIGW_DISAPPEARED: '等待 Running 期间 API 网关 {{gatewayId}} 消失了',
|
|
937
|
+
VEFAAS_RELEASE_FAILED: 'veFaaS 函数 {{functionId}} 发布失败',
|
|
938
|
+
VEFAAS_TIMEOUT_DELETED: '等待 veFaaS 函数 {{functionId}} 删除超时',
|
|
939
|
+
VEFAAS_CREATE_NO_ID: 'CreateFunction 未返回函数 Id:{{functionName}}',
|
|
940
|
+
IAC_FILE_NOT_FOUND: '文件不存在:{{path}}',
|
|
941
|
+
RESOURCE_EVENT_NOT_FOUND: '事件不存在,逻辑 ID:{{logicalId}}',
|
|
942
|
+
APIGW_GROUP_OWNED_REUSE: 'API 分组 {{groupName}} 已存在且归属本 stack,直接复用',
|
|
943
|
+
APIGW_GROUP_ADOPT_REFUSED: 'API 分组 {{groupName}} 已存在但不归属本 stack(缺少 {{tag}} 标签),拒绝接管,请人工处理。',
|
|
944
|
+
APIGW_GROUP_CONFLICT_ADOPT: '创建冲突后发现 API 分组 {{groupName}} 带所有权标签({{tag}}),幂等接管',
|
|
945
|
+
APIGW_GROUP_INFO_AFTER_CREATE_FAILED: '创建后获取 API 分组信息失败:{{error}}',
|
|
946
|
+
APIGW_GROUP_NO_SUBDOMAIN_CDN: 'API 网关分组 {{groupName}} 缺少 subDomain,无法作为 CDN 源站',
|
|
947
|
+
APIGW_GROUP_INFO_AFTER_UPDATE_FAILED: '更新后获取 API 分组信息失败:{{error}}',
|
|
948
|
+
APIGW_DOMAIN_UNCHANGED_SKIP: '域名配置未变化且此前已绑定,跳过 DNS 验证',
|
|
949
|
+
RESOURCE_DATABASE_NOT_FOUND: '数据库不存在,逻辑 ID:{{logicalId}}',
|
|
950
|
+
EXECUTOR_STATE_NOT_FOUND: '状态不存在:{{logicalId}}',
|
|
951
|
+
RESOURCE_INSTANCE_ID_NOT_FOUND: '状态中不存在实例 ID:{{logicalId}}',
|
|
952
|
+
DATABASE_TYPE_UNSUPPORTED: '不支持的数据库类型:{{type}}',
|
|
953
|
+
RESOURCE_OWNERSHIP_TAG_ADOPT: '{{resourceType}} {{name}} 已存在且带所有权标签({{tag}}),幂等接管',
|
|
954
|
+
REFRESH_STATE_ES_APP: '刷新 ES 应用状态失败:{{appId}}',
|
|
955
|
+
REFRESH_STATE_RDS_INSTANCE: '刷新 RDS 实例状态失败:{{instanceId}}',
|
|
956
|
+
RESOURCE_TYPE_UNSUPPORTED: '不支持的资源类型:{{type}}',
|
|
957
|
+
ES_DB_TYPE_VERSION_UNSUPPORTED: '不支持的 ES 数据库类型/版本:{{type}}-{{version}}',
|
|
958
|
+
RESOURCE_FUNCTION_NOT_FOUND: '函数不存在,逻辑 ID:{{logicalId}}',
|
|
959
|
+
FC3_UPLOADING_CODE: '代码包 {{zipPath}} 大小 {{size}}MB,正在上传到 OSS 存储桶 {{bucketName}}',
|
|
960
|
+
FC3_HTTP_TRIGGER_DEPENDENT_CLEANUP: "HTTP 触发器 '{{triggerName}}' 应在依赖资源清理前删除",
|
|
961
|
+
FC3_CREATE_RECOVERABLE_RECONCILE: '创建函数 {{functionName}} 返回可恢复错误,正在与 provider 状态对账:{{error}}',
|
|
962
|
+
FC3_FAILED_AFTER_CREATE: 'FC3 函数 {{functionName}} 创建后处于 Failed 状态(原因:{{reason}})',
|
|
963
|
+
FC3_FOUND_AFTER_CREATE_RECONCILE: '对账后在云上找到函数 {{functionName}},继续部署流程',
|
|
964
|
+
FC3_FOUND_AFTER_DELAYED_RECONCILE: '延迟对账后在云上找到函数 {{functionName}},继续部署流程',
|
|
965
|
+
REFRESH_STATE_FUNCTION: '刷新函数状态失败:{{name}}',
|
|
966
|
+
RESOURCE_BUCKET_NOT_FOUND: '存储桶不存在,逻辑 ID:{{logicalId}}',
|
|
967
|
+
RDS_DB_TYPE_VERSION_UNSUPPORTED: '不支持的 RDS 数据库类型/版本:{{type}}-{{version}}',
|
|
968
|
+
RESOURCE_TABLE_NOT_FOUND: '表不存在,逻辑 ID:{{logicalId}}',
|
|
969
|
+
REFRESH_STATE_TABLE: '刷新表状态失败:{{tableName}}',
|
|
970
|
+
OTS_TABLE_MISSING_SKIP_DELETE: 'provider 中找不到实例 {{instanceId}} 下的表 {{tableName}},跳过删除',
|
|
971
|
+
OTS_TABLE_TYPE_UNSUPPORTED: '不支持的表类型:{{type}}',
|
|
972
|
+
OTS_ATTRIBUTE_NOT_FOUND: '找不到 key 对应的属性:{{key}}',
|
|
973
|
+
LOCAL_HANDLER_NOT_FOUND: '在 {{handlerPath}} 中找不到 Handler "{{handlerMethod}}",或它不是函数',
|
|
974
|
+
LOCAL_EXECUTION_TIMEOUT: '函数执行超时({{timeoutMs}}ms)',
|
|
975
|
+
LOCAL_PORT_CLOSED: '端口在收到响应前已关闭',
|
|
976
|
+
LOCAL_WORKER_EXITED: 'Worker 退出,退出码 {{code}}',
|
|
977
|
+
REFRESH_STATE_BUCKET: '刷新存储桶状态失败:{{name}}',
|
|
978
|
+
RESOURCE_SPACE_ID_NOT_FOUND: '状态中不存在 Space ID:{{logicalId}}',
|
|
979
|
+
REFRESH_STATE_ES_SPACE: '刷新 ES 空间状态失败:{{spaceId}}',
|
|
980
|
+
SCF_HTTP_TRIGGER_ALREADY_ATTACHED: 'HTTP 触发器 {{triggerName}} 已绑定到 {{functionName}},跳过创建',
|
|
981
|
+
SCF_HTTP_TRIGGER_ALREADY_EXISTS: 'HTTP 触发器 {{triggerName}} 在 {{functionName}} 上已存在,继续:{{error}}',
|
|
982
|
+
SCF_HANDLER_IMMUTABLE: '腾讯云 SCF 的 Handler 不可变,无法在更新时修改({{oldHandler}} -> {{newHandler}})。请删除后重建函数。',
|
|
983
|
+
SCF_RUNTIME_IMMUTABLE: '腾讯云 SCF 的 Runtime 不可变,无法在更新时修改({{oldRuntime}} -> {{newRuntime}})。请删除后重建函数。',
|
|
984
|
+
RESOURCE_CLUSTER_ID_NOT_FOUND: '状态中不存在 Cluster ID:{{logicalId}}',
|
|
985
|
+
REFRESH_STATE_CLUSTER: '刷新集群状态失败:{{clusterId}}',
|
|
986
|
+
VOLC_BACKEND_FUNCTION_ID_UNRESOLVED: '无法解析 backend {{backend}} 的 veFaaS 函数 Id(functions.{{functionKey}} 在状态中没有 functionId)。请先部署函数。',
|
|
987
|
+
VOLC_APIGW_NETWORK_REQUIRED: 'events.{{eventKey}}:创建 API 网关实例需要 network(vpc_id + subnet_ids)配置,请补充到 event 配置中',
|
|
988
|
+
VOLC_APIGW_ADOPT_REFUSED: 'API 网关 {{gatewayName}} 已存在但不归属本 stack(缺少 {{tag}} 标签),拒绝接管,请人工处理。',
|
|
989
|
+
VOLC_APIGW_CREATE_OR_REUSE_FAILED: '创建或复用 API 网关实例失败',
|
|
990
|
+
VOLC_EXTERNAL_ROLE_SKIP_DELETE: '跳过删除外部管理的 IAM 角色:{{roleName}}(外部托管)',
|
|
991
|
+
CONFIRMATION_STDIN_NOT_TTY: '需要交互式确认,但 stdin 不是 TTY。请在非交互环境中使用 --auto-approve (-y) 跳过确认。',
|
|
992
|
+
RUNTIME_NOT_SUPPORTED_FOR_PROVIDER: 'provider {{provider}} 不支持 runtime {{runtime}}。该 runtime 支持的 provider:{{supportedProviders}}',
|
|
993
|
+
VOLC_API_FAILED: '火山引擎 {{service}} 调用失败:{{code}}: {{message}}',
|
|
994
|
+
VOLC_API_REQUEST_ID: '(RequestId: {{requestId}})',
|
|
995
|
+
HUAWEI_DEPLOY_NOT_IMPLEMENTED: '华为云部署尚未实现。该 provider 目前只生成 HCL 模板、不做部署。请使用 Aliyun 或 Tencent provider,或参与贡献华为云部署支持。',
|
|
996
|
+
CONTEXT_REGION_DEPRECATED: '警告:ROS_REGION_ID 环境变量已弃用,请改用 SI_REGION。',
|
|
997
|
+
SHOW_CAT_FUNCTIONS: '函数',
|
|
998
|
+
SHOW_CAT_API_GATEWAY: 'API 网关',
|
|
999
|
+
SHOW_CAT_STORAGE: '存储',
|
|
1000
|
+
SHOW_CAT_DATABASES: '数据库',
|
|
1001
|
+
SHOW_CAT_DNS: 'DNS 记录',
|
|
1002
|
+
SHOW_CAT_OTHER: '其他资源',
|
|
1003
|
+
SHOW_TIME_JUST_NOW: '刚刚',
|
|
1004
|
+
SHOW_TIME_DAYS_AGO: '{{count}} 天前',
|
|
1005
|
+
SHOW_TIME_HOURS_AGO: '{{count}} 小时前',
|
|
1006
|
+
SHOW_TIME_MINUTES_AGO: '{{count}} 分钟前',
|
|
1007
|
+
// ===== Issue #251: CLI help text (commander) =====
|
|
1008
|
+
CMD_ROOT_DESC: 'ServerlessInsight 命令行工具',
|
|
1009
|
+
CMD_LOGIN_DESC: '登录 ServerlessInsight Console',
|
|
1010
|
+
CMD_LOGOUT_DESC: '吊销 API key 并清除本地凭证',
|
|
1011
|
+
CMD_WHOAMI_DESC: '显示当前登录状态',
|
|
1012
|
+
CMD_SHOW_DESC: '从状态中显示已部署资源',
|
|
1013
|
+
CMD_VALIDATE_DESC: '校验 serverless IaC yaml',
|
|
1014
|
+
CMD_PLAN_DESC: '生成并展示部署计划',
|
|
1015
|
+
CMD_DIFF_DESC: '展示配置与线上云环境的差异(plan 的别名)',
|
|
1016
|
+
CMD_DEPLOY_DESC: '部署 serverless IaC yaml',
|
|
1017
|
+
CMD_DESTROY_DESC: '销毁 serverless 资源栈',
|
|
1018
|
+
CMD_LOCAL_DESC: '本地运行 Serverless 应用进行调试',
|
|
1019
|
+
CMD_FORCE_UNLOCK_DESC: '手动移除卡住的锁(谨慎使用)',
|
|
1020
|
+
OPT_SI_API_KEY_EXISTING: '使用已有的 API key 登录',
|
|
1021
|
+
OPT_FILE: '指定 yaml 文件',
|
|
1022
|
+
OPT_FILE_REMOTE_REQUIRED: '指定 yaml 文件(远端后端必填)',
|
|
1023
|
+
OPT_STAGE: '指定 stage',
|
|
1024
|
+
OPT_REGION: '指定 region',
|
|
1025
|
+
OPT_PROVIDER: '指定 provider',
|
|
1026
|
+
OPT_ACCESS_KEY_ID: '指定 AccessKeyId',
|
|
1027
|
+
OPT_ACCESS_KEY_SECRET: '指定 AccessKeySecret',
|
|
1028
|
+
OPT_SECURITY_TOKEN: '指定 SecurityToken',
|
|
1029
|
+
OPT_NO_REFRESH: '跳过线上探测,仅对比配置与状态(无漂移检测)',
|
|
1030
|
+
OPT_SI_API_KEY: 'ServerlessInsight API key(覆盖 SI_API_KEY 环境变量)',
|
|
1031
|
+
OPT_AUTO_APPROVE: '跳过部署前的计划交互确认',
|
|
1032
|
+
OPT_PARAMETER: '覆盖参数',
|
|
1033
|
+
OPT_DEBUG: '开启调试模式',
|
|
1034
|
+
OPT_WATCH: '开启文件监听',
|
|
812
1035
|
};
|
package/dist/src/parser/index.js
CHANGED
|
@@ -15,7 +15,7 @@ const common_1 = require("../common");
|
|
|
15
15
|
const lang_1 = require("../lang");
|
|
16
16
|
const validateExistence = (path) => {
|
|
17
17
|
if (!(0, node_fs_1.existsSync)(path)) {
|
|
18
|
-
throw new Error(
|
|
18
|
+
throw new Error(lang_1.lang.__('IAC_FILE_NOT_FOUND', { path }));
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
const parseBackend = (raw) => {
|
|
@@ -15,7 +15,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, resolveR
|
|
|
15
15
|
case 'create': {
|
|
16
16
|
const event = eventsMap.get(item.logicalId);
|
|
17
17
|
if (!event) {
|
|
18
|
-
throw new Error(
|
|
18
|
+
throw new Error(lang_1.lang.__('RESOURCE_EVENT_NOT_FOUND', { logicalId: item.logicalId }));
|
|
19
19
|
}
|
|
20
20
|
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
21
21
|
const newState = await (0, apigwResource_1.createApigwResource)(context, event, serviceName, resolveRoleArn, currentState);
|
|
@@ -25,7 +25,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, resolveR
|
|
|
25
25
|
case 'update': {
|
|
26
26
|
const event = eventsMap.get(item.logicalId);
|
|
27
27
|
if (!event) {
|
|
28
|
-
throw new Error(
|
|
28
|
+
throw new Error(lang_1.lang.__('RESOURCE_EVENT_NOT_FOUND', { logicalId: item.logicalId }));
|
|
29
29
|
}
|
|
30
30
|
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
31
31
|
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, resolveRoleArn, currentState);
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateApigwPlan = void 0;
|
|
4
4
|
const aliyunClient_1 = require("../../common/aliyunClient");
|
|
5
|
+
const logger_1 = require("../../common/logger");
|
|
5
6
|
const apigwTypes_1 = require("./apigwTypes");
|
|
6
7
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
8
|
const hashUtils_1 = require("../../common/hashUtils");
|
|
@@ -10,6 +11,7 @@ const planCompare_1 = require("../../common/planCompare");
|
|
|
10
11
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
11
12
|
const concurrency_1 = require("../../common/concurrency");
|
|
12
13
|
const ownershipTag_1 = require("../ownershipTag");
|
|
14
|
+
const lang_1 = require("../../lang");
|
|
13
15
|
const DNS_SUB_RESOURCE_SUFFIXES = ['.dns_verification', '.dns_txt_verification'];
|
|
14
16
|
const isDnsSubResource = (logicalId) => DNS_SUB_RESOURCE_SUFFIXES.some((suffix) => logicalId.endsWith(suffix));
|
|
15
17
|
const planEventDeletion = (logicalId, definition) => ({
|
|
@@ -68,7 +70,11 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
68
70
|
const remoteGroup = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.findApiGroupByName:${groupConfig.groupName}`, () => client.apigw.findApiGroupByName(groupConfig.groupName));
|
|
69
71
|
if (remoteGroup?.groupId) {
|
|
70
72
|
if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, remoteGroup.tags)) {
|
|
71
|
-
throw new Error(
|
|
73
|
+
throw new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED', {
|
|
74
|
+
resourceType: 'API group',
|
|
75
|
+
resourceName: groupConfig.groupName,
|
|
76
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
77
|
+
}));
|
|
72
78
|
}
|
|
73
79
|
if (!currentState) {
|
|
74
80
|
// Resource exists remotely (and is ours) but not in state — drift:
|
|
@@ -96,6 +102,10 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
96
102
|
const definitionChanged = !(0, hashUtils_1.attributesEqual)(currentDefinition, desiredDefinition);
|
|
97
103
|
let groupRemoteDiffers = false;
|
|
98
104
|
let triggersDiffer = false;
|
|
105
|
+
// Issue #246: live group attributes become the diff baseline when the
|
|
106
|
+
// group was readable; trigger-level drift has no attribute mapping and
|
|
107
|
+
// is surfaced as a drift reason instead.
|
|
108
|
+
let liveGroupAttrs;
|
|
99
109
|
if (groupInstance) {
|
|
100
110
|
const remoteGroup = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getApiGroup:${groupInstance.id}`, () => client.apigw.getApiGroup(groupInstance.id));
|
|
101
111
|
if (!remoteGroup) {
|
|
@@ -113,9 +123,9 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
113
123
|
// to the group/trigger then surfaces as update + drifted, and a read
|
|
114
124
|
// failure cannot degrade a config-driven update into a create.
|
|
115
125
|
// Domain/log stay existence-only in Phase 0-2 — never compared live.
|
|
126
|
+
liveGroupAttrs = (0, apigwTypes_1.cloudApigwGroupToDefinition)(remoteGroup);
|
|
116
127
|
if (!definitionChanged) {
|
|
117
|
-
|
|
118
|
-
groupRemoteDiffers = (0, planCompare_1.remoteDiffersFromDesired)(remoteGroupAttrs, desiredDefinition);
|
|
128
|
+
groupRemoteDiffers = (0, planCompare_1.remoteDiffersFromDesired)(liveGroupAttrs, desiredDefinition);
|
|
119
129
|
if (event.triggers.length > 0) {
|
|
120
130
|
const desiredApis = new Map(event.triggers.map((trigger) => {
|
|
121
131
|
const apiName = buildDesiredTriggerApiName(event, trigger, context.stage);
|
|
@@ -164,18 +174,29 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
164
174
|
logicalId,
|
|
165
175
|
action: 'update',
|
|
166
176
|
resourceType: 'ALIYUN_APIGW',
|
|
167
|
-
changes: {
|
|
177
|
+
changes: {
|
|
178
|
+
before: liveGroupAttrs
|
|
179
|
+
? (0, planCompare_1.mergeLiveBefore)(currentDefinition, liveGroupAttrs)
|
|
180
|
+
: currentDefinition,
|
|
181
|
+
after: desiredDefinition,
|
|
182
|
+
},
|
|
168
183
|
drifted: true,
|
|
184
|
+
...(triggersDiffer ? { driftReasons: ['PLAN_DRIFT_TRIGGERS'] } : {}),
|
|
169
185
|
};
|
|
170
186
|
}
|
|
171
187
|
return { logicalId, action: 'noop', resourceType: 'ALIYUN_APIGW' };
|
|
172
188
|
}
|
|
173
|
-
catch {
|
|
189
|
+
catch (error) {
|
|
190
|
+
logger_1.logger.warn(lang_1.lang.__('PLAN_LIVE_READ_FAILED', {
|
|
191
|
+
logicalId,
|
|
192
|
+
error: error instanceof Error ? error.message : String(error),
|
|
193
|
+
}));
|
|
174
194
|
return {
|
|
175
195
|
logicalId,
|
|
176
196
|
action: 'create',
|
|
177
197
|
resourceType: 'ALIYUN_APIGW',
|
|
178
198
|
changes: { before: currentState.definition, after: desiredDefinition },
|
|
199
|
+
drifted: true,
|
|
179
200
|
};
|
|
180
201
|
}
|
|
181
202
|
});
|
|
@@ -412,11 +412,14 @@ const createApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
412
412
|
if (existingGroup?.groupId) {
|
|
413
413
|
if ((0, ownershipTag_1.isOwnedByStack)(context, logicalId, existingGroup.tags)) {
|
|
414
414
|
logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_FOUND_REUSING', { groupName: groupConfig.groupName }));
|
|
415
|
-
logger_1.logger.info(
|
|
415
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_OWNED_REUSE', { groupName: groupConfig.groupName }));
|
|
416
416
|
groupId = existingGroup.groupId;
|
|
417
417
|
}
|
|
418
418
|
else {
|
|
419
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
419
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('APIGW_GROUP_ADOPT_REFUSED', {
|
|
420
|
+
groupName: groupConfig.groupName,
|
|
421
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
422
|
+
})));
|
|
420
423
|
}
|
|
421
424
|
}
|
|
422
425
|
else {
|
|
@@ -428,10 +431,16 @@ const createApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
428
431
|
const probe = await client.apigw.findApiGroupByName(groupConfig.groupName);
|
|
429
432
|
if (probe?.groupId && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.tags)) {
|
|
430
433
|
groupId = probe.groupId;
|
|
431
|
-
logger_1.logger.info(
|
|
434
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_GROUP_CONFLICT_ADOPT', {
|
|
435
|
+
groupName: groupConfig.groupName,
|
|
436
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
437
|
+
}));
|
|
432
438
|
}
|
|
433
439
|
else {
|
|
434
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
440
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('APIGW_GROUP_ADOPT_REFUSED', {
|
|
441
|
+
groupName: groupConfig.groupName,
|
|
442
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
443
|
+
})));
|
|
435
444
|
}
|
|
436
445
|
}
|
|
437
446
|
else {
|
|
@@ -442,7 +451,7 @@ const createApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
442
451
|
// Get group info for state
|
|
443
452
|
const groupInfo = await client.apigw.getApiGroup(groupId);
|
|
444
453
|
if (!groupInfo) {
|
|
445
|
-
throw new Error(
|
|
454
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_INFO_AFTER_CREATE_FAILED', { error: groupId }));
|
|
446
455
|
}
|
|
447
456
|
const instances = [
|
|
448
457
|
buildApigwGroupInstanceFromProvider(groupInfo, context.stage),
|
|
@@ -513,7 +522,7 @@ const createApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
513
522
|
const isCdnEnabled = getIsCdnEnabled(event);
|
|
514
523
|
const originDomain = groupInfo.subDomain;
|
|
515
524
|
if (!originDomain) {
|
|
516
|
-
throw new Error(
|
|
525
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_NO_SUBDOMAIN_CDN', { groupName: groupId }));
|
|
517
526
|
}
|
|
518
527
|
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
519
528
|
if (isCdnEnabled) {
|
|
@@ -664,7 +673,10 @@ const updateApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
664
673
|
return findCloudGroupOrCreate();
|
|
665
674
|
}
|
|
666
675
|
if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, cloudGroup.tags)) {
|
|
667
|
-
throw new Error(
|
|
676
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_ADOPT_REFUSED', {
|
|
677
|
+
groupName: groupConfig.groupName,
|
|
678
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
679
|
+
}));
|
|
668
680
|
}
|
|
669
681
|
const cloudApis = await client.apigw.listApisByGroup(cloudGroup.groupId);
|
|
670
682
|
const built = buildCloudInstance(cloudGroup, cloudApis);
|
|
@@ -686,7 +698,7 @@ const updateApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
686
698
|
await client.apigw.updateApiGroup(groupId, groupConfig);
|
|
687
699
|
const groupInfo = await client.apigw.getApiGroup(groupId);
|
|
688
700
|
if (!groupInfo) {
|
|
689
|
-
throw new Error(
|
|
701
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_INFO_AFTER_UPDATE_FAILED', { error: groupId }));
|
|
690
702
|
}
|
|
691
703
|
const instances = [
|
|
692
704
|
buildApigwGroupInstanceFromProvider(groupInfo, context.stage),
|
|
@@ -774,7 +786,7 @@ const updateApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
774
786
|
desiredDomainDef &&
|
|
775
787
|
hasBoundDomains &&
|
|
776
788
|
(0, hashUtils_1.attributesEqual)(previousDomainDef, desiredDomainDef)) {
|
|
777
|
-
logger_1.logger.info('
|
|
789
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_DOMAIN_UNCHANGED_SKIP'));
|
|
778
790
|
// Still include existing domain instances for state consistency
|
|
779
791
|
const existingDomainInstances = existingState?.instances?.filter((i) => i.type === 'ALIYUN_APIGW_GROUP' ||
|
|
780
792
|
i.type === 'ALIYUN_APIGW_API' ||
|
|
@@ -798,7 +810,7 @@ const updateApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
798
810
|
const previousTrackedDomains = getApigwTrackedDomains(previousDomainName, previousWwwBindApex);
|
|
799
811
|
const originDomain = groupInfo.subDomain;
|
|
800
812
|
if (isCdnEnabled && !originDomain) {
|
|
801
|
-
throw new Error(
|
|
813
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_NO_SUBDOMAIN_CDN', { groupName: groupId }));
|
|
802
814
|
}
|
|
803
815
|
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
804
816
|
if (isCdnEnabled) {
|
|
@@ -56,23 +56,23 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
56
56
|
case 'create': {
|
|
57
57
|
const database = databasesMap.get(item.logicalId);
|
|
58
58
|
if (!database) {
|
|
59
|
-
throw new Error(
|
|
59
|
+
throw new Error(lang_1.lang.__('RESOURCE_DATABASE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
60
60
|
}
|
|
61
61
|
return executeCreateAction(context, database, item.resourceType, currentState);
|
|
62
62
|
}
|
|
63
63
|
case 'update': {
|
|
64
64
|
const database = databasesMap.get(item.logicalId);
|
|
65
65
|
if (!database) {
|
|
66
|
-
throw new Error(
|
|
66
|
+
throw new Error(lang_1.lang.__('RESOURCE_DATABASE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
67
67
|
}
|
|
68
68
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
69
69
|
if (!state) {
|
|
70
|
-
throw new Error(
|
|
70
|
+
throw new Error(lang_1.lang.__('EXECUTOR_STATE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
71
71
|
}
|
|
72
72
|
const instanceId = state.metadata?.instanceId || state.instances?.[0]?.id;
|
|
73
73
|
const resourceType = state.metadata?.resourceType || item.resourceType;
|
|
74
74
|
if (!instanceId) {
|
|
75
|
-
throw new Error(
|
|
75
|
+
throw new Error(lang_1.lang.__('RESOURCE_INSTANCE_ID_NOT_FOUND', { logicalId: item.logicalId }));
|
|
76
76
|
}
|
|
77
77
|
return executeUpdateAction(context, database, instanceId, resourceType, currentState);
|
|
78
78
|
}
|
|
@@ -85,7 +85,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
85
85
|
const instanceId = state.metadata?.instanceId || state.instances?.[0]?.id;
|
|
86
86
|
const resourceType = state.metadata?.resourceType || item.resourceType;
|
|
87
87
|
if (!instanceId) {
|
|
88
|
-
throw new Error(
|
|
88
|
+
throw new Error(lang_1.lang.__('RESOURCE_INSTANCE_ID_NOT_FOUND', { logicalId: item.logicalId }));
|
|
89
89
|
}
|
|
90
90
|
return executeDeleteAction(context, instanceId, resourceType, item.logicalId, currentState);
|
|
91
91
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateDatabasePlan = void 0;
|
|
4
|
+
const lang_1 = require("../../lang");
|
|
4
5
|
const aliyunClient_1 = require("../../common/aliyunClient");
|
|
5
6
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
6
7
|
const concurrency_1 = require("../../common/concurrency");
|
|
@@ -27,7 +28,7 @@ const getResourceType = (database) => {
|
|
|
27
28
|
].includes(database.type)) {
|
|
28
29
|
return 'ALIYUN_RDS_SERVERLESS';
|
|
29
30
|
}
|
|
30
|
-
throw new Error(
|
|
31
|
+
throw new Error(lang_1.lang.__('DATABASE_TYPE_UNSUPPORTED', { type: database.type }));
|
|
31
32
|
};
|
|
32
33
|
const getDesiredDefinition = (database) => {
|
|
33
34
|
if (database.type === "ELASTICSEARCH_SERVERLESS" /* DatabaseEnum.ELASTICSEARCH_SERVERLESS */) {
|
|
@@ -42,7 +43,7 @@ const getDesiredDefinition = (database) => {
|
|
|
42
43
|
const config = (0, rdsTypes_1.databaseToRdsConfig)(database);
|
|
43
44
|
return (0, rdsTypes_1.extractRdsDefinition)(config);
|
|
44
45
|
}
|
|
45
|
-
throw new Error(
|
|
46
|
+
throw new Error(lang_1.lang.__('DATABASE_TYPE_UNSUPPORTED', { type: database.type }));
|
|
46
47
|
};
|
|
47
48
|
const generateDatabasePlan = async (context, state, databases) => {
|
|
48
49
|
// Filter databases for Aliyun RDS and ES Serverless
|
|
@@ -85,7 +86,11 @@ const generateDatabasePlan = async (context, state, databases) => {
|
|
|
85
86
|
? (0, refreshCache_1.cachedRefreshRead)(context, `es.getApp:${instanceId}`, () => client.es.getApp(instanceId))
|
|
86
87
|
: (0, refreshCache_1.cachedRefreshRead)(context, `rds.getInstance:${instanceId}`, () => client.rds.getInstance(instanceId)),
|
|
87
88
|
isOwned: (remote) => (0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTagShape(remote.tags)),
|
|
88
|
-
foreignError: () => new Error(
|
|
89
|
+
foreignError: () => new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED', {
|
|
90
|
+
resourceType,
|
|
91
|
+
resourceName: database.name,
|
|
92
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
93
|
+
})),
|
|
89
94
|
cloudToDefinition: (remote) => isEs ? (0, esServerlessTypes_1.cloudEsToDefinition)(remote) : (0, rdsTypes_1.cloudRdsToDefinition)(remote),
|
|
90
95
|
refresh: context.refresh,
|
|
91
96
|
});
|