@geek-fun/serverlessinsight 0.7.6 → 0.7.8
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/README.md +155 -409
- package/dist/package.json +2 -1
- package/dist/src/common/aliyunClient/ossOperations.js +41 -0
- package/dist/src/common/aliyunClient/ramOperations.js +161 -7
- package/dist/src/common/iamStatements.js +48 -0
- package/dist/src/common/tencentClient/camOperations.js +317 -0
- package/dist/src/common/tencentClient/cosOperations.js +67 -0
- package/dist/src/common/tencentClient/index.js +18 -0
- package/dist/src/common/tencentClient/scfOperations.js +2 -0
- package/dist/src/common/volcengineClient/iamOperations.js +133 -47
- package/dist/src/common/volcengineClient/tosOperations.js +79 -0
- package/dist/src/lang/en.js +24 -0
- package/dist/src/lang/zh-CN.js +24 -0
- package/dist/src/parser/bucketParser.js +31 -0
- package/dist/src/parser/functionParser.js +34 -0
- package/dist/src/stack/aliyunStack/fc3Planner.js +2 -1
- package/dist/src/stack/aliyunStack/fc3Resource.js +72 -14
- package/dist/src/stack/aliyunStack/ossResource.js +63 -0
- package/dist/src/stack/aliyunStack/ossTypes.js +9 -0
- package/dist/src/stack/localStack/aliyunFc.js +6 -1
- package/dist/src/stack/scfStack/cosResource.js +58 -0
- package/dist/src/stack/scfStack/cosTypes.js +9 -0
- package/dist/src/stack/scfStack/scfPlanner.js +1 -1
- package/dist/src/stack/scfStack/scfResource.js +195 -22
- package/dist/src/stack/scfStack/scfTypes.js +6 -4
- package/dist/src/stack/volcengineStack/tosResource.js +56 -0
- package/dist/src/stack/volcengineStack/tosTypes.js +9 -0
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +2 -1
- package/dist/src/stack/volcengineStack/vefaasResource.js +46 -5
- package/dist/src/types/domains/state.js +2 -0
- package/dist/src/validator/bucketSchema.js +45 -0
- package/dist/src/validator/functionSchema.js +43 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/samples/aliyun-poc-api-cdn.yml +75 -0
|
@@ -78,7 +78,8 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
78
78
|
const config = await resolveVpcConfigSecurityGroup(context, rawConfig);
|
|
79
79
|
const codePath = fn.code.path;
|
|
80
80
|
const desiredCodeHash = (0, common_1.computeFileHash)(codePath);
|
|
81
|
-
const
|
|
81
|
+
const baseDefinition = (0, fc3Types_1.extractFc3Definition)(config, desiredCodeHash);
|
|
82
|
+
const desiredDefinition = fn.iam ? { ...baseDefinition, iam: fn.iam } : baseDefinition;
|
|
82
83
|
if (!currentState || currentState.status === 'tainted') {
|
|
83
84
|
return {
|
|
84
85
|
logicalId,
|
|
@@ -174,18 +174,34 @@ const createDependentResources = async (context, fn, serviceName, existingInstan
|
|
|
174
174
|
logConfig = { project: projectName, logstore: logstoreName };
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
|
-
const
|
|
177
|
+
const iamConfig = fn.iam?.role;
|
|
178
|
+
const statements = iamConfig && typeof iamConfig !== 'string' ? iamConfig.statements : undefined;
|
|
179
|
+
const managedPolicies = iamConfig && typeof iamConfig !== 'string' ? iamConfig.managed_policies : undefined;
|
|
180
|
+
const customRoleName = iamConfig && typeof iamConfig !== 'string' ? iamConfig.name : undefined;
|
|
181
|
+
const defaultRoleName = `${serviceName}-${context.stage}-fc-role`;
|
|
178
182
|
const trustedServices = getTrustedServicesForFunction(context, fn.key);
|
|
179
|
-
|
|
183
|
+
const isExternalRole = typeof iamConfig === 'string';
|
|
184
|
+
if (isExternalRole) {
|
|
185
|
+
// External role - use ARN directly, skip creation and management
|
|
186
|
+
instances.push({
|
|
187
|
+
type: 'ALIYUN_RAM_ROLE',
|
|
188
|
+
id: iamConfig,
|
|
189
|
+
roleArn: iamConfig,
|
|
190
|
+
external: true,
|
|
191
|
+
attributes: {},
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
else if (hasRamRole) {
|
|
180
195
|
const ramRoleInstance = existingInstances.find((i) => i.type === 'ALIYUN_RAM_ROLE');
|
|
181
196
|
if (ramRoleInstance) {
|
|
182
197
|
instances.push(ramRoleInstance);
|
|
183
|
-
await client.ram.updateRoleTrustPolicy(
|
|
198
|
+
await client.ram.updateRoleTrustPolicy(ramRoleInstance.id, trustedServices);
|
|
184
199
|
}
|
|
185
200
|
}
|
|
186
201
|
else {
|
|
202
|
+
const roleName = customRoleName ?? defaultRoleName;
|
|
187
203
|
logger_1.logger.info(lang_1.lang.__('CREATING_RAM_ROLE', { roleName }));
|
|
188
|
-
const ramRole = await client.ram.createRole(roleName, trustedServices);
|
|
204
|
+
const ramRole = await client.ram.createRole(roleName, trustedServices, undefined, statements, managedPolicies);
|
|
189
205
|
instances.push({
|
|
190
206
|
type: 'ALIYUN_RAM_ROLE',
|
|
191
207
|
id: roleName,
|
|
@@ -195,10 +211,13 @@ const createDependentResources = async (context, fn, serviceName, existingInstan
|
|
|
195
211
|
await delay(constants_1.RAM_ROLE_PROPAGATION_DELAY_MS);
|
|
196
212
|
}
|
|
197
213
|
const ramRoleInstance = instances.find((i) => i.type === 'ALIYUN_RAM_ROLE');
|
|
198
|
-
const role =
|
|
199
|
-
roleName,
|
|
200
|
-
|
|
201
|
-
|
|
214
|
+
const role = isExternalRole
|
|
215
|
+
? { roleName: '', arn: iamConfig }
|
|
216
|
+
: {
|
|
217
|
+
roleName: customRoleName ?? defaultRoleName,
|
|
218
|
+
arn: ramRoleInstance?.roleArn ??
|
|
219
|
+
`acs:ram::${context.accountId}:role/${customRoleName ?? defaultRoleName}`,
|
|
220
|
+
};
|
|
202
221
|
if (fn.network) {
|
|
203
222
|
if (hasSecurityGroup) {
|
|
204
223
|
const sgInstance = existingInstances.find((i) => i.type === 'ALIYUN_ECS_SECURITY_GROUP');
|
|
@@ -310,10 +329,15 @@ const deleteDependentResources = async (context, instances) => {
|
|
|
310
329
|
logger_1.logger.info(lang_1.lang.__('DELETING_SECURITY_GROUP', { id: instance.id }));
|
|
311
330
|
await client.ecs.deleteSecurityGroup(instance.id);
|
|
312
331
|
break;
|
|
313
|
-
case 'ALIYUN_RAM_ROLE':
|
|
332
|
+
case 'ALIYUN_RAM_ROLE': {
|
|
333
|
+
const ramInstance = instance;
|
|
334
|
+
if (ramInstance.external)
|
|
335
|
+
break; // Skip external roles
|
|
336
|
+
const managedPolicies = ramInstance.managedPolicies;
|
|
314
337
|
logger_1.logger.info(lang_1.lang.__('DELETING_RAM_ROLE', { id: instance.id }));
|
|
315
|
-
await client.ram.deleteRole(instance.id);
|
|
338
|
+
await client.ram.deleteRole(instance.id, managedPolicies);
|
|
316
339
|
break;
|
|
340
|
+
}
|
|
317
341
|
case 'ALIYUN_SLS_INDEX': {
|
|
318
342
|
const [projectName, logstoreName] = instance.id.split('/');
|
|
319
343
|
logger_1.logger.info(lang_1.lang.__('DELETING_SLS_INDEX', { id: instance.id }));
|
|
@@ -393,13 +417,15 @@ const createResource = async (context, fn, state) => {
|
|
|
393
417
|
}
|
|
394
418
|
const codePath = fn.code.path;
|
|
395
419
|
const codeHash = (0, common_1.computeFileHash)(codePath);
|
|
396
|
-
const
|
|
420
|
+
const baseDefinition = (0, fc3Types_1.extractFc3Definition)(config, codeHash);
|
|
421
|
+
const definition = fn.iam ? { ...baseDefinition, iam: fn.iam } : baseDefinition;
|
|
397
422
|
const dependentInstances = dependentResources.instances.map((dep) => ({
|
|
398
423
|
sid: dep.sid ??
|
|
399
424
|
(0, common_1.buildSid)('aliyun', dep.type.replace('ALIYUN_', '').toLowerCase(), context.stage, dep.id),
|
|
400
425
|
id: dep.id,
|
|
401
426
|
type: dep.type,
|
|
402
427
|
...(dep.roleArn ? { roleArn: dep.roleArn } : {}),
|
|
428
|
+
...(dep.external ? { external: dep.external } : {}),
|
|
403
429
|
...dep.attributes,
|
|
404
430
|
}));
|
|
405
431
|
const taintedResourceState = {
|
|
@@ -496,7 +522,12 @@ const updateResource = async (context, fn, state) => {
|
|
|
496
522
|
logConfig = { project: projectName, logstore: logstoreName };
|
|
497
523
|
}
|
|
498
524
|
}
|
|
499
|
-
|
|
525
|
+
const newIamRole = fn.iam?.role;
|
|
526
|
+
if (typeof newIamRole === 'string') {
|
|
527
|
+
// External role - use ARN directly, skip management
|
|
528
|
+
role = { roleName: '', arn: newIamRole };
|
|
529
|
+
}
|
|
530
|
+
else if (!hasRamRole) {
|
|
500
531
|
const deps = await createDependentResources(context, { ...fn, log: false, network: undefined, storage: { ...fn.storage, nas: undefined } }, serviceName);
|
|
501
532
|
role = deps.role;
|
|
502
533
|
newDependentInstances.push(...deps.instances.filter((i) => i.type === 'ALIYUN_RAM_ROLE'));
|
|
@@ -510,6 +541,30 @@ const updateResource = async (context, fn, state) => {
|
|
|
510
541
|
};
|
|
511
542
|
const trustedServices = getTrustedServicesForFunction(context, fn.key);
|
|
512
543
|
await client.ram.updateRoleTrustPolicy(ramRoleInstance.id, trustedServices);
|
|
544
|
+
const existingIam = existingState?.definition?.iam;
|
|
545
|
+
const desiredIam = fn.iam;
|
|
546
|
+
const iamChanged = !(0, common_1.attributesEqual)(existingIam ?? {}, desiredIam ?? {});
|
|
547
|
+
if (iamChanged) {
|
|
548
|
+
// Check for statement changes
|
|
549
|
+
const desiredStatements = newIamRole ? newIamRole.statements : undefined;
|
|
550
|
+
const existingRole = existingIam?.role;
|
|
551
|
+
const existingStatements = existingRole && typeof existingRole !== 'string' ? existingRole.statements : undefined;
|
|
552
|
+
const desiredStatementsVal = (desiredStatements ?? []);
|
|
553
|
+
const existingStatementsVal = (existingStatements ?? []);
|
|
554
|
+
if (!(0, common_1.attributesEqual)(existingStatementsVal, desiredStatementsVal)) {
|
|
555
|
+
await client.ram.updateRolePolicy(ramRoleInstance.id, desiredStatements);
|
|
556
|
+
}
|
|
557
|
+
// Check for managed policy changes
|
|
558
|
+
const desiredManagedPolicies = newIamRole ? newIamRole.managed_policies : undefined;
|
|
559
|
+
const existingManagedPolicies = existingRole && typeof existingRole !== 'string'
|
|
560
|
+
? existingRole.managed_policies
|
|
561
|
+
: undefined;
|
|
562
|
+
const desiredManagedPoliciesVal = (desiredManagedPolicies ?? []);
|
|
563
|
+
const existingManagedPoliciesVal = (existingManagedPolicies ?? []);
|
|
564
|
+
if (!(0, common_1.attributesEqual)(existingManagedPoliciesVal, desiredManagedPoliciesVal)) {
|
|
565
|
+
await client.ram.updateManagedPolicies(ramRoleInstance.id, desiredManagedPolicies ?? []);
|
|
566
|
+
}
|
|
567
|
+
}
|
|
513
568
|
}
|
|
514
569
|
}
|
|
515
570
|
if (fn.network && !hasSecurityGroup) {
|
|
@@ -584,7 +639,7 @@ const updateResource = async (context, fn, state) => {
|
|
|
584
639
|
const codeChanged = currentCodeHash !== desiredCodeHash;
|
|
585
640
|
const existingConfig = existingState?.definition;
|
|
586
641
|
const desiredDefinition = (0, fc3Types_1.extractFc3Definition)(config, desiredCodeHash);
|
|
587
|
-
const { codeHash: _existingCodeHash, ...existingConfigOnly } = existingConfig || {};
|
|
642
|
+
const { codeHash: _existingCodeHash, iam: _existingIam, ...existingConfigOnly } = existingConfig || {};
|
|
588
643
|
const { codeHash: _desiredCodeHash, ...desiredConfigOnly } = desiredDefinition;
|
|
589
644
|
const configChanged = !(0, common_1.attributesEqual)(existingConfigOnly, desiredConfigOnly);
|
|
590
645
|
if (configChanged) {
|
|
@@ -602,11 +657,13 @@ const updateResource = async (context, fn, state) => {
|
|
|
602
657
|
throw new Error(`Failed to refresh state for function: ${fn.name}`);
|
|
603
658
|
}
|
|
604
659
|
const codeHash = (0, common_1.computeFileHash)(codePath);
|
|
605
|
-
const
|
|
660
|
+
const baseDefinition = (0, fc3Types_1.extractFc3Definition)(config, codeHash);
|
|
661
|
+
const definition = fn.iam ? { ...baseDefinition, iam: fn.iam } : baseDefinition;
|
|
606
662
|
const sid = (0, common_1.buildSid)('aliyun', 'fc3', context.stage, fn.name);
|
|
607
663
|
const fcInstance = buildFc3InstanceFromProvider(functionInfo, sid);
|
|
608
664
|
const existingDependentInstances = existingInstances
|
|
609
665
|
.filter((i) => i.type !== 'ALIYUN_FC3_FUNCTION')
|
|
666
|
+
.filter((i) => !(typeof fn.iam?.role === 'string' && i.type === 'ALIYUN_RAM_ROLE'))
|
|
610
667
|
.map((i) => {
|
|
611
668
|
const { sid: existingSid, id: existingId, ...rest } = i;
|
|
612
669
|
return {
|
|
@@ -622,6 +679,7 @@ const updateResource = async (context, fn, state) => {
|
|
|
622
679
|
id: dep.id,
|
|
623
680
|
type: dep.type,
|
|
624
681
|
...(dep.roleArn ? { roleArn: dep.roleArn } : {}),
|
|
682
|
+
...(dep.external ? { external: dep.external } : {}),
|
|
625
683
|
...dep.attributes,
|
|
626
684
|
}));
|
|
627
685
|
const resourceState = {
|
|
@@ -130,6 +130,44 @@ const getIsCdnEnabled = (bucket) => {
|
|
|
130
130
|
const getIsAccelerateEnabled = (bucket) => {
|
|
131
131
|
return bucket.domain?.accelerate === true;
|
|
132
132
|
};
|
|
133
|
+
const buildOssBucketPolicyJson = (iam) => {
|
|
134
|
+
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
135
|
+
return null;
|
|
136
|
+
return {
|
|
137
|
+
Version: '1',
|
|
138
|
+
Statement: iam.resource.statements.map((stmt) => {
|
|
139
|
+
const s = {
|
|
140
|
+
Effect: stmt.effect,
|
|
141
|
+
Principal: stmt.principal,
|
|
142
|
+
Action: stmt.action,
|
|
143
|
+
Resource: stmt.resource,
|
|
144
|
+
};
|
|
145
|
+
if (stmt.condition) {
|
|
146
|
+
s.Condition = stmt.condition;
|
|
147
|
+
}
|
|
148
|
+
return s;
|
|
149
|
+
}),
|
|
150
|
+
};
|
|
151
|
+
};
|
|
152
|
+
const applyBucketPolicy = async (client, bucket) => {
|
|
153
|
+
if (!bucket.iam)
|
|
154
|
+
return;
|
|
155
|
+
const policy = buildOssBucketPolicyJson(bucket.iam);
|
|
156
|
+
if (!policy)
|
|
157
|
+
return;
|
|
158
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLYING', { bucketName: bucket.name }));
|
|
159
|
+
await client.oss.putBucketPolicy(bucket.name, policy);
|
|
160
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLIED', { bucketName: bucket.name }));
|
|
161
|
+
};
|
|
162
|
+
const deleteBucketPolicy = async (client, bucketName) => {
|
|
163
|
+
try {
|
|
164
|
+
await client.oss.deleteBucketPolicy(bucketName);
|
|
165
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_DELETED', { bucketName }));
|
|
166
|
+
}
|
|
167
|
+
catch {
|
|
168
|
+
// Best effort cleanup
|
|
169
|
+
}
|
|
170
|
+
};
|
|
133
171
|
const getDomainName = (bucket) => {
|
|
134
172
|
return bucket.domain?.domain_name || bucket.website?.domain;
|
|
135
173
|
};
|
|
@@ -414,6 +452,8 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
414
452
|
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_TRACKED_CAN_RETRY'));
|
|
415
453
|
}
|
|
416
454
|
}
|
|
455
|
+
// Apply IAM bucket policy if configured
|
|
456
|
+
await applyBucketPolicy(client, bucket);
|
|
417
457
|
const finalResourceState = {
|
|
418
458
|
mode: 'managed',
|
|
419
459
|
region: context.region,
|
|
@@ -643,6 +683,27 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
643
683
|
await client.oss.unbindCustomDomain(config.bucketName, ossInstance.domain, ossInstance.dnsRecordId, ossInstance.txtRecordId);
|
|
644
684
|
}
|
|
645
685
|
}
|
|
686
|
+
// Apply IAM bucket policy if configured (update or remove)
|
|
687
|
+
const existingDef = existingState?.definition;
|
|
688
|
+
const oldPolicyJson = existingDef?.policy;
|
|
689
|
+
const newPolicyJson = bucket.iam ? JSON.stringify(bucket.iam) : null;
|
|
690
|
+
if (newPolicyJson !== (oldPolicyJson ?? null)) {
|
|
691
|
+
if (newPolicyJson) {
|
|
692
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLYING', { bucketName: config.bucketName }));
|
|
693
|
+
const policyObj = buildOssBucketPolicyJson(bucket.iam);
|
|
694
|
+
if (policyObj) {
|
|
695
|
+
await client.oss.putBucketPolicy(config.bucketName, policyObj);
|
|
696
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLIED', { bucketName: config.bucketName }));
|
|
697
|
+
}
|
|
698
|
+
else {
|
|
699
|
+
// iam exists but has no statements — delete any existing policy
|
|
700
|
+
await deleteBucketPolicy(client, config.bucketName);
|
|
701
|
+
}
|
|
702
|
+
}
|
|
703
|
+
else {
|
|
704
|
+
await deleteBucketPolicy(client, config.bucketName);
|
|
705
|
+
}
|
|
706
|
+
}
|
|
646
707
|
const resourceState = {
|
|
647
708
|
mode: 'managed',
|
|
648
709
|
region: context.region,
|
|
@@ -691,6 +752,8 @@ const deleteBucketResource = async (context, bucketName, logicalId, state) => {
|
|
|
691
752
|
}
|
|
692
753
|
}
|
|
693
754
|
}
|
|
755
|
+
// Clean up bucket policy before deleting bucket
|
|
756
|
+
await deleteBucketPolicy(client, bucketName);
|
|
694
757
|
if (dnsInstances) {
|
|
695
758
|
for (const dnsInstance of dnsInstances) {
|
|
696
759
|
await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId, dnsInstance.txtRecordId);
|
|
@@ -18,6 +18,9 @@ const bucketToOssBucketConfig = (bucket) => {
|
|
|
18
18
|
const config = {
|
|
19
19
|
bucketName: bucket.name,
|
|
20
20
|
};
|
|
21
|
+
if (bucket.iam) {
|
|
22
|
+
config.iam = bucket.iam;
|
|
23
|
+
}
|
|
21
24
|
if (bucket.security?.acl) {
|
|
22
25
|
config.acl = aclMap[bucket.security.acl];
|
|
23
26
|
}
|
|
@@ -77,6 +80,11 @@ const bucketToOssBucketConfig = (bucket) => {
|
|
|
77
80
|
};
|
|
78
81
|
exports.bucketToOssBucketConfig = bucketToOssBucketConfig;
|
|
79
82
|
/* istanbul ignore next */
|
|
83
|
+
const serializeBucketPolicy = (iam) => {
|
|
84
|
+
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
85
|
+
return null;
|
|
86
|
+
return JSON.stringify(iam);
|
|
87
|
+
};
|
|
80
88
|
const extractOssBucketDefinition = (config, websiteCodeHash) => {
|
|
81
89
|
const def = {
|
|
82
90
|
bucketName: config.bucketName,
|
|
@@ -98,6 +106,7 @@ const extractOssBucketDefinition = (config, websiteCodeHash) => {
|
|
|
98
106
|
versioningStatus: config.versioningStatus ?? null,
|
|
99
107
|
sseAlgorithm: config.sseAlgorithm ?? null,
|
|
100
108
|
sseKmsMasterKeyId: config.sseKmsMasterKeyId ?? null,
|
|
109
|
+
policy: serializeBucketPolicy(config.iam),
|
|
101
110
|
};
|
|
102
111
|
// Only include CDN/accelerate fields when they're actually enabled
|
|
103
112
|
if (config.cdnEnabled) {
|
|
@@ -103,7 +103,12 @@ const transformFCResponse = (result) => {
|
|
|
103
103
|
const statusCode = isNaN(parsedStatus) ? 200 : parsedStatus;
|
|
104
104
|
let body = rawBody;
|
|
105
105
|
if (isBase64Encoded && typeof body === 'string') {
|
|
106
|
-
|
|
106
|
+
const decoded = Buffer.from(body, 'base64');
|
|
107
|
+
const contentType = String(typeof headers === 'object' && headers ? headers['content-type'] || '' : '');
|
|
108
|
+
const isBinary = /^(image|audio|video)\//.test(contentType) ||
|
|
109
|
+
contentType === 'application/pdf' ||
|
|
110
|
+
contentType.includes('font/');
|
|
111
|
+
body = isBinary ? decoded : decoded.toString('utf-8');
|
|
107
112
|
}
|
|
108
113
|
// Only JSON-parse if the response Content-Type indicates JSON — otherwise pass through as-is.
|
|
109
114
|
// Aliyun API Gateway PASSTHROUGH mode sends raw body; si-local mirrors this behavior.
|
|
@@ -9,6 +9,48 @@ const certUtils_1 = require("../../common/certUtils");
|
|
|
9
9
|
const logger_1 = require("../../common/logger");
|
|
10
10
|
const lang_1 = require("../../lang");
|
|
11
11
|
const domainUtils_1 = require("../../common/domainUtils");
|
|
12
|
+
const toCosStatement = (stmt) => {
|
|
13
|
+
const s = {
|
|
14
|
+
effect: stmt.effect.toLowerCase(),
|
|
15
|
+
principal: stmt.principal,
|
|
16
|
+
action: stmt.action,
|
|
17
|
+
resource: stmt.resource,
|
|
18
|
+
};
|
|
19
|
+
if (stmt.condition) {
|
|
20
|
+
s.condition = stmt.condition;
|
|
21
|
+
}
|
|
22
|
+
return s;
|
|
23
|
+
};
|
|
24
|
+
const buildCosBucketPolicyJson = (iam) => {
|
|
25
|
+
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
26
|
+
return null;
|
|
27
|
+
return {
|
|
28
|
+
version: '2.0',
|
|
29
|
+
statement: iam.resource.statements.map(toCosStatement),
|
|
30
|
+
};
|
|
31
|
+
};
|
|
32
|
+
const applyBucketPolicy = async (client, bucket, region) => {
|
|
33
|
+
if (!bucket.iam)
|
|
34
|
+
return;
|
|
35
|
+
const policy = buildCosBucketPolicyJson(bucket.iam);
|
|
36
|
+
if (!policy) {
|
|
37
|
+
// iam exists but has no statements — delete any existing policy
|
|
38
|
+
await deleteBucketPolicy(client, bucket.name, region);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLYING', { bucketName: bucket.name }));
|
|
42
|
+
await client.cos.putBucketPolicy(bucket.name, region, policy);
|
|
43
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLIED', { bucketName: bucket.name }));
|
|
44
|
+
};
|
|
45
|
+
const deleteBucketPolicy = async (client, bucketName, region) => {
|
|
46
|
+
try {
|
|
47
|
+
await client.cos.deleteBucketPolicy(bucketName, region);
|
|
48
|
+
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_DELETED', { bucketName }));
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
// Best effort cleanup
|
|
52
|
+
}
|
|
53
|
+
};
|
|
12
54
|
const resolveBucketDomainCertificate = (bucket) => {
|
|
13
55
|
const website = bucket.website;
|
|
14
56
|
if (!website)
|
|
@@ -185,6 +227,8 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
185
227
|
instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
|
|
186
228
|
}
|
|
187
229
|
}
|
|
230
|
+
// Apply IAM bucket policy if configured
|
|
231
|
+
await applyBucketPolicy(client, bucket, context.region);
|
|
188
232
|
const resourceState = {
|
|
189
233
|
mode: 'managed',
|
|
190
234
|
region: context.region,
|
|
@@ -290,6 +334,18 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
290
334
|
await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
|
|
291
335
|
}
|
|
292
336
|
}
|
|
337
|
+
// Apply IAM bucket policy if configured (update or remove)
|
|
338
|
+
const existingDef = existingState?.definition;
|
|
339
|
+
const oldPolicyJson = existingDef?.policy;
|
|
340
|
+
const newPolicyJson = bucket.iam ? JSON.stringify(bucket.iam) : null;
|
|
341
|
+
if (newPolicyJson !== (oldPolicyJson ?? null)) {
|
|
342
|
+
if (newPolicyJson) {
|
|
343
|
+
await applyBucketPolicy(client, bucket, context.region);
|
|
344
|
+
}
|
|
345
|
+
else {
|
|
346
|
+
await deleteBucketPolicy(client, config.Bucket, context.region);
|
|
347
|
+
}
|
|
348
|
+
}
|
|
293
349
|
const resourceState = {
|
|
294
350
|
mode: 'managed',
|
|
295
351
|
region: context.region,
|
|
@@ -304,6 +360,8 @@ const deleteBucketResource = async (context, bucketName, region, logicalId, stat
|
|
|
304
360
|
const client = (0, tencentClient_1.createTencentClient)(context);
|
|
305
361
|
const existingState = state.resources[logicalId];
|
|
306
362
|
const dnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
|
|
363
|
+
// Clean up bucket policy before deleting bucket
|
|
364
|
+
await deleteBucketPolicy(client, bucketName, region);
|
|
307
365
|
if (dnsInstances) {
|
|
308
366
|
for (const dnsInstance of dnsInstances) {
|
|
309
367
|
await client.cos.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
|
|
@@ -6,6 +6,9 @@ const bucketToCosBucketConfig = (bucket, region) => {
|
|
|
6
6
|
Bucket: bucket.name,
|
|
7
7
|
Region: region,
|
|
8
8
|
};
|
|
9
|
+
if (bucket.iam) {
|
|
10
|
+
config.IamPolicy = bucket.iam;
|
|
11
|
+
}
|
|
9
12
|
if (bucket.security?.acl) {
|
|
10
13
|
const aclMap = {
|
|
11
14
|
PRIVATE: 'private',
|
|
@@ -54,6 +57,11 @@ const bucketToCosBucketConfig = (bucket, region) => {
|
|
|
54
57
|
return config;
|
|
55
58
|
};
|
|
56
59
|
exports.bucketToCosBucketConfig = bucketToCosBucketConfig;
|
|
60
|
+
const serializeBucketPolicy = (iam) => {
|
|
61
|
+
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
62
|
+
return null;
|
|
63
|
+
return JSON.stringify(iam);
|
|
64
|
+
};
|
|
57
65
|
const extractCosBucketDefinition = (config) => {
|
|
58
66
|
return {
|
|
59
67
|
bucket: config.Bucket,
|
|
@@ -74,6 +82,7 @@ const extractCosBucketDefinition = (config) => {
|
|
|
74
82
|
versioningStatus: config.VersioningStatus ?? null,
|
|
75
83
|
sseAlgorithm: config.SseAlgorithm ?? null,
|
|
76
84
|
sseKmsMasterKeyId: config.SseKmsMasterKeyId ?? null,
|
|
85
|
+
policy: serializeBucketPolicy(config.IamPolicy),
|
|
77
86
|
};
|
|
78
87
|
};
|
|
79
88
|
exports.extractCosBucketDefinition = extractCosBucketDefinition;
|
|
@@ -26,7 +26,7 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
26
26
|
const config = (0, scfTypes_1.functionToScfConfig)(fn);
|
|
27
27
|
const codePath = fn.code.path;
|
|
28
28
|
const desiredCodeHash = (0, hashUtils_1.computeFileHash)(codePath);
|
|
29
|
-
const desiredDefinition = (0, scfTypes_1.extractScfDefinition)(config, desiredCodeHash);
|
|
29
|
+
const desiredDefinition = (0, scfTypes_1.extractScfDefinition)(config, desiredCodeHash, fn.iam);
|
|
30
30
|
if (!currentState) {
|
|
31
31
|
return {
|
|
32
32
|
logicalId,
|