@geek-fun/serverlessinsight 0.8.6 → 0.8.7
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-deploy-app-insight-poc-deploy.json.backup +19 -19
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +11 -11
- package/AGENTS.md +29 -0
- package/dist/package.json +1 -1
- package/dist/src/common/aliyunClient/ramOperations.js +104 -15
- package/dist/src/common/iacHelper.js +3 -1
- package/dist/src/common/iamStatements.js +21 -1
- package/dist/src/common/nameBuilder.js +12 -1
- package/dist/src/common/tencentClient/camOperations.js +24 -12
- package/dist/src/common/volcengineClient/iamOperations.js +15 -11
- package/dist/src/lang/en.js +7 -0
- package/dist/src/lang/zh-CN.js +6 -0
- package/dist/src/stack/aliyunStack/apigwExecutor.js +5 -5
- package/dist/src/stack/aliyunStack/apigwResource.js +10 -8
- package/dist/src/stack/aliyunStack/apigwTypes.js +20 -5
- package/dist/src/stack/aliyunStack/deployer.js +33 -3
- package/dist/src/stack/aliyunStack/fc3Resource.js +172 -18
- package/dist/src/stack/aliyunStack/sharedLogProject.js +22 -5
- package/dist/src/stack/scfStack/scfPlanner.js +1 -1
- package/dist/src/stack/scfStack/scfResource.js +72 -10
- package/dist/src/stack/scfStack/sharedLogset.js +9 -1
- package/dist/src/stack/volcengineStack/apigwPlanner.js +5 -1
- package/dist/src/stack/volcengineStack/apigwResource.js +52 -30
- package/dist/src/stack/volcengineStack/apigwTypes.js +18 -7
- package/dist/src/stack/volcengineStack/sharedLogProject.js +9 -3
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +5 -4
- package/dist/src/stack/volcengineStack/vefaasResource.js +74 -10
- package/dist/src/stack/volcengineStack/vefaasTypes.js +61 -7
- package/dist/src/validator/semanticValidation.js +41 -0
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createIamOperations = void 0;
|
|
4
4
|
const iamStatements_1 = require("../iamStatements");
|
|
5
|
+
const nameBuilder_1 = require("../nameBuilder");
|
|
5
6
|
const logger_1 = require("../logger");
|
|
6
7
|
const lang_1 = require("../../lang");
|
|
7
8
|
const DEFAULT_TRUST_POLICY_SERVICES = ['vefaas'];
|
|
@@ -54,8 +55,11 @@ const mapToVolcengineStatement = (stmt) => {
|
|
|
54
55
|
}
|
|
55
56
|
return result;
|
|
56
57
|
};
|
|
57
|
-
const buildExecutionPolicy = (customStatements) => {
|
|
58
|
-
const
|
|
58
|
+
const buildExecutionPolicy = (baseline, customStatements) => {
|
|
59
|
+
const nativeBaseline = baseline
|
|
60
|
+
? baseline.map(mapToVolcengineStatement)
|
|
61
|
+
: VEFAAS_EXECUTION_STATEMENTS;
|
|
62
|
+
const merged = (0, iamStatements_1.mergePolicyStatements)(nativeBaseline, customStatements, mapToVolcengineStatement);
|
|
59
63
|
return (0, iamStatements_1.buildPolicyDocument)(merged);
|
|
60
64
|
};
|
|
61
65
|
// TagResources expects flat numbered query params (ResourceIds.1, Tags.1.Key, ...).
|
|
@@ -69,8 +73,8 @@ const buildTagResourceQuery = (roleName, tags) => {
|
|
|
69
73
|
}, { ResourceType: 'role', 'ResourceIds.1': roleName });
|
|
70
74
|
};
|
|
71
75
|
const createIamOperations = (iamClient) => {
|
|
72
|
-
const createAndAttachPolicy = async (roleName, customStatements) => {
|
|
73
|
-
const policyName =
|
|
76
|
+
const createAndAttachPolicy = async (roleName, baseline, customStatements) => {
|
|
77
|
+
const policyName = (0, nameBuilder_1.buildRolePolicyName)(roleName);
|
|
74
78
|
try {
|
|
75
79
|
await iamClient.fetchOpenAPI({
|
|
76
80
|
Action: 'CreatePolicy',
|
|
@@ -79,7 +83,7 @@ const createIamOperations = (iamClient) => {
|
|
|
79
83
|
headers: { 'content-type': 'application/json' },
|
|
80
84
|
query: {
|
|
81
85
|
PolicyName: policyName,
|
|
82
|
-
PolicyDocument: buildExecutionPolicy(customStatements),
|
|
86
|
+
PolicyDocument: buildExecutionPolicy(baseline, customStatements),
|
|
83
87
|
Description: `veFaaS execution policy for ${roleName}`,
|
|
84
88
|
},
|
|
85
89
|
});
|
|
@@ -136,7 +140,7 @@ const createIamOperations = (iamClient) => {
|
|
|
136
140
|
return policyName;
|
|
137
141
|
};
|
|
138
142
|
const detachAndDeletePolicy = async (roleName) => {
|
|
139
|
-
const policyName =
|
|
143
|
+
const policyName = (0, nameBuilder_1.buildRolePolicyName)(roleName);
|
|
140
144
|
try {
|
|
141
145
|
await iamClient.fetchOpenAPI({
|
|
142
146
|
Action: 'DetachRolePolicy',
|
|
@@ -261,7 +265,7 @@ const createIamOperations = (iamClient) => {
|
|
|
261
265
|
});
|
|
262
266
|
const data = (response.Result || {});
|
|
263
267
|
const roleData = (data.Role || {});
|
|
264
|
-
const policyName = await createAndAttachPolicy(roleName, customStatements);
|
|
268
|
+
const policyName = await createAndAttachPolicy(roleName, config.executionStatements, customStatements);
|
|
265
269
|
if (config.managedPolicies && config.managedPolicies.length > 0) {
|
|
266
270
|
for (const policyArn of config.managedPolicies) {
|
|
267
271
|
await attachRolePolicyImpl(roleName, policyArn, 'System');
|
|
@@ -302,7 +306,7 @@ const createIamOperations = (iamClient) => {
|
|
|
302
306
|
TrustPolicyDocument: trustPolicyDocument,
|
|
303
307
|
},
|
|
304
308
|
});
|
|
305
|
-
const policyName = await createAndAttachPolicy(roleName);
|
|
309
|
+
const policyName = await createAndAttachPolicy(roleName, config.executionStatements, config.customStatements);
|
|
306
310
|
if (config.managedPolicies && config.managedPolicies.length > 0) {
|
|
307
311
|
for (const policyArn of config.managedPolicies) {
|
|
308
312
|
await attachRolePolicyImpl(roleName, policyArn, 'System');
|
|
@@ -355,7 +359,7 @@ const createIamOperations = (iamClient) => {
|
|
|
355
359
|
createdTime: roleData.CreateTime,
|
|
356
360
|
maxSessionDuration: roleData.MaxSessionDuration,
|
|
357
361
|
trustPolicyDocument: roleData.TrustPolicyDocument,
|
|
358
|
-
policyName:
|
|
362
|
+
policyName: (0, nameBuilder_1.buildRolePolicyName)(roleName),
|
|
359
363
|
};
|
|
360
364
|
}
|
|
361
365
|
catch (error) {
|
|
@@ -425,9 +429,9 @@ const createIamOperations = (iamClient) => {
|
|
|
425
429
|
detachRolePolicy: async (roleName, policyName) => {
|
|
426
430
|
await detachRolePolicyImpl(roleName, policyName);
|
|
427
431
|
},
|
|
428
|
-
updateRolePolicy: async (roleName, customStatements) => {
|
|
432
|
+
updateRolePolicy: async (roleName, baseline, customStatements) => {
|
|
429
433
|
await detachAndDeletePolicy(roleName);
|
|
430
|
-
await createAndAttachPolicy(roleName, customStatements);
|
|
434
|
+
await createAndAttachPolicy(roleName, baseline, customStatements);
|
|
431
435
|
logger_1.logger.info(lang_1.lang.__('IAM_ROLE_POLICY_UPDATED', { roleName }));
|
|
432
436
|
},
|
|
433
437
|
listAttachedRolePolicies: async (roleName) => {
|
package/dist/src/lang/en.js
CHANGED
|
@@ -413,6 +413,10 @@ exports.en = {
|
|
|
413
413
|
SEMANTIC_DUPLICATE_GENERATED_API_NAME: 'Generated API Gateway apiName "{{apiName}}" collides between "{{firstPath}}" and "{{secondPath}}" in this deployment; shorten the event name or differentiate trigger method/path',
|
|
414
414
|
SEMANTIC_DUPLICATE_ROUTE_NAME: 'Generated API Gateway route name "{{routeName}}" collides between "{{firstPath}}" and "{{secondPath}}" in this deployment; shorten the event name or differentiate trigger method/path',
|
|
415
415
|
SEMANTIC_UNRESOLVED_FUNCTION_BACKEND: 'Trigger backend "{{reference}}" in event "{{eventKey}}" does not match any function definition in the configuration',
|
|
416
|
+
SEMANTIC_BACKEND_BARE_KEY: 'Trigger backend "{{backend}}" in event "{{eventKey}}" matches function key "{{key}}", but bare backend values must be deployed function names. For template functions use the reference form "${functions.{{key}}}"',
|
|
417
|
+
SEMANTIC_BACKEND_BARE_NAME: 'Trigger backend "{{backend}}" in event "{{eventKey}}" resolves to template function "{{key}}" by name; prefer the reference form "${functions.{{key}}}"',
|
|
418
|
+
EXTERNAL_FUNCTION_NOT_FOUND_VOLCENGINE: 'Backend "{{backendRef}}" is not defined in this template and no deployed veFaaS function with that name exists in the provider. External backends must exist in the same account and region',
|
|
419
|
+
EXTERNAL_FUNCTION_BACKEND: 'Backend "{{backendRef}}" is not defined in this template; treating it as an external deployed function name',
|
|
416
420
|
// Show command messages
|
|
417
421
|
LOADING_STATE_FOR: 'Loading state for app: {{app}}, service: {{service}}, stage: {{stage}}...',
|
|
418
422
|
NO_RESOURCES_FOUND: 'No resources found in state.',
|
|
@@ -492,6 +496,8 @@ exports.en = {
|
|
|
492
496
|
RAM_ROLE_DRIFT_RECOVERY_FAILED: 'Failed to recover from RAM role state drift for "{{roleName}}": {{error}}. ' +
|
|
493
497
|
'The role existed in the cloud but recovery operations failed. ' +
|
|
494
498
|
'To fix: manually verify the role in the cloud console, remove it from state, and redeploy.',
|
|
499
|
+
RAM_POLICY_VERSION_PRUNE_FAILED: 'Failed to prune old policy versions for "{{policyName}}": {{error}}. ' +
|
|
500
|
+
'The policy may exceed the version limit on the next update.',
|
|
495
501
|
// Certificate messages
|
|
496
502
|
CERT_INVALID_CONFIGURATION: 'Certificate "{{name}}" must have either (certificate_body + private_key) or certificate_id, but not both',
|
|
497
503
|
CERT_FILE_NOT_FOUND: 'Certificate file not found: {{filePath}}',
|
|
@@ -648,6 +654,7 @@ exports.en = {
|
|
|
648
654
|
TENCENT_CAM_ROLE_DELETED: 'Tencent CAM role {{roleName}} deleted',
|
|
649
655
|
TENCENT_CAM_ROLE_NOT_FOUND: 'Tencent CAM role {{roleName}} not found in cloud provider',
|
|
650
656
|
TENCENT_CAM_ROLE_ALREADY_EXISTS: 'Tencent CAM role {{roleName}} already exists',
|
|
657
|
+
TENCENT_UIN_FETCH_FAILED: 'Failed to fetch the Tencent UIN; function invoke permissions fall back to a wildcard resource: {{error}}',
|
|
651
658
|
TENCENT_CAM_ROLE_DRIFT_RECOVERY_FAILED: 'Tencent CAM role drift recovery failed for {{roleName}}: {{error}}',
|
|
652
659
|
TENCENT_CAM_POLICY_ALREADY_ATTACHED: 'Policy already attached to CAM role {{roleName}}',
|
|
653
660
|
TENCENT_CAM_POLICY_ALREADY_EXISTS: 'Tencent CAM policy already exists',
|
package/dist/src/lang/zh-CN.js
CHANGED
|
@@ -410,6 +410,10 @@ exports.zhCN = {
|
|
|
410
410
|
SEMANTIC_DUPLICATE_GENERATED_API_NAME: '生成的 API Gateway apiName "{{apiName}}" 在 "{{firstPath}}" 与 "{{secondPath}}" 之间发生冲突;请缩短事件名称或区分触发器的 method/path',
|
|
411
411
|
SEMANTIC_DUPLICATE_ROUTE_NAME: '生成的 API Gateway route name "{{routeName}}" 在 "{{firstPath}}" 与 "{{secondPath}}" 之间发生冲突;请缩短事件名称或区分触发器的 method/path',
|
|
412
412
|
SEMANTIC_UNRESOLVED_FUNCTION_BACKEND: '事件 "{{eventKey}}" 的触发器后端 "{{reference}}" 未匹配到配置中的任何函数定义',
|
|
413
|
+
SEMANTIC_BACKEND_BARE_KEY: '事件 "{{eventKey}}" 的触发器后端 "{{backend}}" 匹配的是函数 key "{{key}}",但裸值必须是已部署函数名。模板函数请使用引用形式 "${functions.{{key}}}"',
|
|
414
|
+
SEMANTIC_BACKEND_BARE_NAME: '事件 "{{eventKey}}" 的触发器后端 "{{backend}}" 按名称解析为模板函数 "{{key}}",建议使用引用形式 "${functions.{{key}}}"',
|
|
415
|
+
EXTERNAL_FUNCTION_NOT_FOUND_VOLCENGINE: '后端 "{{backendRef}}" 未在本模板中定义,且提供商中不存在同名已部署 veFaaS 函数。外部后端必须位于同一账号和区域',
|
|
416
|
+
EXTERNAL_FUNCTION_BACKEND: '后端 "{{backendRef}}" 未在当前模板中定义,将按外部已部署函数名处理',
|
|
413
417
|
// Show command messages
|
|
414
418
|
LOADING_STATE_FOR: '正在加载应用 {{app}}、服务 {{service}}、阶段 {{stage}} 的状态...',
|
|
415
419
|
NO_RESOURCES_FOUND: '状态中未找到资源。',
|
|
@@ -488,6 +492,7 @@ exports.zhCN = {
|
|
|
488
492
|
RAM_ROLE_DRIFT_RECOVERY_FAILED: 'RAM 角色 "{{roleName}}" 状态漂移恢复失败:{{error}}。' +
|
|
489
493
|
'角色在云端存在但恢复操作失败。' +
|
|
490
494
|
'修复方法:在云控制台手动确认角色状态,从状态中移除该角色并重新部署。',
|
|
495
|
+
RAM_POLICY_VERSION_PRUNE_FAILED: '策略 "{{policyName}}" 旧版本清理失败:{{error}}。' + '下次更新时策略版本数可能超出上限。',
|
|
491
496
|
// 证书消息
|
|
492
497
|
CERT_INVALID_CONFIGURATION: '证书 "{{name}}" 必须具有 (certificate_body + private_key) 或 certificate_id,但不能同时存在',
|
|
493
498
|
CERT_FILE_NOT_FOUND: '未找到证书文件: {{filePath}}',
|
|
@@ -642,6 +647,7 @@ exports.zhCN = {
|
|
|
642
647
|
TENCENT_CAM_ROLE_DELETED: '腾讯云 CAM 角色 {{roleName}} 删除成功',
|
|
643
648
|
TENCENT_CAM_ROLE_NOT_FOUND: '腾讯云 CAM 角色 {{roleName}} 在云服务商中未找到',
|
|
644
649
|
TENCENT_CAM_ROLE_ALREADY_EXISTS: '腾讯云 CAM 角色 {{roleName}} 已存在',
|
|
650
|
+
TENCENT_UIN_FETCH_FAILED: '获取腾讯云 UIN 失败,函数调用权限将回退为资源通配: {{error}}',
|
|
645
651
|
TENCENT_CAM_ROLE_DRIFT_RECOVERY_FAILED: '腾讯云 CAM 角色 {{roleName}} 状态漂移恢复失败:{{error}}',
|
|
646
652
|
TENCENT_CAM_POLICY_ALREADY_ATTACHED: 'CAM 角色 {{roleName}} 已附加该策略',
|
|
647
653
|
TENCENT_CAM_POLICY_ALREADY_EXISTS: '腾讯云 CAM 策略已存在',
|
|
@@ -7,7 +7,7 @@ const common_1 = require("../../common");
|
|
|
7
7
|
const reportResourceEvent_1 = require("../../common/reportResourceEvent");
|
|
8
8
|
const stateManager_1 = require("../../common/stateManager");
|
|
9
9
|
const lang_1 = require("../../lang");
|
|
10
|
-
const executeSingleItem = async (context, item, eventsMap, serviceName,
|
|
10
|
+
const executeSingleItem = async (context, item, eventsMap, serviceName, resolveRoleArn, currentState) => {
|
|
11
11
|
switch (item.action) {
|
|
12
12
|
case 'noop':
|
|
13
13
|
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
@@ -18,7 +18,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn,
|
|
|
18
18
|
throw new Error(`Event not found for logical ID: ${item.logicalId}`);
|
|
19
19
|
}
|
|
20
20
|
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
21
|
-
const newState = await (0, apigwResource_1.createApigwResource)(context, event, serviceName,
|
|
21
|
+
const newState = await (0, apigwResource_1.createApigwResource)(context, event, serviceName, resolveRoleArn, currentState);
|
|
22
22
|
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'API Gateway resources', name: event.name }));
|
|
23
23
|
return newState;
|
|
24
24
|
}
|
|
@@ -28,7 +28,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn,
|
|
|
28
28
|
throw new Error(`Event not found for logical ID: ${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,
|
|
31
|
+
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, resolveRoleArn, currentState);
|
|
32
32
|
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'API Gateway resources', name: event.name }));
|
|
33
33
|
return newState;
|
|
34
34
|
}
|
|
@@ -57,7 +57,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, roleArn,
|
|
|
57
57
|
/**
|
|
58
58
|
* Execute API Gateway plan with partial failure support
|
|
59
59
|
*/
|
|
60
|
-
const executeApigwPlan = async (context, plan, events, serviceName,
|
|
60
|
+
const executeApigwPlan = async (context, plan, events, serviceName, resolveRoleArn, initialState, onStateChange) => {
|
|
61
61
|
const eventsMap = new Map(events?.map((e) => [`events.${e.key}`, e]) ?? []);
|
|
62
62
|
const successfulItems = [];
|
|
63
63
|
let currentState = initialState;
|
|
@@ -71,7 +71,7 @@ const executeApigwPlan = async (context, plan, events, serviceName, roleArn, ini
|
|
|
71
71
|
});
|
|
72
72
|
const __siStartedAt = Date.now();
|
|
73
73
|
try {
|
|
74
|
-
const newState = await executeSingleItem(context, item, eventsMap, serviceName,
|
|
74
|
+
const newState = await executeSingleItem(context, item, eventsMap, serviceName, resolveRoleArn, currentState);
|
|
75
75
|
if (newState !== null) {
|
|
76
76
|
currentState = newState;
|
|
77
77
|
successfulItems.push(item);
|
|
@@ -273,7 +273,7 @@ const buildLogConfigInstance = (context, slsProject, slsLogStore) => ({
|
|
|
273
273
|
attributes: { slsProject, slsLogStore },
|
|
274
274
|
});
|
|
275
275
|
const ensureGatewayLogConfig = async (context, client, state) => {
|
|
276
|
-
const slsLogStore =
|
|
276
|
+
const slsLogStore = (0, sharedLogProject_1.buildGatewayLogstoreName)(context.service, context.stage);
|
|
277
277
|
const ours = { slsProject: (0, sharedLogProject_1.buildSharedProjectName)(context.app, context.stage), slsLogStore };
|
|
278
278
|
const existing = await client.apigw.describeGatewayLogConfig();
|
|
279
279
|
const matchesOurs = existing &&
|
|
@@ -373,9 +373,10 @@ const buildDomainBindingConfig = async (domain, groupId, serviceName, eventKey,
|
|
|
373
373
|
...certConfig,
|
|
374
374
|
};
|
|
375
375
|
};
|
|
376
|
-
const createApigwResource = async (context, event, serviceName,
|
|
376
|
+
const createApigwResource = async (context, event, serviceName, resolveRoleArn, state) => {
|
|
377
377
|
const logicalId = `events.${event.key}`;
|
|
378
378
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
379
|
+
const roleArnFor = (0, apigwTypes_1.normalizeRoleArnResolver)(resolveRoleArn);
|
|
379
380
|
const groupConfig = (0, apigwTypes_1.eventToApigwGroupConfig)(event, serviceName, context.stage, context, logicalId);
|
|
380
381
|
// Stamp the ownership tag — the create-time contract that lets a later run
|
|
381
382
|
// (state reset, mid-run failure) idempotently adopt the group we create
|
|
@@ -471,7 +472,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
471
472
|
}
|
|
472
473
|
// Create APIs and deployments for each trigger
|
|
473
474
|
for (const trigger of event.triggers) {
|
|
474
|
-
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage,
|
|
475
|
+
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage, roleArnFor(String(trigger.backend)));
|
|
475
476
|
const apiId = await client.apigw.createApi(apiConfig);
|
|
476
477
|
// Get API info for state
|
|
477
478
|
const apiInfo = await client.apigw.getApi(groupId, apiId);
|
|
@@ -586,15 +587,16 @@ const readApigwResourceByName = async (context, groupName) => {
|
|
|
586
587
|
return await client.apigw.findApiGroupByName(groupName);
|
|
587
588
|
};
|
|
588
589
|
exports.readApigwResourceByName = readApigwResourceByName;
|
|
589
|
-
const updateApigwResource = async (context, event, serviceName,
|
|
590
|
+
const updateApigwResource = async (context, event, serviceName, resolveRoleArn, state) => {
|
|
590
591
|
const logicalId = `events.${event.key}`;
|
|
591
592
|
const existingState = (0, stateManager_1.getResource)(state, logicalId);
|
|
592
593
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
594
|
+
const roleArnFor = (0, apigwTypes_1.normalizeRoleArnResolver)(resolveRoleArn);
|
|
593
595
|
let existingInstances;
|
|
594
596
|
let groupId;
|
|
595
597
|
// Precompute expected API names from triggers to safely filter cloud APIs
|
|
596
598
|
const expectedApiNames = new Set(event.triggers.map((trigger) => {
|
|
597
|
-
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, 'placeholder', serviceName, context.region, context.stage,
|
|
599
|
+
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, 'placeholder', serviceName, context.region, context.stage, roleArnFor(String(trigger.backend)));
|
|
598
600
|
return apiConfig.apiName;
|
|
599
601
|
}));
|
|
600
602
|
const buildCloudInstance = (cloudGroup, cloudApis) => {
|
|
@@ -622,7 +624,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
622
624
|
// Shared helper: try to find the group from cloud. On any error (or not found),
|
|
623
625
|
// fall back to full creation since there's nothing to update.
|
|
624
626
|
const findCloudGroupOrCreate = async () => {
|
|
625
|
-
return (0, exports.createApigwResource)(context, event, serviceName,
|
|
627
|
+
return (0, exports.createApigwResource)(context, event, serviceName, resolveRoleArn, state);
|
|
626
628
|
};
|
|
627
629
|
if (existingState) {
|
|
628
630
|
existingInstances = existingState.instances;
|
|
@@ -692,7 +694,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
692
694
|
const existingApis = existingInstances.filter((i) => i.type === 'ALIYUN_APIGW_API');
|
|
693
695
|
const neededApiKeys = new Set();
|
|
694
696
|
for (const trigger of event.triggers) {
|
|
695
|
-
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage,
|
|
697
|
+
const apiConfig = (0, apigwTypes_1.triggerToApigwApiConfig)(event, trigger, groupId, serviceName, context.region, context.stage, roleArnFor(String(trigger.backend)));
|
|
696
698
|
const apiKey = (0, apigwTypes_1.generateApiKey)(trigger.method, trigger.path);
|
|
697
699
|
neededApiKeys.add(apiKey);
|
|
698
700
|
const existingApi = existingApis.find((a) => {
|
|
@@ -723,7 +725,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
723
725
|
const apiInfo = await client.apigw.getApi(groupId, existingApi.id);
|
|
724
726
|
if (apiInfo) {
|
|
725
727
|
const isNeeded = event.triggers.some((t) => {
|
|
726
|
-
const expectedName = (0, apigwTypes_1.triggerToApigwApiConfig)(event, t, groupId, serviceName, context.region, context.stage,
|
|
728
|
+
const expectedName = (0, apigwTypes_1.triggerToApigwApiConfig)(event, t, groupId, serviceName, context.region, context.stage, roleArnFor(String(t.backend))).apiName;
|
|
727
729
|
return apiInfo.apiName === expectedName;
|
|
728
730
|
});
|
|
729
731
|
if (!isNeeded) {
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extractEventDomainDefinition = exports.buildEventLogSnapshot = exports.inferProtocolConfig = exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.eventToApigwGroupConfig = exports.generateApiKey = exports.buildAliyunApigwApiName = void 0;
|
|
3
|
+
exports.extractEventDomainDefinition = exports.buildEventLogSnapshot = exports.inferProtocolConfig = exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.eventToApigwGroupConfig = exports.normalizeRoleArnResolver = exports.generateApiKey = exports.buildAliyunApigwApiName = void 0;
|
|
4
4
|
const common_1 = require("../../common");
|
|
5
5
|
const lang_1 = require("../../lang");
|
|
6
6
|
const ownershipTag_1 = require("../ownershipTag");
|
|
7
|
+
const sharedLogProject_1 = require("./sharedLogProject");
|
|
7
8
|
var common_2 = require("../../common");
|
|
8
9
|
Object.defineProperty(exports, "buildAliyunApigwApiName", { enumerable: true, get: function () { return common_2.buildAliyunApigwApiName; } });
|
|
9
10
|
Object.defineProperty(exports, "generateApiKey", { enumerable: true, get: function () { return common_2.generateApiKey; } });
|
|
11
|
+
const normalizeRoleArnResolver = (param) => {
|
|
12
|
+
if (typeof param === 'function') {
|
|
13
|
+
return param;
|
|
14
|
+
}
|
|
15
|
+
return () => param;
|
|
16
|
+
};
|
|
17
|
+
exports.normalizeRoleArnResolver = normalizeRoleArnResolver;
|
|
10
18
|
/**
|
|
11
19
|
* Convert EventDomain to API Gateway group config
|
|
12
20
|
*
|
|
@@ -38,6 +46,7 @@ exports.eventToApigwGroupConfig = eventToApigwGroupConfig;
|
|
|
38
46
|
/**
|
|
39
47
|
* Resolves a function reference like ${functions.xxx} to the actual function name
|
|
40
48
|
*/
|
|
49
|
+
const FUNCTION_REF_PATTERN = /^\$\{functions\.[\w.]+\}$/;
|
|
41
50
|
const resolveFunctionReference = (backendRef) => {
|
|
42
51
|
// Get IAC from context
|
|
43
52
|
const context = (0, common_1.getContext)();
|
|
@@ -48,8 +57,14 @@ const resolveFunctionReference = (backendRef) => {
|
|
|
48
57
|
// Use getIacDefinition to resolve function references
|
|
49
58
|
const functionDef = (0, common_1.getIacDefinition)(context.iac, backendRef);
|
|
50
59
|
if (!functionDef || !(0, common_1.isFunctionDomain)(functionDef)) {
|
|
51
|
-
//
|
|
52
|
-
|
|
60
|
+
// Dangling template refs fail semantic validation; a bare value that matches
|
|
61
|
+
// no template function is an external deployed function name (issue #227).
|
|
62
|
+
if (FUNCTION_REF_PATTERN.test(backendRef)) {
|
|
63
|
+
common_1.logger.warn(lang_1.lang.__('FUNCTION_REF_NOT_RESOLVED', { backendRef }));
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
common_1.logger.info(lang_1.lang.__('EXTERNAL_FUNCTION_BACKEND', { backendRef }));
|
|
67
|
+
}
|
|
53
68
|
return backendRef;
|
|
54
69
|
}
|
|
55
70
|
const functionName = functionDef.name;
|
|
@@ -208,8 +223,8 @@ const buildEventLogSnapshot = (event, context) => {
|
|
|
208
223
|
return {
|
|
209
224
|
logEnabled: event.log === true || event.log === 'true',
|
|
210
225
|
logConfig: {
|
|
211
|
-
project:
|
|
212
|
-
logstore:
|
|
226
|
+
project: (0, sharedLogProject_1.buildSharedProjectName)(context.app, context.stage),
|
|
227
|
+
logstore: (0, sharedLogProject_1.buildGatewayLogstoreName)(context.service, context.stage),
|
|
213
228
|
},
|
|
214
229
|
};
|
|
215
230
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deployAliyunStack = void 0;
|
|
3
|
+
exports.deployAliyunStack = exports.buildRoleArnResolver = void 0;
|
|
4
4
|
const common_1 = require("../../common");
|
|
5
5
|
const lang_1 = require("../../lang");
|
|
6
6
|
const fc3Planner_1 = require("./fc3Planner");
|
|
@@ -43,6 +43,36 @@ const logDependencyGraph = (orderedItems, dotGraph) => {
|
|
|
43
43
|
});
|
|
44
44
|
common_1.logger.debug(`${lang_1.lang.__('DOT_GRAPH_OUTPUT')}:\n${dotGraph}`);
|
|
45
45
|
};
|
|
46
|
+
const TEMPLATE_FUNCTION_REF_PATTERN = /^\$\{functions\.([\w.]+)\}$/;
|
|
47
|
+
const findFirstManagedRoleArn = (state) => {
|
|
48
|
+
for (const [logicalId, resourceState] of Object.entries(state.resources ?? {})) {
|
|
49
|
+
if (logicalId.startsWith('functions.')) {
|
|
50
|
+
const ramRoleInstance = resourceState.instances?.find((i) => i.type === 'ALIYUN_RAM_ROLE');
|
|
51
|
+
if (ramRoleInstance?.roleArn) {
|
|
52
|
+
return ramRoleInstance.roleArn;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return undefined;
|
|
57
|
+
};
|
|
58
|
+
/** @public Resolves a trigger backend to its role ARN; template refs and bare names map to that function's role, else first managed role. */
|
|
59
|
+
const buildRoleArnResolver = (state, functions) => {
|
|
60
|
+
const fallbackArn = findFirstManagedRoleArn(state);
|
|
61
|
+
const keyByName = new Map((functions ?? []).map((f) => [f.name, f.key]));
|
|
62
|
+
return (backend) => {
|
|
63
|
+
const refMatch = backend.match(TEMPLATE_FUNCTION_REF_PATTERN);
|
|
64
|
+
const fnKey = refMatch ? refMatch[1] : keyByName.get(backend);
|
|
65
|
+
if (fnKey) {
|
|
66
|
+
const resourceState = state.resources?.[`functions.${fnKey}`];
|
|
67
|
+
const ramRoleInstance = resourceState?.instances?.find((i) => i.type === 'ALIYUN_RAM_ROLE');
|
|
68
|
+
if (ramRoleInstance?.roleArn) {
|
|
69
|
+
return ramRoleInstance.roleArn;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return fallbackArn;
|
|
73
|
+
};
|
|
74
|
+
};
|
|
75
|
+
exports.buildRoleArnResolver = buildRoleArnResolver;
|
|
46
76
|
const deployAliyunStack = async (iac, backend) => {
|
|
47
77
|
const context = (0, common_1.getContext)();
|
|
48
78
|
// Cache IAC for access throughout the deployment
|
|
@@ -123,8 +153,8 @@ const deployAliyunStack = async (iac, backend) => {
|
|
|
123
153
|
});
|
|
124
154
|
}
|
|
125
155
|
// Execute event plan after functions are created (events depend on functions)
|
|
126
|
-
const
|
|
127
|
-
const eventResult = await (0, apigwExecutor_1.executeApigwPlan)(context, eventPlan, iac.events, iac.service,
|
|
156
|
+
const resolveRoleArn = (0, exports.buildRoleArnResolver)(state, iac.functions);
|
|
157
|
+
const eventResult = await (0, apigwExecutor_1.executeApigwPlan)(context, eventPlan, iac.events, iac.service, resolveRoleArn, state, onStateChange);
|
|
128
158
|
state = eventResult.state;
|
|
129
159
|
if (eventResult.partialFailure) {
|
|
130
160
|
handlePartialFailure({
|