@geek-fun/serverlessinsight 0.8.2 → 0.8.4
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 +15 -0
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +33 -0
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +359 -0
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +15 -0
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +154 -0
- package/.serverlessinsight/state-insight-volc-destroy-app-insight-volc-destroy.json.backup +1 -0
- package/README.md +26 -18
- package/README.zh-CN.md +19 -6
- package/dist/package.json +5 -2
- package/dist/src/commands/deploy.js +87 -4
- package/dist/src/commands/destroy.js +61 -10
- package/dist/src/commands/forceUnlock.js +8 -0
- package/dist/src/commands/index.js +34 -2
- package/dist/src/commands/login.js +195 -0
- package/dist/src/commands/logout.js +17 -0
- package/dist/src/commands/show.js +15 -7
- package/dist/src/commands/whoami.js +20 -0
- package/dist/src/common/aliyunClient/apigwOperations.js +363 -30
- package/dist/src/common/aliyunClient/esOperations.js +43 -29
- package/dist/src/common/aliyunClient/fc3Operations.js +481 -207
- package/dist/src/common/aliyunClient/ossOperations.js +165 -13
- package/dist/src/common/aliyunClient/rdsOperations.js +143 -39
- package/dist/src/common/aliyunClient/slsOperations.js +90 -28
- package/dist/src/common/aliyunClient/tablestoreOperations.js +25 -22
- package/dist/src/common/apiClient.js +102 -0
- package/dist/src/common/constants.js +13 -4
- package/dist/src/common/credentialStore.js +94 -0
- package/dist/src/common/credentials.js +2 -0
- package/dist/src/common/eventQueue.js +208 -0
- package/dist/src/common/hashUtils.js +87 -11
- package/dist/src/common/imsClient.js +1 -0
- package/dist/src/common/index.js +3 -0
- package/dist/src/common/lockManager.js +61 -54
- package/dist/src/common/logger.js +2 -0
- package/dist/src/common/polling.js +54 -0
- package/dist/src/common/reportResourceEvent.js +8 -0
- package/dist/src/common/runtimeMapper.js +11 -12
- package/dist/src/common/stateBackend/index.js +10 -1
- package/dist/src/common/stateBackend/localStateBackend.js +4 -1
- package/dist/src/common/stateBackend/remoteStateBackend.js +10 -4
- package/dist/src/common/stateBackend/saasStateBackend.js +266 -0
- package/dist/src/common/stateManager.js +186 -14
- package/dist/src/common/tencentClient/clsOperations.js +137 -0
- package/dist/src/common/tencentClient/cosOperations.js +180 -3
- package/dist/src/common/tencentClient/esOperations.js +110 -46
- package/dist/src/common/tencentClient/index.js +43 -2
- package/dist/src/common/tencentClient/scfOperations.js +266 -133
- package/dist/src/common/tencentClient/tdsqlcClusterMapper.js +81 -0
- package/dist/src/common/tencentClient/tdsqlcOperations.js +93 -99
- package/dist/src/common/triggerMapper.js +36 -0
- package/dist/src/common/volcengineClient/apigwOperations.js +539 -159
- package/dist/src/common/volcengineClient/iamOperations.js +91 -48
- package/dist/src/common/volcengineClient/index.js +46 -21
- package/dist/src/common/volcengineClient/stsOperations.js +32 -0
- package/dist/src/common/volcengineClient/tlsOperations.js +305 -171
- package/dist/src/common/volcengineClient/tosOperations.js +78 -19
- package/dist/src/common/volcengineClient/vefaasOperations.js +272 -54
- package/dist/src/lang/en.js +107 -1
- package/dist/src/lang/zh-CN.js +107 -1
- package/dist/src/parser/eventParser.js +2 -0
- package/dist/src/parser/functionParser.js +96 -65
- package/dist/src/parser/index.js +7 -4
- package/dist/src/stack/aliyunStack/apigwExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/apigwPlanner.js +16 -10
- package/dist/src/stack/aliyunStack/apigwResource.js +334 -125
- package/dist/src/stack/aliyunStack/apigwTypes.js +35 -4
- package/dist/src/stack/aliyunStack/databaseExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/databasePlanner.js +13 -1
- package/dist/src/stack/aliyunStack/databaseResource.js +135 -40
- package/dist/src/stack/aliyunStack/deployer.js +2 -2
- package/dist/src/stack/aliyunStack/destroyer.js +27 -2
- package/dist/src/stack/aliyunStack/fc3Executor.js +25 -2
- package/dist/src/stack/aliyunStack/fc3Planner.js +11 -1
- package/dist/src/stack/aliyunStack/fc3Resource.js +416 -94
- package/dist/src/stack/aliyunStack/ossExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
- package/dist/src/stack/aliyunStack/ossResource.js +267 -219
- package/dist/src/stack/aliyunStack/sharedLogProject.js +137 -0
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/tablestorePlanner.js +13 -1
- package/dist/src/stack/aliyunStack/tablestoreResource.js +54 -20
- package/dist/src/stack/alreadyExists.js +26 -0
- package/dist/src/stack/ownershipTag.js +58 -0
- package/dist/src/stack/rfsStack/index.js +3 -1
- package/dist/src/stack/scfStack/cosExecutor.js +39 -1
- package/dist/src/stack/scfStack/cosPlanner.js +11 -1
- package/dist/src/stack/scfStack/cosResource.js +167 -64
- package/dist/src/stack/scfStack/deployer.js +2 -2
- package/dist/src/stack/scfStack/destroyer.js +15 -2
- package/dist/src/stack/scfStack/esServerlessExecutor.js +39 -1
- package/dist/src/stack/scfStack/esServerlessPlanner.js +11 -1
- package/dist/src/stack/scfStack/esServerlessResource.js +88 -23
- package/dist/src/stack/scfStack/scfExecutor.js +39 -1
- package/dist/src/stack/scfStack/scfPlanner.js +21 -3
- package/dist/src/stack/scfStack/scfResource.js +686 -24
- package/dist/src/stack/scfStack/scfTypes.js +6 -0
- package/dist/src/stack/scfStack/sharedLogset.js +126 -0
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +39 -1
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +12 -1
- package/dist/src/stack/scfStack/tdsqlcResource.js +95 -16
- package/dist/src/stack/scfStack/tdsqlcTypes.js +5 -1
- package/dist/src/stack/volcengineStack/apigwExecutor.js +39 -1
- package/dist/src/stack/volcengineStack/apigwPlanner.js +25 -53
- package/dist/src/stack/volcengineStack/apigwResource.js +434 -222
- package/dist/src/stack/volcengineStack/apigwTypes.js +85 -66
- package/dist/src/stack/volcengineStack/deployer.js +49 -14
- package/dist/src/stack/volcengineStack/destroyer.js +13 -1
- package/dist/src/stack/volcengineStack/index.js +1 -2
- package/dist/src/stack/volcengineStack/sharedLogProject.js +190 -0
- package/dist/src/stack/volcengineStack/tosExecutor.js +25 -2
- package/dist/src/stack/volcengineStack/tosPlanner.js +11 -1
- package/dist/src/stack/volcengineStack/tosResource.js +82 -27
- package/dist/src/stack/volcengineStack/tosTypes.js +12 -0
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +25 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +78 -2
- package/dist/src/stack/volcengineStack/vefaasResource.js +194 -144
- package/dist/src/stack/volcengineStack/vefaasTypes.js +1 -3
- package/dist/src/types/domains/backend.js +1 -0
- package/dist/src/types/domains/state.js +32 -1
- package/dist/src/validator/eventSchema.js +10 -0
- package/dist/src/validator/functionSchema.js +37 -12
- package/dist/src/validator/iacSchema.js +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -2
|
@@ -9,10 +9,15 @@ const common_1 = require("../../common");
|
|
|
9
9
|
const certUtils_1 = require("../../common/certUtils");
|
|
10
10
|
const types_1 = require("../../types");
|
|
11
11
|
const ossTypes_1 = require("./ossTypes");
|
|
12
|
+
const ownershipTag_1 = require("../ownershipTag");
|
|
13
|
+
const alreadyExists_1 = require("../alreadyExists");
|
|
12
14
|
const logger_1 = require("../../common/logger");
|
|
13
15
|
const lang_1 = require("../../lang");
|
|
14
16
|
const node_path_1 = __importDefault(require("node:path"));
|
|
15
17
|
const domainUtils_1 = require("../../common/domainUtils");
|
|
18
|
+
// getBucket returns tags as { key, value } (BucketTag); the ownership helper
|
|
19
|
+
// expects { Key, Value }. Convert before verification.
|
|
20
|
+
const toOwnershipTags = (tags) => tags?.map((tag) => ({ Key: tag.key, Value: tag.value }));
|
|
16
21
|
const buildOssInstanceFromProvider = (info, sid) => {
|
|
17
22
|
return {
|
|
18
23
|
type: types_1.ResourceTypeEnum.ALIYUN_OSS_BUCKET,
|
|
@@ -97,6 +102,7 @@ const buildOssInstanceFromProvider = (info, sid) => {
|
|
|
97
102
|
key: tag.key ?? null,
|
|
98
103
|
value: tag.value ?? null,
|
|
99
104
|
})),
|
|
105
|
+
policy: info.policy ?? null,
|
|
100
106
|
};
|
|
101
107
|
};
|
|
102
108
|
const resolveBucketDomainCertificate = async (bucket, client) => {
|
|
@@ -175,23 +181,25 @@ const getDomainName = (bucket) => {
|
|
|
175
181
|
const createBucketResource = async (context, bucket, state) => {
|
|
176
182
|
const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
|
|
177
183
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
178
|
-
await client.oss.createBucket({
|
|
179
|
-
bucketName: config.bucketName,
|
|
180
|
-
acl: config.acl,
|
|
181
|
-
websiteConfig: config.websiteConfig,
|
|
182
|
-
storageClass: config.storageClass,
|
|
183
|
-
});
|
|
184
|
-
// Refresh state from provider to get bucket info
|
|
185
|
-
let bucketInfo = await client.oss.getBucket(config.bucketName);
|
|
186
|
-
if (!bucketInfo) {
|
|
187
|
-
throw new Error(lang_1.lang.__('FAILED_TO_REFRESH_STATE', { resourceType: 'bucket', name: config.bucketName }));
|
|
188
|
-
}
|
|
189
184
|
const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
|
|
190
185
|
const logicalId = `buckets.${bucket.key}`;
|
|
191
|
-
|
|
186
|
+
// Stamp the ownership tag into the create config so the provider records who
|
|
187
|
+
// owns the bucket. A later deploy whose local state was reset can then adopt
|
|
188
|
+
// it idempotently (PutBucket is idempotent) only when the tag matches — a
|
|
189
|
+
// same-named untagged bucket is never silently taken over.
|
|
190
|
+
config.Tags = [{ Key: ownershipTag_1.OWNERSHIP_TAG_KEY, Value: (0, ownershipTag_1.buildOwnershipTagValue)(context, logicalId) }];
|
|
192
191
|
const websiteCodeHash = bucket.website?.code
|
|
193
192
|
? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
|
|
194
193
|
: undefined;
|
|
194
|
+
const existingResourceState = (0, common_1.getResource)(state, logicalId);
|
|
195
|
+
const isTainted = existingResourceState?.status === 'tainted';
|
|
196
|
+
let existingBucketOnRetry = isTainted ? await client.oss.getBucket(config.bucketName) : null;
|
|
197
|
+
if (existingBucketOnRetry) {
|
|
198
|
+
logger_1.logger.info(`Bucket ${config.bucketName} already exists in provider (tainted recovery), skipping create`);
|
|
199
|
+
}
|
|
200
|
+
const instances = existingBucketOnRetry
|
|
201
|
+
? [buildOssInstanceFromProvider(existingBucketOnRetry, sid)]
|
|
202
|
+
: [];
|
|
195
203
|
const partialResourceState = {
|
|
196
204
|
mode: 'managed',
|
|
197
205
|
region: context.region,
|
|
@@ -201,244 +209,294 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
201
209
|
},
|
|
202
210
|
instances,
|
|
203
211
|
lastUpdated: new Date().toISOString(),
|
|
212
|
+
status: 'tainted',
|
|
204
213
|
};
|
|
205
|
-
|
|
214
|
+
const stateAfterDependents = (0, common_1.setResource)(state, logicalId, partialResourceState);
|
|
206
215
|
const domainName = getDomainName(bucket);
|
|
207
216
|
const isCdnEnabled = getIsCdnEnabled(bucket);
|
|
208
217
|
const isAccelerateEnabled = getIsAccelerateEnabled(bucket);
|
|
209
218
|
let cnameInfo;
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
origin: originEndpoint,
|
|
239
|
-
}));
|
|
240
|
-
await client.cdn.addCdnDomain({
|
|
241
|
-
domainName: primaryDomain,
|
|
242
|
-
cdnType: resolvedCdnType,
|
|
243
|
-
sources: [{ type: 'oss', content: originEndpoint }],
|
|
244
|
-
scope: resolvedScope,
|
|
245
|
-
});
|
|
246
|
-
if (cdnObj) {
|
|
247
|
-
if (cdnObj.cache_ttl != null || cdnObj.ignore_query_string != null) {
|
|
248
|
-
await client.cdn.applyCacheConfig(primaryDomain, cdnObj.cache_ttl, cdnObj.ignore_query_string);
|
|
249
|
-
}
|
|
250
|
-
if (cdnObj.origin_protocol) {
|
|
251
|
-
await client.cdn.applyProtocolConfig(primaryDomain, cdnObj.origin_protocol);
|
|
252
|
-
}
|
|
253
|
-
if (cdnObj.compression != null) {
|
|
254
|
-
await client.cdn.applyCompression(primaryDomain, cdnObj.compression);
|
|
219
|
+
const refuseAdoptionError = () => new Error(`Bucket ${config.bucketName} already exists in provider but is not owned by this stack (missing ${ownershipTag_1.OWNERSHIP_TAG_KEY} tag). Refusing to adopt — resolve manually.`);
|
|
220
|
+
try {
|
|
221
|
+
if (!existingBucketOnRetry) {
|
|
222
|
+
try {
|
|
223
|
+
await client.oss.createBucket({
|
|
224
|
+
bucketName: config.bucketName,
|
|
225
|
+
acl: config.acl,
|
|
226
|
+
websiteConfig: config.websiteConfig,
|
|
227
|
+
storageClass: config.storageClass,
|
|
228
|
+
Tags: config.Tags,
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
catch (error) {
|
|
232
|
+
if ((0, alreadyExists_1.isResourceAlreadyExistsError)(error, ['BucketAlreadyExists', 'BucketAlreadyOwnedByYou'])) {
|
|
233
|
+
// Idempotent adoption: a same-named bucket already exists in the
|
|
234
|
+
// provider. Adopt it ONLY if it carries our ownership tag (proves a
|
|
235
|
+
// previous run of THIS stack created it — e.g. state was reset). An
|
|
236
|
+
// untagged bucket may belong to another project, so it must fail
|
|
237
|
+
// loudly rather than silently taking it over (destroy would then
|
|
238
|
+
// remove a resource that was never ours).
|
|
239
|
+
const probe = await client.oss.getBucket(config.bucketName);
|
|
240
|
+
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTags(probe.tags))) {
|
|
241
|
+
existingBucketOnRetry = probe;
|
|
242
|
+
logger_1.logger.info(`Bucket ${config.bucketName} exists and carries ownership tag (${ownershipTag_1.OWNERSHIP_TAG_KEY}), adopting idempotently`);
|
|
243
|
+
}
|
|
244
|
+
else {
|
|
245
|
+
throw new types_1.PartialResourceError(stateAfterDependents, refuseAdoptionError());
|
|
246
|
+
}
|
|
255
247
|
}
|
|
256
|
-
|
|
257
|
-
|
|
248
|
+
else {
|
|
249
|
+
throw error;
|
|
258
250
|
}
|
|
259
251
|
}
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
serverCertificateStatus: 'on',
|
|
268
|
-
});
|
|
252
|
+
}
|
|
253
|
+
// Refresh state from provider to get bucket info
|
|
254
|
+
let bucketInfo = existingBucketOnRetry ?? null;
|
|
255
|
+
if (!bucketInfo) {
|
|
256
|
+
bucketInfo = await client.oss.getBucket(config.bucketName);
|
|
257
|
+
if (!bucketInfo) {
|
|
258
|
+
throw new Error(lang_1.lang.__('FAILED_TO_REFRESH_STATE', { resourceType: 'bucket', name: config.bucketName }));
|
|
269
259
|
}
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
cname: cdnCname,
|
|
277
|
-
};
|
|
278
|
-
instances.push(cdnInstance);
|
|
279
|
-
// Create DNS CNAME pointing to CDN distribution target
|
|
280
|
-
const dnsRecordId = await client.dns.addDomainRecord({
|
|
281
|
-
domainName: mainDomain,
|
|
282
|
-
rr: hostRecord,
|
|
283
|
-
type: 'CNAME',
|
|
284
|
-
value: cdnCname,
|
|
285
|
-
ttl: 600,
|
|
286
|
-
});
|
|
287
|
-
const dnsInstance = {
|
|
288
|
-
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
|
|
289
|
-
id: dnsRecordId || primaryDomain,
|
|
290
|
-
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
291
|
-
domain: primaryDomain,
|
|
292
|
-
cname: cdnCname,
|
|
293
|
-
dnsRecordId: dnsRecordId || undefined,
|
|
294
|
-
};
|
|
295
|
-
instances.push(dnsInstance);
|
|
260
|
+
// PutBucket is idempotent within the same region/account, so a
|
|
261
|
+
// "successful" create does NOT prove we created the bucket — it may have
|
|
262
|
+
// pre-existed. Verify ownership; an untagged bucket is refused rather
|
|
263
|
+
// than silently adopted.
|
|
264
|
+
if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTags(bucketInfo.tags))) {
|
|
265
|
+
throw new types_1.PartialResourceError(stateAfterDependents, refuseAdoptionError());
|
|
296
266
|
}
|
|
297
|
-
// Bind custom domain to OSS bucket for back-to-origin (internal, not DNS-facing)
|
|
298
|
-
cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate, true);
|
|
299
|
-
}
|
|
300
|
-
else if (isAccelerateEnabled) {
|
|
301
|
-
// Accelerate-only: create DNS pointing to accelerated endpoint
|
|
302
|
-
const accelerateEndpoint = await client.oss.getAccelerateEndpoint(config.bucketName);
|
|
303
|
-
const dnsRecordId = await client.dns.addDomainRecord({
|
|
304
|
-
domainName: mainDomain,
|
|
305
|
-
rr: hostRecord,
|
|
306
|
-
type: 'CNAME',
|
|
307
|
-
value: accelerateEndpoint,
|
|
308
|
-
ttl: 600,
|
|
309
|
-
});
|
|
310
|
-
const dnsInstance = {
|
|
311
|
-
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
|
|
312
|
-
id: dnsRecordId || primaryDomain,
|
|
313
|
-
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
314
|
-
domain: primaryDomain,
|
|
315
|
-
cname: accelerateEndpoint,
|
|
316
|
-
dnsRecordId: dnsRecordId || undefined,
|
|
317
|
-
};
|
|
318
|
-
instances.push(dnsInstance);
|
|
319
|
-
cnameInfo = {
|
|
320
|
-
domain: primaryDomain,
|
|
321
|
-
cname: accelerateEndpoint,
|
|
322
|
-
dnsRecordId: dnsRecordId || undefined,
|
|
323
|
-
bucketCnameBound: false,
|
|
324
|
-
};
|
|
325
267
|
}
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
}));
|
|
333
|
-
}
|
|
334
|
-
cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
|
|
335
|
-
if (cnameInfo) {
|
|
336
|
-
const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
|
|
337
|
-
const dnsInstance = {
|
|
338
|
-
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
|
|
339
|
-
id: instanceId,
|
|
340
|
-
type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
|
|
341
|
-
domain: primaryDomain,
|
|
342
|
-
cname: cnameInfo.cname,
|
|
343
|
-
...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
|
|
344
|
-
...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
|
|
345
|
-
};
|
|
346
|
-
instances.push(dnsInstance);
|
|
268
|
+
instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
|
|
269
|
+
// Enable transfer acceleration if requested
|
|
270
|
+
if (isAccelerateEnabled) {
|
|
271
|
+
logger_1.logger.info(lang_1.lang.__('ENABLING_OSS_TRANSFER_ACCELERATION', { bucketName: config.bucketName }));
|
|
272
|
+
const accelEnabled = await client.oss.enableTransferAcceleration(config.bucketName);
|
|
273
|
+
if (!accelEnabled) {
|
|
274
|
+
throw new Error(lang_1.lang.__('FAILED_TO_ENABLE_ACCELERATION', { bucketName: config.bucketName }));
|
|
347
275
|
}
|
|
348
276
|
}
|
|
349
|
-
|
|
350
|
-
|
|
277
|
+
if (domainName) {
|
|
278
|
+
const certificate = await resolveBucketDomainCertificate(bucket, client);
|
|
279
|
+
const primaryDomain = domainName;
|
|
280
|
+
const wwwBindApex = bucket.domain?.www_bind_apex ?? bucket.website?.www_bind_apex ?? false;
|
|
281
|
+
const mainDomain = (0, domainUtils_1.extractMainDomain)(primaryDomain);
|
|
282
|
+
const hostRecord = (0, domainUtils_1.extractHostRecord)(primaryDomain, mainDomain);
|
|
351
283
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
352
|
-
domain:
|
|
284
|
+
domain: primaryDomain,
|
|
353
285
|
bucketName: config.bucketName,
|
|
354
286
|
}));
|
|
287
|
+
// Resolve CDN config from bucket.domain.cdn object form
|
|
288
|
+
const cdnObj = typeof bucket.domain?.cdn === 'object' ? bucket.domain?.cdn : undefined;
|
|
289
|
+
const resolvedCdnType = cdnObj?.cdn_type ?? 'web';
|
|
290
|
+
const resolvedScope = cdnObj?.scope ?? 'global';
|
|
355
291
|
if (isCdnEnabled) {
|
|
356
292
|
const originEndpoint = isAccelerateEnabled
|
|
357
293
|
? await client.oss.getAccelerateEndpoint(config.bucketName)
|
|
358
294
|
: await client.oss.getBucketCnameEndpoint(config.bucketName);
|
|
295
|
+
logger_1.logger.info(lang_1.lang.__('CREATING_CDN_DISTRIBUTION', {
|
|
296
|
+
domain: primaryDomain,
|
|
297
|
+
origin: originEndpoint,
|
|
298
|
+
}));
|
|
359
299
|
await client.cdn.addCdnDomain({
|
|
360
|
-
domainName:
|
|
300
|
+
domainName: primaryDomain,
|
|
361
301
|
cdnType: resolvedCdnType,
|
|
362
302
|
sources: [{ type: 'oss', content: originEndpoint }],
|
|
363
303
|
scope: resolvedScope,
|
|
364
304
|
});
|
|
365
|
-
const wwwCdnInfo = await client.cdn.describeCdnDomainDetail(wwwDomain);
|
|
366
305
|
if (cdnObj) {
|
|
367
306
|
if (cdnObj.cache_ttl != null || cdnObj.ignore_query_string != null) {
|
|
368
|
-
await client.cdn.applyCacheConfig(
|
|
307
|
+
await client.cdn.applyCacheConfig(primaryDomain, cdnObj.cache_ttl, cdnObj.ignore_query_string);
|
|
369
308
|
}
|
|
370
309
|
if (cdnObj.origin_protocol) {
|
|
371
|
-
await client.cdn.applyProtocolConfig(
|
|
310
|
+
await client.cdn.applyProtocolConfig(primaryDomain, cdnObj.origin_protocol);
|
|
372
311
|
}
|
|
373
312
|
if (cdnObj.compression != null) {
|
|
374
|
-
await client.cdn.applyCompression(
|
|
313
|
+
await client.cdn.applyCompression(primaryDomain, cdnObj.compression);
|
|
375
314
|
}
|
|
376
315
|
if (cdnObj.force_redirect_https != null) {
|
|
377
|
-
await client.cdn.applyHttpsRedirect(
|
|
316
|
+
await client.cdn.applyHttpsRedirect(primaryDomain, cdnObj.force_redirect_https);
|
|
378
317
|
}
|
|
379
318
|
}
|
|
319
|
+
const cdnDomainInfo = await client.cdn.describeCdnDomainDetail(primaryDomain);
|
|
320
|
+
const cdnCname = cdnDomainInfo?.cname;
|
|
380
321
|
if (certificate) {
|
|
381
|
-
|
|
322
|
+
logger_1.logger.info(lang_1.lang.__('CDN_DEPLOYING_CERTIFICATE', { domain: primaryDomain }));
|
|
323
|
+
await client.cdn.setDomainServerCertificate(primaryDomain, {
|
|
382
324
|
serverCertificate: certificate.certificateBody,
|
|
383
325
|
privateKey: certificate.certificatePrivateKey,
|
|
384
326
|
serverCertificateStatus: 'on',
|
|
385
327
|
});
|
|
386
328
|
}
|
|
387
|
-
if (
|
|
388
|
-
const
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
329
|
+
if (cdnCname) {
|
|
330
|
+
const cdnInstance = {
|
|
331
|
+
sid: (0, common_1.buildSid)('aliyun', 'cdn', context.stage, primaryDomain),
|
|
332
|
+
id: primaryDomain,
|
|
333
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
|
|
334
|
+
domainName: primaryDomain,
|
|
335
|
+
cname: cdnCname,
|
|
336
|
+
};
|
|
337
|
+
instances.push(cdnInstance);
|
|
338
|
+
// Create DNS CNAME pointing to CDN distribution target
|
|
339
|
+
const dnsRecordId = await client.dns.addDomainRecord({
|
|
340
|
+
domainName: mainDomain,
|
|
341
|
+
rr: hostRecord,
|
|
393
342
|
type: 'CNAME',
|
|
394
|
-
value:
|
|
343
|
+
value: cdnCname,
|
|
395
344
|
ttl: 600,
|
|
396
345
|
});
|
|
397
|
-
const
|
|
398
|
-
sid: (0, common_1.buildSid)('aliyun', '
|
|
399
|
-
id:
|
|
400
|
-
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
|
|
401
|
-
domainName: wwwDomain,
|
|
402
|
-
cname: wwwCdnInfo.cname,
|
|
403
|
-
};
|
|
404
|
-
instances.push(wwwCdnInstance);
|
|
405
|
-
const wwwDnsInstance = {
|
|
406
|
-
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwDnsRecordId || wwwDomain),
|
|
407
|
-
id: wwwDnsRecordId || wwwDomain,
|
|
346
|
+
const dnsInstance = {
|
|
347
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
|
|
348
|
+
id: dnsRecordId || primaryDomain,
|
|
408
349
|
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
409
|
-
domain:
|
|
410
|
-
cname:
|
|
411
|
-
dnsRecordId:
|
|
350
|
+
domain: primaryDomain,
|
|
351
|
+
cname: cdnCname,
|
|
352
|
+
dnsRecordId: dnsRecordId || undefined,
|
|
412
353
|
};
|
|
413
|
-
instances.push(
|
|
354
|
+
instances.push(dnsInstance);
|
|
414
355
|
}
|
|
356
|
+
// Bind custom domain to OSS bucket for back-to-origin (internal, not DNS-facing)
|
|
357
|
+
cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate, true);
|
|
358
|
+
}
|
|
359
|
+
else if (isAccelerateEnabled) {
|
|
360
|
+
// Accelerate-only: create DNS pointing to accelerated endpoint
|
|
361
|
+
const accelerateEndpoint = await client.oss.getAccelerateEndpoint(config.bucketName);
|
|
362
|
+
const dnsRecordId = await client.dns.addDomainRecord({
|
|
363
|
+
domainName: mainDomain,
|
|
364
|
+
rr: hostRecord,
|
|
365
|
+
type: 'CNAME',
|
|
366
|
+
value: accelerateEndpoint,
|
|
367
|
+
ttl: 600,
|
|
368
|
+
});
|
|
369
|
+
const dnsInstance = {
|
|
370
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || primaryDomain),
|
|
371
|
+
id: dnsRecordId || primaryDomain,
|
|
372
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
373
|
+
domain: primaryDomain,
|
|
374
|
+
cname: accelerateEndpoint,
|
|
375
|
+
dnsRecordId: dnsRecordId || undefined,
|
|
376
|
+
};
|
|
377
|
+
instances.push(dnsInstance);
|
|
378
|
+
cnameInfo = {
|
|
379
|
+
domain: primaryDomain,
|
|
380
|
+
cname: accelerateEndpoint,
|
|
381
|
+
dnsRecordId: dnsRecordId || undefined,
|
|
382
|
+
bucketCnameBound: false,
|
|
383
|
+
};
|
|
415
384
|
}
|
|
416
385
|
else {
|
|
417
|
-
|
|
418
|
-
if (
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
386
|
+
// Direct OSS domain binding (existing behavior)
|
|
387
|
+
if (certificate) {
|
|
388
|
+
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
|
|
389
|
+
domain: primaryDomain,
|
|
390
|
+
bucketName: config.bucketName,
|
|
391
|
+
}));
|
|
392
|
+
}
|
|
393
|
+
cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
|
|
394
|
+
if (cnameInfo) {
|
|
395
|
+
const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
|
|
396
|
+
const dnsInstance = {
|
|
397
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
|
|
398
|
+
id: instanceId,
|
|
423
399
|
type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
|
|
424
|
-
domain:
|
|
425
|
-
cname:
|
|
426
|
-
|
|
427
|
-
...(
|
|
428
|
-
...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
|
|
400
|
+
domain: primaryDomain,
|
|
401
|
+
cname: cnameInfo.cname,
|
|
402
|
+
...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
|
|
403
|
+
...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
|
|
429
404
|
};
|
|
430
|
-
instances.push(
|
|
405
|
+
instances.push(dnsInstance);
|
|
431
406
|
}
|
|
432
407
|
}
|
|
408
|
+
const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
|
|
409
|
+
if (wwwDomain) {
|
|
410
|
+
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
411
|
+
domain: wwwDomain,
|
|
412
|
+
bucketName: config.bucketName,
|
|
413
|
+
}));
|
|
414
|
+
if (isCdnEnabled) {
|
|
415
|
+
const originEndpoint = isAccelerateEnabled
|
|
416
|
+
? await client.oss.getAccelerateEndpoint(config.bucketName)
|
|
417
|
+
: await client.oss.getBucketCnameEndpoint(config.bucketName);
|
|
418
|
+
await client.cdn.addCdnDomain({
|
|
419
|
+
domainName: wwwDomain,
|
|
420
|
+
cdnType: resolvedCdnType,
|
|
421
|
+
sources: [{ type: 'oss', content: originEndpoint }],
|
|
422
|
+
scope: resolvedScope,
|
|
423
|
+
});
|
|
424
|
+
const wwwCdnInfo = await client.cdn.describeCdnDomainDetail(wwwDomain);
|
|
425
|
+
if (cdnObj) {
|
|
426
|
+
if (cdnObj.cache_ttl != null || cdnObj.ignore_query_string != null) {
|
|
427
|
+
await client.cdn.applyCacheConfig(wwwDomain, cdnObj.cache_ttl, cdnObj.ignore_query_string);
|
|
428
|
+
}
|
|
429
|
+
if (cdnObj.origin_protocol) {
|
|
430
|
+
await client.cdn.applyProtocolConfig(wwwDomain, cdnObj.origin_protocol);
|
|
431
|
+
}
|
|
432
|
+
if (cdnObj.compression != null) {
|
|
433
|
+
await client.cdn.applyCompression(wwwDomain, cdnObj.compression);
|
|
434
|
+
}
|
|
435
|
+
if (cdnObj.force_redirect_https != null) {
|
|
436
|
+
await client.cdn.applyHttpsRedirect(wwwDomain, cdnObj.force_redirect_https);
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
if (certificate) {
|
|
440
|
+
await client.cdn.setDomainServerCertificate(wwwDomain, {
|
|
441
|
+
serverCertificate: certificate.certificateBody,
|
|
442
|
+
privateKey: certificate.certificatePrivateKey,
|
|
443
|
+
serverCertificateStatus: 'on',
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
if (wwwCdnInfo?.cname) {
|
|
447
|
+
const wwwMainDomain = (0, domainUtils_1.extractMainDomain)(wwwDomain);
|
|
448
|
+
const wwwHostRecord = (0, domainUtils_1.extractHostRecord)(wwwDomain, wwwMainDomain);
|
|
449
|
+
const wwwDnsRecordId = await client.dns.addDomainRecord({
|
|
450
|
+
domainName: wwwMainDomain,
|
|
451
|
+
rr: wwwHostRecord,
|
|
452
|
+
type: 'CNAME',
|
|
453
|
+
value: wwwCdnInfo.cname,
|
|
454
|
+
ttl: 600,
|
|
455
|
+
});
|
|
456
|
+
const wwwCdnInstance = {
|
|
457
|
+
sid: (0, common_1.buildSid)('aliyun', 'cdn', context.stage, wwwDomain),
|
|
458
|
+
id: wwwDomain,
|
|
459
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
|
|
460
|
+
domainName: wwwDomain,
|
|
461
|
+
cname: wwwCdnInfo.cname,
|
|
462
|
+
};
|
|
463
|
+
instances.push(wwwCdnInstance);
|
|
464
|
+
const wwwDnsInstance = {
|
|
465
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwDnsRecordId || wwwDomain),
|
|
466
|
+
id: wwwDnsRecordId || wwwDomain,
|
|
467
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
468
|
+
domain: wwwDomain,
|
|
469
|
+
cname: wwwCdnInfo.cname,
|
|
470
|
+
dnsRecordId: wwwDnsRecordId || undefined,
|
|
471
|
+
};
|
|
472
|
+
instances.push(wwwDnsInstance);
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
else {
|
|
476
|
+
const wwwCnameInfo = await client.oss.bindCustomDomain(config.bucketName, wwwDomain, certificate);
|
|
477
|
+
if (wwwCnameInfo) {
|
|
478
|
+
const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
|
|
479
|
+
const wwwDnsInstance = {
|
|
480
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwInstanceId),
|
|
481
|
+
id: wwwInstanceId,
|
|
482
|
+
type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
|
|
483
|
+
domain: wwwDomain,
|
|
484
|
+
cname: wwwCnameInfo.cname,
|
|
485
|
+
isWwwVariant: true,
|
|
486
|
+
...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
|
|
487
|
+
...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
|
|
488
|
+
};
|
|
489
|
+
instances.push(wwwDnsInstance);
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
// Refresh bucket info to capture auto-added CORS rule
|
|
494
|
+
bucketInfo = await client.oss.getBucket(config.bucketName);
|
|
495
|
+
if (bucketInfo) {
|
|
496
|
+
instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
|
|
497
|
+
}
|
|
433
498
|
}
|
|
434
|
-
|
|
435
|
-
bucketInfo = await client.oss.getBucket(config.bucketName);
|
|
436
|
-
if (bucketInfo) {
|
|
437
|
-
instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
|
|
438
|
-
}
|
|
439
|
-
}
|
|
440
|
-
if (bucket.website?.code) {
|
|
441
|
-
try {
|
|
499
|
+
if (bucket.website?.code) {
|
|
442
500
|
const codePath = node_path_1.default.resolve(process.cwd(), bucket.website.code);
|
|
443
501
|
await client.oss.uploadFiles(config.bucketName, codePath);
|
|
444
502
|
// Refresh state after upload to get updated info
|
|
@@ -447,13 +505,16 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
447
505
|
instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
|
|
448
506
|
}
|
|
449
507
|
}
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
508
|
+
// Apply IAM bucket policy if configured
|
|
509
|
+
await applyBucketPolicy(client, bucket);
|
|
510
|
+
}
|
|
511
|
+
catch (error) {
|
|
512
|
+
// Refusal/adoption errors already carry the tainted state — rethrow as-is
|
|
513
|
+
// instead of wrapping a PartialResourceError inside another one.
|
|
514
|
+
if (error instanceof types_1.PartialResourceError)
|
|
515
|
+
throw error;
|
|
516
|
+
throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
|
|
454
517
|
}
|
|
455
|
-
// Apply IAM bucket policy if configured
|
|
456
|
-
await applyBucketPolicy(client, bucket);
|
|
457
518
|
const finalResourceState = {
|
|
458
519
|
mode: 'managed',
|
|
459
520
|
region: context.region,
|
|
@@ -464,7 +525,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
464
525
|
instances,
|
|
465
526
|
lastUpdated: new Date().toISOString(),
|
|
466
527
|
};
|
|
467
|
-
return (0, common_1.setResource)(
|
|
528
|
+
return (0, common_1.setResource)(stateAfterDependents, logicalId, finalResourceState);
|
|
468
529
|
};
|
|
469
530
|
exports.createBucketResource = createBucketResource;
|
|
470
531
|
/* istanbul ignore next */
|
|
@@ -726,16 +787,8 @@ const deleteBucketResource = async (context, bucketName, logicalId, state) => {
|
|
|
726
787
|
const cdnInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION);
|
|
727
788
|
if (cdnInstances) {
|
|
728
789
|
for (const cdnInstance of cdnInstances) {
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
|
|
732
|
-
}
|
|
733
|
-
catch (error) {
|
|
734
|
-
logger_1.logger.warn(lang_1.lang.__('CDN_DOMAIN_DELETE_FAILED', {
|
|
735
|
-
domain: cdnInstance.domainName,
|
|
736
|
-
error: String(error),
|
|
737
|
-
}));
|
|
738
|
-
}
|
|
790
|
+
await client.cdn.deleteCdnDomain(cdnInstance.domainName);
|
|
791
|
+
logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
|
|
739
792
|
}
|
|
740
793
|
}
|
|
741
794
|
// Clean up CDN DNS CNAME records
|
|
@@ -743,12 +796,7 @@ const deleteBucketResource = async (context, bucketName, logicalId, state) => {
|
|
|
743
796
|
if (cdnDnsInstances && client.dns) {
|
|
744
797
|
for (const dnsInstance of cdnDnsInstances) {
|
|
745
798
|
if (dnsInstance.dnsRecordId) {
|
|
746
|
-
|
|
747
|
-
await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
|
|
748
|
-
}
|
|
749
|
-
catch {
|
|
750
|
-
// Best effort cleanup
|
|
751
|
-
}
|
|
799
|
+
await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
|
|
752
800
|
}
|
|
753
801
|
}
|
|
754
802
|
}
|