@geek-fun/serverlessinsight 0.9.1 → 0.9.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.
- 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 +4 -8
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +3 -8
- 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-poc-timer-app-insight-poc-timer.json.backup +132 -0
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +3 -3
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +20 -5
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/AGENTS.md +10 -0
- package/CHANGELOG.md +51 -0
- package/README.md +103 -13
- package/README.zh-CN.md +73 -13
- package/codecov +0 -0
- package/codecov.SHA256SUM +1 -0
- package/codecov.SHA256SUM.sig +16 -0
- package/dist/package.json +1 -1
- package/dist/src/commands/index.js +92 -24
- package/dist/src/commands/local.js +16 -3
- package/dist/src/commands/plan.js +31 -4
- package/dist/src/commands/schema.js +24 -0
- package/dist/src/commands/show.js +64 -10
- package/dist/src/commands/validate.js +34 -2
- package/dist/src/common/aliyunClient/apigwOperations.js +17 -1
- package/dist/src/common/aliyunClient/fc3Operations.js +39 -2
- package/dist/src/common/aliyunClient/ossOperations.js +214 -221
- package/dist/src/common/bucketPolicy.js +63 -0
- package/dist/src/common/constants.js +7 -1
- package/dist/src/common/domainUtils.js +4 -1
- package/dist/src/common/functionDefinition.js +25 -0
- package/dist/src/common/index.js +4 -0
- package/dist/src/common/jsonOutput.js +82 -0
- package/dist/src/common/logger.js +6 -3
- package/dist/src/common/nameBuilder.js +3 -1
- package/dist/src/common/noColor.js +9 -0
- package/dist/src/common/planCapabilities.js +119 -0
- package/dist/src/common/planCompare.js +119 -66
- package/dist/src/common/planFormatter.js +34 -20
- package/dist/src/common/planRedaction.js +26 -0
- package/dist/src/common/refreshPlanner.js +66 -21
- package/dist/src/common/siCron.js +415 -0
- package/dist/src/common/stateBackend/saasStateBackend.js +5 -4
- package/dist/src/common/tencentClient/cosOperations.js +326 -322
- package/dist/src/common/tencentClient/scfOperations.js +11 -2
- package/dist/src/common/tencentClient/tdsqlcOperations.js +6 -11
- package/dist/src/common/triggerMapper.js +16 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +82 -0
- package/dist/src/common/volcengineClient/iamOperations.js +27 -3
- package/dist/src/common/volcengineClient/tosOperations.js +62 -56
- package/dist/src/common/volcengineClient/vefaasOperations.js +45 -0
- package/dist/src/lang/en.js +70 -3
- package/dist/src/lang/index.js +36 -1
- package/dist/src/lang/zh-CN.js +70 -3
- package/dist/src/parser/eventParser.js +1 -0
- package/dist/src/parser/functionParser.js +48 -2
- package/dist/src/stack/aliyunStack/apigwExecutor.js +1 -1
- package/dist/src/stack/aliyunStack/apigwPlanner.js +103 -23
- package/dist/src/stack/aliyunStack/apigwResource.js +4 -3
- package/dist/src/stack/aliyunStack/apigwTypes.js +3 -7
- package/dist/src/stack/aliyunStack/deployer.js +2 -0
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +8 -4
- package/dist/src/stack/aliyunStack/fc3Executor.js +7 -3
- package/dist/src/stack/aliyunStack/fc3Planner.js +148 -153
- package/dist/src/stack/aliyunStack/fc3Resource.js +206 -53
- package/dist/src/stack/aliyunStack/fc3Types.js +30 -16
- package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
- package/dist/src/stack/aliyunStack/ossResource.js +113 -102
- package/dist/src/stack/aliyunStack/ossTypes.js +20 -20
- package/dist/src/stack/localStack/aliyunFc.js +1 -6
- package/dist/src/stack/localStack/event.js +31 -71
- package/dist/src/stack/localStack/function.js +25 -77
- package/dist/src/stack/localStack/functionRunner.js +10 -2
- package/dist/src/stack/localStack/httpAdapter.js +54 -0
- package/dist/src/stack/localStack/httpError.js +5 -0
- package/dist/src/stack/localStack/index.js +8 -1
- package/dist/src/stack/localStack/legacyLambda.js +26 -0
- package/dist/src/stack/localStack/localContext.js +29 -0
- package/dist/src/stack/localStack/localRoute.js +12 -0
- package/dist/src/stack/localStack/localRuntimes.js +22 -0
- package/dist/src/stack/localStack/localServer.js +8 -3
- package/dist/src/stack/localStack/requestBody.js +24 -0
- package/dist/src/stack/localStack/requestId.js +18 -0
- package/dist/src/stack/localStack/tencent.js +147 -0
- package/dist/src/stack/localStack/timer.js +183 -0
- package/dist/src/stack/localStack/utils.js +19 -1
- package/dist/src/stack/localStack/volcengine.js +68 -0
- package/dist/src/stack/scfStack/cosPlanner.js +9 -14
- package/dist/src/stack/scfStack/cosResource.js +42 -50
- package/dist/src/stack/scfStack/cosTypes.js +19 -14
- package/dist/src/stack/scfStack/deployer.js +2 -0
- package/dist/src/stack/scfStack/scfExecutor.js +7 -3
- package/dist/src/stack/scfStack/scfHttpTrigger.js +106 -0
- package/dist/src/stack/scfStack/scfPlanner.js +114 -29
- package/dist/src/stack/scfStack/scfResource.js +329 -311
- package/dist/src/stack/scfStack/scfTypes.js +4 -3
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +10 -13
- package/dist/src/stack/volcengineStack/apigwDomains.js +64 -0
- package/dist/src/stack/volcengineStack/apigwPlanner.js +71 -15
- package/dist/src/stack/volcengineStack/apigwResource.js +60 -24
- package/dist/src/stack/volcengineStack/apigwTypes.js +5 -1
- package/dist/src/stack/volcengineStack/deployer.js +6 -0
- package/dist/src/stack/volcengineStack/tosPlanner.js +8 -13
- package/dist/src/stack/volcengineStack/tosResource.js +22 -35
- package/dist/src/stack/volcengineStack/tosTypes.js +5 -8
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +186 -44
- package/dist/src/stack/volcengineStack/vefaasResource.js +232 -14
- package/dist/src/stack/volcengineStack/vefaasTypes.js +6 -3
- package/dist/src/validator/functionSchema.js +25 -2
- package/dist/src/validator/iacSchema.js +2 -1
- package/dist/src/validator/index.js +4 -1
- package/dist/src/validator/rootSchema.js +49 -18
- package/dist/src/validator/schemaExport.js +60 -0
- package/dist/src/validator/semanticValidation.js +79 -0
- package/dist/src/validator/templateRefSchema.js +9 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/release-notes.md +79 -0
- package/samples/aliyun-poc-timer.yml +39 -0
- package/samples/tencent-local/index.js +13 -0
- package/samples/tencent-local/serverlessinsight.yml +23 -0
- package/samples/volcengine-local/index.js +13 -0
- package/samples/volcengine-local/serverlessinsight.yml +28 -0
package/dist/src/lang/zh-CN.js
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.zhCN = void 0;
|
|
4
4
|
exports.zhCN = {
|
|
5
|
+
PLAN_SENSITIVE_VALUE: '(敏感值)',
|
|
6
|
+
PLAN_NAS_NETWORK_REQUIRED: '{{logicalId}} 的 NAS 存储需要声明 VPC 网络或已有挂载目标记录。计划已停止,尚未创建任何资源。',
|
|
7
|
+
APIGW_DOMAIN_READ_INVALID: '域名 {{domainId}} 的查询响应无效',
|
|
8
|
+
PLAN_DRIFT_EVENT_DOMAIN: '网关域名或证书与配置不一致或不存在',
|
|
9
|
+
PLAN_DRIFT_HTTP_TRIGGER: 'HTTP 触发器与请求配置不同或已丢失',
|
|
10
|
+
PLAN_DRIFT_FUNCTION_DOMAIN: '函数域名与请求配置不同或已丢失',
|
|
11
|
+
PLAN_REPLACEMENT_REQUIRED: '{{logicalId}} 的 {{fields}} 变更需要替换资源。暂不支持自动替换,请显式迁移或重建资源。',
|
|
12
|
+
PLAN_UPDATE_NOT_SUPPORTED: '无法更新 {{logicalId}} 的 {{fields}}:当前云厂商更新实现不支持这些属性。尚未执行任何变更。',
|
|
13
|
+
PLAN_STATE_ONLY: '{{logicalId}} 已与云端一致,仅更新保存的配置意图。',
|
|
5
14
|
// Validation messages
|
|
6
15
|
VALIDATING_YAML: '正在验证 yaml...',
|
|
7
16
|
YAML_VALID: 'Yaml 有效! 🎉',
|
|
@@ -49,6 +58,10 @@ exports.zhCN = {
|
|
|
49
58
|
LOCAL_GATEWAY_ERROR: '本地网关错误',
|
|
50
59
|
ERROR_STOPPING_LOCAL_SERVER: '停止本地服务器时出错',
|
|
51
60
|
RUN_LOCAL_STARTING: '启动本地运行: stage={{stage}} debug={{debug}} watch={{watch}}',
|
|
61
|
+
LOCAL_TIMER_SCHEDULED: "本地定时器 '{{triggerName}}' 已为函数 '{{functionName}}' 调度(cron: {{cron}},UTC)",
|
|
62
|
+
LOCAL_TIMER_FIRED: "本地定时器 '{{triggerName}}' 正在触发函数 '{{functionName}}'...",
|
|
63
|
+
LOCAL_TIMER_DISABLED: "本地定时器 '{{triggerName}}' 已停用(enable: false),跳过调度",
|
|
64
|
+
LOCAL_TIMER_INVALID_CRON: "本地定时器 '{{triggerName}}' 的 cron '{{cron}}' 非法,跳过调度",
|
|
52
65
|
// Function execution
|
|
53
66
|
FUNCTION_REQUEST_RECEIVED: '本地服务器收到函数请求 -> {{method}} {{identifier}} ',
|
|
54
67
|
INVOKING_WORKER_WITH_EVENT_TYPE: '使用事件类型调用工作进程: {{eventType}} 和上下文',
|
|
@@ -117,7 +130,7 @@ exports.zhCN = {
|
|
|
117
130
|
PLAN_COMPUTED_VALUE: '(部署后可知)',
|
|
118
131
|
PLAN_REVERT_ANNOTATION: '(云端已改,将按配置恢复)',
|
|
119
132
|
PLAN_DRIFTED_MARKER: '(云端已漂移——与本配置不一致,将按配置纠正)',
|
|
120
|
-
PLAN_LIVE_READ_FAILED: '读取 {{logicalId}}
|
|
133
|
+
PLAN_LIVE_READ_FAILED: '读取 {{logicalId}} 云端状态失败,计划已停止: {{error}}',
|
|
121
134
|
PLAN_DRIFT_ROLE_MISSING: '云端 IAM 角色缺失',
|
|
122
135
|
PLAN_DRIFT_ROLE_POLICY: '云端 IAM 角色策略被修改',
|
|
123
136
|
PLAN_DRIFT_LOGSTORE: '云端函数日志资源被修改',
|
|
@@ -246,8 +259,8 @@ exports.zhCN = {
|
|
|
246
259
|
SHARED_SLS_PROJECT_ADOPTED: '采用当前应用已有的共享 SLS 项目 {{projectName}}',
|
|
247
260
|
REFRESH_CACHE_HIT: '刷新读缓存命中:{{key}}',
|
|
248
261
|
PLAN_FUNCTION_ROLE_MISSING: '函数 {{functionName}} 的角色 {{roleName}} 在云端不存在;部署时将重建并重新绑定',
|
|
249
|
-
PLAN_FUNCTION_ROLE_PROBE_FAILED: '函数 {{functionName}}(角色 {{roleName}})的实时角色策略检查失败:{{error}}
|
|
250
|
-
PLAN_FUNCTION_NESTED_PROBE_FAILED: '函数 {{functionName}} 的嵌套资源探测失败:{{error}}
|
|
262
|
+
PLAN_FUNCTION_ROLE_PROBE_FAILED: '函数 {{functionName}}(角色 {{roleName}})的实时角色策略检查失败:{{error}};计划已停止',
|
|
263
|
+
PLAN_FUNCTION_NESTED_PROBE_FAILED: '函数 {{functionName}} 的嵌套资源探测失败:{{error}};计划已停止',
|
|
251
264
|
NESTED_LOGSTORE_RECREATED: '日志库 {{logstoreName}} 被带外删除,正在重建',
|
|
252
265
|
NESTED_LOGSTORE_UPDATED: '日志库 {{logstoreName}} 属性已漂移,正在按 si 默认值更新',
|
|
253
266
|
NESTED_TLS_TOPIC_UPDATED: 'TLS 日志主题 {{topicId}} 的 ttl 已漂移,正在按 si 默认值更新',
|
|
@@ -868,6 +881,37 @@ exports.zhCN = {
|
|
|
868
881
|
EVENT_FLUSH_FAILED: '部署事件冲刷失败(部署 {{deploymentId}},{{count}} 条):{{error}}',
|
|
869
882
|
EVENT_REPLAY_FAILED: '事件队列文件 {{file}} 重放失败:{{error}}',
|
|
870
883
|
INVALID_HTTP_TRIGGER_AUTH_TYPE: "无效的 HTTP 触发器 auth_type '{{authType}}',必须为 'public' 或 'iam'",
|
|
884
|
+
// Timer trigger messages (issue #258)
|
|
885
|
+
TIMER_TRIGGER_NAME_REQUIRED: "函数 '{{functionName}}' 的定时触发器缺少必填字段 'name'",
|
|
886
|
+
TIMER_TRIGGER_CRON_REQUIRED: "定时触发器 '{{name}}' 缺少必填字段 'cron'",
|
|
887
|
+
TIMER_TRIGGER_DUPLICATE_NAME: "函数 '{{functionName}}' 存在重名的定时触发器 '{{name}}'",
|
|
888
|
+
TIMER_TRIGGER_LIMIT_EXCEEDED: "函数 '{{functionName}}' 配置了 {{count}} 个定时触发器,云平台 {{provider}} 同函数上限为 {{max}} 个",
|
|
889
|
+
SEMANTIC_TIMER_CRON_INVALID: "函数 '{{functionName}}' 的定时触发器 '{{name}}' cron 表达式 '{{cron}}' 非法:{{reason}}",
|
|
890
|
+
TIMER_TRIGGER_NOT_SUPPORTED_PROVIDER: "当前云平台 '{{provider}}' 暂不支持定时触发器",
|
|
891
|
+
TIMER_TRIGGER_PAYLOAD_NOT_SUPPORTED: "定时触发器 '{{name}}' 在云平台 {{provider}} 上不支持 'payload' 字段",
|
|
892
|
+
CREATING_TIMER_TRIGGER: "正在为函数 '{{functionName}}' 创建定时触发器 '{{triggerName}}'...",
|
|
893
|
+
TIMER_TRIGGER_CREATED: "定时触发器 '{{triggerName}}' 已为函数 '{{functionName}}' 创建成功",
|
|
894
|
+
UPDATING_TIMER_TRIGGER: "正在重新创建函数 '{{functionName}}' 的定时触发器 '{{triggerName}}'...",
|
|
895
|
+
DELETING_TIMER_TRIGGER: "正在删除函数 '{{functionName}}' 的定时触发器 '{{triggerName}}'...",
|
|
896
|
+
TIMER_TRIGGER_DELETED: "定时触发器 '{{triggerName}}' 已删除",
|
|
897
|
+
TIMER_TRIGGER_NOT_FOUND: "定时触发器 '{{triggerName}}' 在云平台中不存在,跳过删除",
|
|
898
|
+
TIMER_TRIGGER_ALREADY_ATTACHED: "定时触发器 '{{triggerName}}' 已挂在函数 '{{functionName}}' 上,跳过创建",
|
|
899
|
+
PLAN_DRIFT_TIMER_TRIGGER: '定时触发器与请求配置不同',
|
|
900
|
+
PLAN_TIMER_TRIGGER_PROBE_FAILED: "探测函数 '{{functionName}}' 的定时触发器失败:{{error}}",
|
|
901
|
+
// si-cron messages (issue #258)
|
|
902
|
+
SI_CRON_EMPTY: 'si-cron 表达式为空',
|
|
903
|
+
SI_CRON_WRONG_FIELD_COUNT: '应为 5 段(分 时 日 月 周)、带秒前缀的 6 段,或 @every <时长>;实际 {{count}} 段',
|
|
904
|
+
SI_CRON_FIELD_INVALID: "字段 '{{field}}' 存在非法值 '{{value}}'",
|
|
905
|
+
SI_CRON_FIELD_EMPTY: "字段 '{{field}}' 为空",
|
|
906
|
+
SI_CRON_FIELD_RANGE: "字段 '{{field}}' 的值 '{{value}}' 超出范围 {{min}}-{{max}}",
|
|
907
|
+
SI_CRON_STEP_INVALID: "字段 '{{field}}' 的步长 '{{step}}' 非法",
|
|
908
|
+
SI_CRON_RANGE_DESCENDING: "字段 '{{field}}' 的区间 '{{range}}' 起止倒置",
|
|
909
|
+
SI_CRON_EVERY_INVALID: "'@every {{duration}}' 不是合法时长;请使用形如 '30s'、'5m'、'1h'、'1d' 的写法",
|
|
910
|
+
SI_CRON_EVERY_NOT_EXPRESSIBLE: '该 @every 间隔无法表达为 {{dialect}} 的 cron;请使用能整除的时长(15s、30s、1m、5m、15m、30m、1h、2h、6h、12h、1d)',
|
|
911
|
+
SI_CRON_SHIFT_UNSUPPORTED: "cron '{{cron}}' 平移到 UTC+8 后会改变触发日期;请避免日/星期维度与 UTC 16 点及以后的整点组合跨月边界",
|
|
912
|
+
SI_CRON_SECONDS_UNSUPPORTED: "cron '{{cron}}' 含非零秒位,5 段 crontab 云平台不支持",
|
|
913
|
+
// Nested live-repair failures (issue #234 executor reconciles)
|
|
914
|
+
NESTED_REPAIR_FAILED: "修复嵌套资源 '{{resource}}' 失败:{{error}}",
|
|
871
915
|
// ===== Issue #251: previously hardcoded messages (now i18n) =====
|
|
872
916
|
UNSUPPORTED_PROVIDER: '不支持的 provider:{{provider}}',
|
|
873
917
|
FORCE_UNLOCK_NO_LOCATION_MODE: '无 location 模式不支持该操作',
|
|
@@ -877,6 +921,7 @@ exports.zhCN = {
|
|
|
877
921
|
SHOW_NO_RESOURCES: '状态中没有任何资源。',
|
|
878
922
|
SHOW_STATE_LOCATION: '状态文件位置:{{stateLocation}}',
|
|
879
923
|
SHOW_BACKEND_REMOTE: '后端:远端',
|
|
924
|
+
SHOW_BACKEND_SAAS: 'Console(SaaS 状态存储)',
|
|
880
925
|
SHOW_DEPLOY_HINT: '要部署资源,请执行:si deploy',
|
|
881
926
|
SHOW_HEADER_DEPLOYED: '已部署资源',
|
|
882
927
|
SHOW_CATEGORY_HEADER: '📦 {{label}}',
|
|
@@ -972,11 +1017,26 @@ exports.zhCN = {
|
|
|
972
1017
|
OTS_ATTRIBUTE_NOT_FOUND: '找不到 key 对应的属性:{{key}}',
|
|
973
1018
|
LOCAL_HANDLER_NOT_FOUND: '在 {{handlerPath}} 中找不到 Handler "{{handlerMethod}}",或它不是函数',
|
|
974
1019
|
LOCAL_EXECUTION_TIMEOUT: '函数执行超时({{timeoutMs}}ms)',
|
|
1020
|
+
LOCAL_FUNCTION_NOT_FOUND: '找不到函数',
|
|
1021
|
+
LOCAL_FUNCTION_CODE_MISSING: '找不到函数代码配置',
|
|
1022
|
+
LOCAL_FUNCTION_EXECUTION_FAILED: '函数执行失败',
|
|
1023
|
+
LOCAL_HTTP_PROVIDER_UNSUPPORTED: '不支持 provider {{provider}} 的本地 HTTP 调用',
|
|
1024
|
+
LOCAL_VOLCENGINE_MODE_UNSUPPORTED: '本地 veFaaS HTTP 调用仅支持 node14/v1 和 node20/v1 代码包(函数:{{functionName}})。暂不模拟容器、原生运行时及其他语言。',
|
|
1025
|
+
LOCAL_VOLCENGINE_BINARY_UNSUPPORTED: '本地 veFaaS HTTP 调用仅支持 UTF-8 请求体。暂不模拟包含无效 UTF-8 的二进制请求体,也不假定 base64 事件协议。',
|
|
1026
|
+
LOCAL_VOLCENGINE_INVALID_RESPONSE: '本地 veFaaS 响应无效:请返回对象,可包含整数 statusCode(200-599)、字符串值的 headers 和字符串 body。暂不模拟二进制响应。',
|
|
1027
|
+
LOCAL_EVENT_TYPE_UNSUPPORTED: '本地事件端点仅支持 API_GATEWAY 触发器。',
|
|
1028
|
+
LOCAL_SCF_EVENT_UNSUPPORTED: '本地 SCF 模拟覆盖函数所属的函数 URL,而非 API Gateway 事件(未部署腾讯云 API 网关)。请在 /si_functions/<function-key>/<path> 调用函数 URL。',
|
|
1029
|
+
LOCAL_SCF_MODE_UNSUPPORTED: '本地 SCF HTTP 调用仅支持 {{runtimes}} 代码包(函数:{{functionName}})。暂不模拟容器、Web 函数及其他语言。',
|
|
1030
|
+
LOCAL_SCF_BINARY_REQUEST_UNSUPPORTED: '本地 SCF HTTP 调用仅支持 UTF-8 请求体。函数 URL 事件不含 isBase64Encoded 字段,因此不模拟二进制请求体。',
|
|
1031
|
+
LOCAL_SCF_BINARY_RESPONSE_UNSUPPORTED: '本地 SCF 响应不支持二进制响应体:函数 URL 响应不含 isBase64Encoded 字段,因此不模拟 isBase64Encoded 响应。',
|
|
1032
|
+
LOCAL_SCF_INVALID_RESPONSE: '本地 SCF 响应无效:请返回字符串或 JSON 对象,或返回包含可选整数 statusCode(200-599)、字符串值 headers 与字符串 body 的对象。',
|
|
975
1033
|
LOCAL_PORT_CLOSED: '端口在收到响应前已关闭',
|
|
976
1034
|
LOCAL_WORKER_EXITED: 'Worker 退出,退出码 {{code}}',
|
|
977
1035
|
REFRESH_STATE_BUCKET: '刷新存储桶状态失败:{{name}}',
|
|
978
1036
|
RESOURCE_SPACE_ID_NOT_FOUND: '状态中不存在 Space ID:{{logicalId}}',
|
|
979
1037
|
REFRESH_STATE_ES_SPACE: '刷新 ES 空间状态失败:{{spaceId}}',
|
|
1038
|
+
IAM_POLICY_READ_INVALID: '策略 {{policyName}} 返回了无效的策略文档',
|
|
1039
|
+
SCF_HTTP_TRIGGER_ID_UNAVAILABLE: '无法记录函数 {{functionName}} 的云端 HTTP 触发器标识',
|
|
980
1040
|
SCF_HTTP_TRIGGER_ALREADY_ATTACHED: 'HTTP 触发器 {{triggerName}} 已绑定到 {{functionName}},跳过创建',
|
|
981
1041
|
SCF_HTTP_TRIGGER_ALREADY_EXISTS: 'HTTP 触发器 {{triggerName}} 在 {{functionName}} 上已存在,继续:{{error}}',
|
|
982
1042
|
SCF_HANDLER_IMMUTABLE: '腾讯云 SCF 的 Handler 不可变,无法在更新时修改({{oldHandler}} -> {{newHandler}})。请删除后重建函数。',
|
|
@@ -1032,4 +1092,11 @@ exports.zhCN = {
|
|
|
1032
1092
|
OPT_PARAMETER: '覆盖参数',
|
|
1033
1093
|
OPT_DEBUG: '开启调试模式',
|
|
1034
1094
|
OPT_WATCH: '开启文件监听',
|
|
1095
|
+
// ===== Issue #250: agent-friendly CLI surface =====
|
|
1096
|
+
CMD_SCHEMA_DESC: '导出用于校验的 IaC JSON Schema(draft-07,自包含)',
|
|
1097
|
+
OPT_SCHEMA_OUTPUT: '将 JSON Schema 写入指定文件而不是 stdout',
|
|
1098
|
+
OPT_JSON: '将结果以机器可读 JSON 输出到 stdout(日志保持在 stderr)',
|
|
1099
|
+
OPT_NO_COLOR: '禁用彩色输出(同时遵循 NO_COLOR 环境变量)',
|
|
1100
|
+
SCHEMA_WRITTEN_TO: 'JSON Schema 已写入:{{path}}',
|
|
1101
|
+
ERROR_CODE: '错误码:{{code}}',
|
|
1035
1102
|
};
|
|
@@ -4,6 +4,7 @@ exports.parseFunction = void 0;
|
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
const parseUtils_1 = require("./parseUtils");
|
|
6
6
|
const lang_1 = require("../lang");
|
|
7
|
+
const siCron_1 = require("../common/siCron");
|
|
7
8
|
const parseHttpTrigger = (raw, fnKey) => {
|
|
8
9
|
if (!raw)
|
|
9
10
|
return undefined;
|
|
@@ -19,6 +20,43 @@ const parseHttpTrigger = (raw, fnKey) => {
|
|
|
19
20
|
access: raw.access?.map(String),
|
|
20
21
|
};
|
|
21
22
|
};
|
|
23
|
+
const parseTimerTriggers = (raw, fnKey) => {
|
|
24
|
+
if (!raw || raw.length === 0) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
// template refs (${vars.cron}) resolve at runtime — grammar is checked after
|
|
28
|
+
const TEMPLATE_REF_PATTERN = /^\$\{[^}]+\}$/;
|
|
29
|
+
const timers = raw.map((item) => {
|
|
30
|
+
if (item.name === undefined || String(item.name).trim() === '') {
|
|
31
|
+
throw new Error(lang_1.lang.__('TIMER_TRIGGER_NAME_REQUIRED', { functionName: fnKey }));
|
|
32
|
+
}
|
|
33
|
+
const name = String(item.name);
|
|
34
|
+
if (item.cron === undefined || String(item.cron).trim() === '') {
|
|
35
|
+
throw new Error(lang_1.lang.__('TIMER_TRIGGER_CRON_REQUIRED', { name }));
|
|
36
|
+
}
|
|
37
|
+
const cron = String(item.cron);
|
|
38
|
+
if (!TEMPLATE_REF_PATTERN.test(cron)) {
|
|
39
|
+
(0, siCron_1.validateSiCron)(cron);
|
|
40
|
+
}
|
|
41
|
+
// empty strings normalize to unset — the provider reconcile treats '' and
|
|
42
|
+
// absent as the same, so keeping '' here would recreate the trigger on
|
|
43
|
+
// every deploy
|
|
44
|
+
const payload = item.payload !== undefined ? String(item.payload) : undefined;
|
|
45
|
+
const description = item.description !== undefined ? String(item.description) : undefined;
|
|
46
|
+
return {
|
|
47
|
+
name,
|
|
48
|
+
cron,
|
|
49
|
+
...(payload ? { payload } : {}),
|
|
50
|
+
enable: (0, parseUtils_1.parseBooleanWithDefault)(item.enable, true),
|
|
51
|
+
...(description ? { description } : {}),
|
|
52
|
+
};
|
|
53
|
+
});
|
|
54
|
+
const duplicate = timers.find((timer, index) => timers.findIndex((peer) => peer.name === timer.name) !== index);
|
|
55
|
+
if (duplicate) {
|
|
56
|
+
throw new Error(lang_1.lang.__('TIMER_TRIGGER_DUPLICATE_NAME', { name: duplicate.name, functionName: fnKey }));
|
|
57
|
+
}
|
|
58
|
+
return timers;
|
|
59
|
+
};
|
|
22
60
|
const parseDomain = (raw) => {
|
|
23
61
|
if (!raw)
|
|
24
62
|
return undefined;
|
|
@@ -34,6 +72,7 @@ const parseFunction = (functions) => {
|
|
|
34
72
|
}
|
|
35
73
|
return Object.entries(functions).map(([key, func]) => {
|
|
36
74
|
const httpTrigger = parseHttpTrigger(func.triggers?.http, key);
|
|
75
|
+
const timerTriggers = parseTimerTriggers(func.triggers?.timer, key);
|
|
37
76
|
const domain = parseDomain(func.domain);
|
|
38
77
|
return {
|
|
39
78
|
key,
|
|
@@ -90,7 +129,7 @@ const parseFunction = (functions) => {
|
|
|
90
129
|
}
|
|
91
130
|
: undefined,
|
|
92
131
|
environment: func.environment,
|
|
93
|
-
log: (0, parseUtils_1.
|
|
132
|
+
log: (0, parseUtils_1.parseBooleanWithDefault)(func.log, false),
|
|
94
133
|
network: func.network,
|
|
95
134
|
storage: {
|
|
96
135
|
disk: (0, parseUtils_1.parseNumber)(func.storage?.disk),
|
|
@@ -99,7 +138,14 @@ const parseFunction = (functions) => {
|
|
|
99
138
|
storage_class: nasItem.storage_class,
|
|
100
139
|
})),
|
|
101
140
|
},
|
|
102
|
-
...(httpTrigger
|
|
141
|
+
...(httpTrigger || timerTriggers
|
|
142
|
+
? {
|
|
143
|
+
triggers: {
|
|
144
|
+
...(httpTrigger ? { http: httpTrigger } : {}),
|
|
145
|
+
...(timerTriggers ? { timer: timerTriggers } : {}),
|
|
146
|
+
},
|
|
147
|
+
}
|
|
148
|
+
: {}),
|
|
103
149
|
...(domain ? { domain } : {}),
|
|
104
150
|
};
|
|
105
151
|
});
|
|
@@ -28,7 +28,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, resolveR
|
|
|
28
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
|
-
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, resolveRoleArn, currentState);
|
|
31
|
+
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, resolveRoleArn, currentState, { repairDomain: item.driftReasons?.includes('PLAN_DRIFT_EVENT_DOMAIN') });
|
|
32
32
|
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'API Gateway resources', name: event.name }));
|
|
33
33
|
return newState;
|
|
34
34
|
}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateApigwPlan = void 0;
|
|
4
|
+
const certUtils_1 = require("../../common/certUtils");
|
|
5
|
+
const domainUtils_1 = require("../../common/domainUtils");
|
|
6
|
+
const planCapabilities_1 = require("../../common/planCapabilities");
|
|
7
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
4
8
|
const aliyunClient_1 = require("../../common/aliyunClient");
|
|
5
9
|
const logger_1 = require("../../common/logger");
|
|
6
10
|
const apigwTypes_1 = require("./apigwTypes");
|
|
7
11
|
const stateManager_1 = require("../../common/stateManager");
|
|
8
|
-
const hashUtils_1 = require("../../common/hashUtils");
|
|
9
12
|
const iacHelper_1 = require("../../common/iacHelper");
|
|
10
|
-
const
|
|
13
|
+
const planCompare_2 = require("../../common/planCompare");
|
|
11
14
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
12
15
|
const concurrency_1 = require("../../common/concurrency");
|
|
13
16
|
const ownershipTag_1 = require("../ownershipTag");
|
|
@@ -62,6 +65,8 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
62
65
|
domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
|
|
63
66
|
...(logSnapshot ? { log: logSnapshot } : {}),
|
|
64
67
|
};
|
|
68
|
+
if (currentState)
|
|
69
|
+
(0, planCapabilities_1.assertPlanIdentity)(logicalId, 'ALIYUN_APIGW', currentState.definition || {}, desiredDefinition);
|
|
65
70
|
if (!currentState || currentState.status === 'tainted') {
|
|
66
71
|
// No usable local state: probe the provider before planning create.
|
|
67
72
|
// If a same-named group already exists WITHOUT our ownership tag it
|
|
@@ -99,9 +104,23 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
99
104
|
try {
|
|
100
105
|
const groupInstance = currentState.instances.find((i) => i.type === 'ALIYUN_APIGW_GROUP');
|
|
101
106
|
const currentDefinition = currentState.definition || {};
|
|
102
|
-
const definitionChanged =
|
|
107
|
+
const definitionChanged = (0, planCompare_1.definitionsDiffer)(currentDefinition, desiredDefinition);
|
|
108
|
+
if (context.refresh === false) {
|
|
109
|
+
return definitionChanged
|
|
110
|
+
? {
|
|
111
|
+
logicalId,
|
|
112
|
+
action: 'update',
|
|
113
|
+
resourceType: 'ALIYUN_APIGW',
|
|
114
|
+
changes: {
|
|
115
|
+
before: (0, planCompare_1.managedDefinition)(currentDefinition, desiredDefinition),
|
|
116
|
+
after: (0, planCompare_1.managedDefinition)(desiredDefinition),
|
|
117
|
+
},
|
|
118
|
+
}
|
|
119
|
+
: { logicalId, action: 'noop', resourceType: 'ALIYUN_APIGW' };
|
|
120
|
+
}
|
|
103
121
|
let groupRemoteDiffers = false;
|
|
104
122
|
let triggersDiffer = false;
|
|
123
|
+
let domainDiffers = false;
|
|
105
124
|
// Issue #246: live group attributes become the diff baseline when the
|
|
106
125
|
// group was readable; trigger-level drift has no attribute mapping and
|
|
107
126
|
// is surfaced as a drift reason instead.
|
|
@@ -118,14 +137,59 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
118
137
|
drifted: true,
|
|
119
138
|
};
|
|
120
139
|
}
|
|
121
|
-
// Issue #234 Phase 1: a local config change already forces update, so
|
|
122
|
-
// the live cloud is only probed when state == config — a console edit
|
|
123
|
-
// to the group/trigger then surfaces as update + drifted, and a read
|
|
124
|
-
// failure cannot degrade a config-driven update into a create.
|
|
125
|
-
// Domain/log stay existence-only in Phase 0-2 — never compared live.
|
|
126
140
|
liveGroupAttrs = (0, apigwTypes_1.cloudApigwGroupToDefinition)(remoteGroup);
|
|
127
|
-
if (
|
|
128
|
-
|
|
141
|
+
if (event.domain &&
|
|
142
|
+
desiredDefinition.domain?.cdnEnabled !== true &&
|
|
143
|
+
remoteGroup.customDomains !== undefined) {
|
|
144
|
+
const names = [
|
|
145
|
+
String(event.domain.domain_name),
|
|
146
|
+
...(event.domain.www_bind_apex === true
|
|
147
|
+
? [(0, domainUtils_1.deriveWwwDomain)(String(event.domain.domain_name))].filter((name) => name !== null)
|
|
148
|
+
: []),
|
|
149
|
+
];
|
|
150
|
+
const expectedRedirect = (0, apigwTypes_1.inferProtocolConfig)(event.domain.protocol)
|
|
151
|
+
.isHttpRedirectToHttps ?? false;
|
|
152
|
+
const desiredCertificate = event.domain.certificate_id
|
|
153
|
+
? (await (0, refreshCache_1.cachedRefreshRead)(context, `cas.getCertificate:${event.domain.certificate_id}`, () => client.cas.getCertificate(String(event.domain.certificate_id))))?.cert
|
|
154
|
+
: event.domain.certificate_body
|
|
155
|
+
? (0, certUtils_1.readPemContent)(String(event.domain.certificate_body))
|
|
156
|
+
: undefined;
|
|
157
|
+
if (event.domain.certificate_id && !desiredCertificate)
|
|
158
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', {
|
|
159
|
+
reference: String(event.domain.certificate_id),
|
|
160
|
+
}));
|
|
161
|
+
const certificateValue = (value) => (value ?? '').replace(/\s/g, '');
|
|
162
|
+
for (const name of names) {
|
|
163
|
+
const summary = remoteGroup.customDomains.find((domain) => domain.domainName === name);
|
|
164
|
+
if (!summary) {
|
|
165
|
+
domainDiffers = true;
|
|
166
|
+
continue;
|
|
167
|
+
}
|
|
168
|
+
if (expectedRedirect !== undefined &&
|
|
169
|
+
summary.isHttpRedirectToHttps !== undefined &&
|
|
170
|
+
expectedRedirect !== summary.isHttpRedirectToHttps)
|
|
171
|
+
domainDiffers = true;
|
|
172
|
+
if (desiredCertificate) {
|
|
173
|
+
const detail = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getDomain:${groupInstance.id}:${name}`, () => client.apigw.getDomain(groupInstance.id, name));
|
|
174
|
+
if (!detail ||
|
|
175
|
+
certificateValue(detail.certificateBody) !== certificateValue(desiredCertificate))
|
|
176
|
+
domainDiffers = true;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
const cloudDomain = remoteGroup.customDomains.find((domain) => domain.domainName === event.domain.domain_name);
|
|
180
|
+
liveGroupAttrs.domain = cloudDomain
|
|
181
|
+
? {
|
|
182
|
+
...currentDefinition.domain,
|
|
183
|
+
domainName: cloudDomain.domainName,
|
|
184
|
+
}
|
|
185
|
+
: null;
|
|
186
|
+
}
|
|
187
|
+
if (event.log) {
|
|
188
|
+
const log = await (0, refreshCache_1.cachedRefreshRead)(context, 'apigw.describeGatewayLogConfig', () => client.apigw.describeGatewayLogConfig());
|
|
189
|
+
liveGroupAttrs.log = (0, apigwTypes_1.cloudGatewayLogToLogConfig)(log) ?? { logEnabled: false };
|
|
190
|
+
}
|
|
191
|
+
{
|
|
192
|
+
groupRemoteDiffers = (0, planCompare_2.remoteDiffersFromDesired)(liveGroupAttrs, desiredDefinition);
|
|
129
193
|
if (event.triggers.length > 0) {
|
|
130
194
|
const desiredApis = new Map(event.triggers.map((trigger) => {
|
|
131
195
|
const apiName = buildDesiredTriggerApiName(event, trigger, context.stage);
|
|
@@ -169,19 +233,41 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
169
233
|
}
|
|
170
234
|
}
|
|
171
235
|
}
|
|
172
|
-
|
|
236
|
+
const effectiveChanged = (0, planCompare_1.definitionsDiffer)((0, planCompare_2.mergeLiveBefore)(currentDefinition, liveGroupAttrs ?? {}, desiredDefinition), desiredDefinition);
|
|
237
|
+
if (definitionChanged && !effectiveChanged && !triggersDiffer && !domainDiffers) {
|
|
238
|
+
return {
|
|
239
|
+
logicalId,
|
|
240
|
+
action: 'noop',
|
|
241
|
+
resourceType: 'ALIYUN_APIGW',
|
|
242
|
+
stateUpdate: desiredDefinition,
|
|
243
|
+
};
|
|
244
|
+
}
|
|
245
|
+
if (effectiveChanged || groupRemoteDiffers || triggersDiffer || domainDiffers) {
|
|
173
246
|
return {
|
|
174
247
|
logicalId,
|
|
175
248
|
action: 'update',
|
|
176
249
|
resourceType: 'ALIYUN_APIGW',
|
|
177
250
|
changes: {
|
|
178
251
|
before: liveGroupAttrs
|
|
179
|
-
? (0,
|
|
180
|
-
: currentDefinition,
|
|
181
|
-
after: desiredDefinition,
|
|
252
|
+
? (0, planCompare_2.mergeLiveBefore)(currentDefinition, liveGroupAttrs, desiredDefinition)
|
|
253
|
+
: (0, planCompare_1.managedDefinition)(currentDefinition, desiredDefinition),
|
|
254
|
+
after: (0, planCompare_1.managedDefinition)(desiredDefinition),
|
|
182
255
|
},
|
|
183
|
-
|
|
184
|
-
|
|
256
|
+
...((0, planCompare_2.remoteDiffersFromDesired)(liveGroupAttrs ?? {}, currentDefinition) ||
|
|
257
|
+
(domainDiffers &&
|
|
258
|
+
!(0, planCompare_1.definitionsDiffer)({ domain: currentDefinition.domain }, { domain: desiredDefinition.domain })) ||
|
|
259
|
+
(triggersDiffer &&
|
|
260
|
+
!(0, planCompare_1.definitionsDiffer)(currentDefinition, { triggers: desiredDefinition.triggers }))
|
|
261
|
+
? { drifted: true }
|
|
262
|
+
: {}),
|
|
263
|
+
...(triggersDiffer || domainDiffers
|
|
264
|
+
? {
|
|
265
|
+
driftReasons: [
|
|
266
|
+
...(triggersDiffer ? ['PLAN_DRIFT_TRIGGERS'] : []),
|
|
267
|
+
...(domainDiffers ? ['PLAN_DRIFT_EVENT_DOMAIN'] : []),
|
|
268
|
+
],
|
|
269
|
+
}
|
|
270
|
+
: {}),
|
|
185
271
|
};
|
|
186
272
|
}
|
|
187
273
|
return { logicalId, action: 'noop', resourceType: 'ALIYUN_APIGW' };
|
|
@@ -191,13 +277,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
191
277
|
logicalId,
|
|
192
278
|
error: error instanceof Error ? error.message : String(error),
|
|
193
279
|
}));
|
|
194
|
-
|
|
195
|
-
logicalId,
|
|
196
|
-
action: 'create',
|
|
197
|
-
resourceType: 'ALIYUN_APIGW',
|
|
198
|
-
changes: { before: currentState.definition, after: desiredDefinition },
|
|
199
|
-
drifted: true,
|
|
200
|
-
};
|
|
280
|
+
throw error;
|
|
201
281
|
}
|
|
202
282
|
});
|
|
203
283
|
// Find resources in state that are no longer in config
|
|
@@ -369,7 +369,7 @@ const buildDomainBindingConfig = async (domain, groupId, serviceName, eventKey,
|
|
|
369
369
|
return {
|
|
370
370
|
groupId,
|
|
371
371
|
domainName: domain.domain_name,
|
|
372
|
-
isHttpRedirectToHttps: protocolConfig.isHttpRedirectToHttps,
|
|
372
|
+
isHttpRedirectToHttps: protocolConfig.isHttpRedirectToHttps ?? false,
|
|
373
373
|
...certConfig,
|
|
374
374
|
};
|
|
375
375
|
};
|
|
@@ -596,7 +596,7 @@ const readApigwResourceByName = async (context, groupName) => {
|
|
|
596
596
|
return await client.apigw.findApiGroupByName(groupName);
|
|
597
597
|
};
|
|
598
598
|
exports.readApigwResourceByName = readApigwResourceByName;
|
|
599
|
-
const updateApigwResource = async (context, event, serviceName, resolveRoleArn, state) => {
|
|
599
|
+
const updateApigwResource = async (context, event, serviceName, resolveRoleArn, state, options) => {
|
|
600
600
|
const logicalId = `events.${event.key}`;
|
|
601
601
|
const existingState = (0, stateManager_1.getResource)(state, logicalId);
|
|
602
602
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
@@ -782,7 +782,8 @@ const updateApigwResource = async (context, event, serviceName, resolveRoleArn,
|
|
|
782
782
|
Object.keys(state.resources ?? {}).some((k) => k.startsWith(`${logicalId}.dns_`) &&
|
|
783
783
|
k !== `${logicalId}.dns_verification` &&
|
|
784
784
|
k !== `${logicalId}.dns_txt_verification`);
|
|
785
|
-
if (
|
|
785
|
+
if (!options?.repairDomain &&
|
|
786
|
+
previousDomainDef &&
|
|
786
787
|
desiredDomainDef &&
|
|
787
788
|
hasBoundDomains &&
|
|
788
789
|
(0, hashUtils_1.attributesEqual)(previousDomainDef, desiredDomainDef)) {
|
|
@@ -239,17 +239,13 @@ const extractEventDomainDefinition = (domain) => {
|
|
|
239
239
|
certificateId: domain.certificate_id ?? null,
|
|
240
240
|
certificateBody: domain.certificate_body ?? null,
|
|
241
241
|
certificatePrivateKey: domain.certificate_private_key ? '(managed)' : null,
|
|
242
|
-
protocol: domain.protocol ??
|
|
242
|
+
protocol: domain.protocol ?? 'HTTP',
|
|
243
243
|
};
|
|
244
244
|
const cdnConfig = getDomainCdnConfig(domain);
|
|
245
245
|
if (cdnConfig?.enabled === true) {
|
|
246
246
|
definition.cdnEnabled = true;
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
}
|
|
250
|
-
if (cdnConfig.scope != null) {
|
|
251
|
-
definition.cdnScope = cdnConfig.scope;
|
|
252
|
-
}
|
|
247
|
+
definition.cdnType = cdnConfig.cdn_type ?? 'web';
|
|
248
|
+
definition.cdnScope = cdnConfig.scope ?? 'global';
|
|
253
249
|
if (cdnConfig.cache_ttl != null) {
|
|
254
250
|
definition.cdnCacheTtl = cdnConfig.cache_ttl;
|
|
255
251
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deployAliyunStack = exports.buildRoleArnResolver = void 0;
|
|
4
|
+
const refreshPlanner_1 = require("../../common/refreshPlanner");
|
|
4
5
|
const common_1 = require("../../common");
|
|
5
6
|
const lang_1 = require("../../lang");
|
|
6
7
|
const fc3Planner_1 = require("./fc3Planner");
|
|
@@ -110,6 +111,7 @@ const deployAliyunStack = async (iac, backend, approvedPlan) => {
|
|
|
110
111
|
...tablePlan.items,
|
|
111
112
|
...eventPlan.items,
|
|
112
113
|
];
|
|
114
|
+
state = (0, refreshPlanner_1.applyPlanStateUpdates)(state, allItems);
|
|
113
115
|
// Build dependency graph for validation (e.g. cycle detection) and logging
|
|
114
116
|
const dependencyInfo = (0, common_1.getDependencyInfo)(allItems);
|
|
115
117
|
if (dependencyInfo.cycleError) {
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.cloudEsToDefinition = exports.extractEsDefinition = exports.databaseToEsConfig = void 0;
|
|
7
|
+
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
4
8
|
const lang_1 = require("../../lang");
|
|
5
9
|
// Map database versions to ES versions
|
|
6
10
|
const esVersionMap = new Map([
|
|
@@ -88,10 +92,10 @@ const extractEsDefinition = (config) => {
|
|
|
88
92
|
appVersion: config.appVersion,
|
|
89
93
|
authentication: config.authentication
|
|
90
94
|
? {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
+
fingerprint: node_crypto_1.default
|
|
96
|
+
.createHash('sha256')
|
|
97
|
+
.update(JSON.stringify(config.authentication))
|
|
98
|
+
.digest('hex'),
|
|
95
99
|
}
|
|
96
100
|
: null,
|
|
97
101
|
quotaInfo: config.quotaInfo
|
|
@@ -13,11 +13,15 @@ const executeCreateAction = async (context, fn, currentState) => {
|
|
|
13
13
|
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'function', name: fn.name }));
|
|
14
14
|
return newState;
|
|
15
15
|
};
|
|
16
|
-
const executeUpdateAction = async (context, fn, currentState, drifted) => {
|
|
16
|
+
const executeUpdateAction = async (context, fn, currentState, drifted, driftReasons) => {
|
|
17
17
|
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
18
18
|
// A drifted plan item means the cloud left the config: force the config
|
|
19
19
|
// re-push even when state-vs-desired sees no change.
|
|
20
|
-
const newState = await (0, fc3Resource_1.updateResource)(context, fn, currentState, {
|
|
20
|
+
const newState = await (0, fc3Resource_1.updateResource)(context, fn, currentState, {
|
|
21
|
+
force: drifted === true,
|
|
22
|
+
...(driftReasons?.includes('PLAN_DRIFT_HTTP_TRIGGER') ? { repairHttp: true } : {}),
|
|
23
|
+
...(driftReasons?.includes('PLAN_DRIFT_FUNCTION_DOMAIN') ? { repairDomain: true } : {}),
|
|
24
|
+
});
|
|
21
25
|
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'function', name: fn.name }));
|
|
22
26
|
return newState;
|
|
23
27
|
};
|
|
@@ -44,7 +48,7 @@ const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
|
44
48
|
if (!fn) {
|
|
45
49
|
throw new Error(lang_1.lang.__('RESOURCE_FUNCTION_NOT_FOUND', { logicalId: item.logicalId }));
|
|
46
50
|
}
|
|
47
|
-
return executeUpdateAction(context, fn, currentState, item.drifted);
|
|
51
|
+
return executeUpdateAction(context, fn, currentState, item.drifted, item.driftReasons);
|
|
48
52
|
}
|
|
49
53
|
case 'delete': {
|
|
50
54
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|