@geek-fun/serverlessinsight 0.7.0 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +58 -1
- package/README.zh-CN.md +3 -1
- package/dist/package.json +37 -35
- package/dist/src/common/aliyunClient/apigwOperations.js +9 -4
- package/dist/src/common/aliyunClient/cdnOperations.js +191 -0
- package/dist/src/common/aliyunClient/ecsOperations.js +2 -2
- package/dist/src/common/aliyunClient/fc3Operations.js +1 -1
- package/dist/src/common/aliyunClient/index.js +8 -0
- package/dist/src/common/aliyunClient/ossOperations.js +62 -2
- package/dist/src/common/aliyunClient/ramOperations.js +1 -1
- package/dist/src/common/hashUtils.js +4 -0
- package/dist/src/common/iacHelper.js +5 -0
- package/dist/src/common/lockManager.js +8 -0
- package/dist/src/common/planFormatter.js +4 -0
- package/dist/src/common/retryUtils.js +1 -1
- package/dist/src/common/stateManager.js +10 -0
- package/dist/src/common/volcengineClient/apigwOperations.js +1 -1
- package/dist/src/lang/en.js +15 -0
- package/dist/src/lang/zh-CN.js +16 -1
- package/dist/src/parser/bucketParser.js +111 -46
- package/dist/src/stack/aliyunStack/apigwResource.js +310 -47
- package/dist/src/stack/aliyunStack/apigwTypes.js +61 -1
- package/dist/src/stack/aliyunStack/ossResource.js +401 -69
- package/dist/src/stack/aliyunStack/ossTypes.js +58 -16
- package/dist/src/stack/scfStack/cosTypes.js +3 -6
- package/dist/src/stack/volcengineStack/tosTypes.js +1 -3
- package/dist/src/types/domains/state.js +3 -0
- package/dist/src/validator/bucketSchema.js +124 -56
- package/dist/src/validator/eventSchema.js +20 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +37 -35
- package/samples/README_TENCENT_COS.md +3 -15
- package/samples/aliyun-poc-bucket-cdn.yml +63 -0
- package/samples/aliyun-poc-bucket.yml +0 -2
- package/samples/aliyun-poc-domain.yml +0 -2
- package/samples/tencent-poc-cos.yml +0 -2
- package/samples/volcengine-poc-bucket.yml +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteApigwResource = exports.updateApigwResource = exports.readApigwResourceByName = exports.readApigwResource = exports.createApigwResource = void 0;
|
|
4
|
+
const types_1 = require("../../types");
|
|
4
5
|
const aliyunClient_1 = require("../../common/aliyunClient");
|
|
5
6
|
const apigwTypes_1 = require("./apigwTypes");
|
|
6
7
|
const stateManager_1 = require("../../common/stateManager");
|
|
@@ -9,6 +10,197 @@ const certUtils_1 = require("../../common/certUtils");
|
|
|
9
10
|
const logger_1 = require("../../common/logger");
|
|
10
11
|
const lang_1 = require("../../lang");
|
|
11
12
|
const domainUtils_1 = require("../../common/domainUtils");
|
|
13
|
+
const getCdnConfig = (event) => {
|
|
14
|
+
const domainCdn = event.domain?.cdn;
|
|
15
|
+
if (domainCdn == null) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
if (typeof domainCdn === 'boolean') {
|
|
19
|
+
return domainCdn ? { enabled: true } : undefined;
|
|
20
|
+
}
|
|
21
|
+
if (typeof domainCdn === 'string') {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
return {
|
|
25
|
+
enabled: domainCdn.enabled == null ? true : String(domainCdn.enabled) === 'true',
|
|
26
|
+
...(domainCdn.cdn_type != null
|
|
27
|
+
? { cdn_type: String(domainCdn.cdn_type) }
|
|
28
|
+
: {}),
|
|
29
|
+
...(domainCdn.scope != null ? { scope: String(domainCdn.scope) } : {}),
|
|
30
|
+
...(domainCdn.cache_ttl != null ? { cache_ttl: Number(domainCdn.cache_ttl) } : {}),
|
|
31
|
+
...(domainCdn.ignore_query_string != null
|
|
32
|
+
? { ignore_query_string: String(domainCdn.ignore_query_string) === 'true' }
|
|
33
|
+
: {}),
|
|
34
|
+
...(domainCdn.origin_protocol != null
|
|
35
|
+
? {
|
|
36
|
+
origin_protocol: String(domainCdn.origin_protocol),
|
|
37
|
+
}
|
|
38
|
+
: {}),
|
|
39
|
+
...(domainCdn.compression != null
|
|
40
|
+
? { compression: String(domainCdn.compression) === 'true' }
|
|
41
|
+
: {}),
|
|
42
|
+
...(domainCdn.force_redirect_https != null
|
|
43
|
+
? { force_redirect_https: String(domainCdn.force_redirect_https) === 'true' }
|
|
44
|
+
: {}),
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
const getIsCdnEnabled = (event) => {
|
|
48
|
+
return getCdnConfig(event)?.enabled === true;
|
|
49
|
+
};
|
|
50
|
+
const applyCdnSettings = async (client, domainName, event) => {
|
|
51
|
+
const cdnConfig = getCdnConfig(event);
|
|
52
|
+
if (!cdnConfig) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
if (cdnConfig.cache_ttl != null || cdnConfig.ignore_query_string != null) {
|
|
56
|
+
await client.cdn.applyCacheConfig(domainName, cdnConfig.cache_ttl, cdnConfig.ignore_query_string);
|
|
57
|
+
}
|
|
58
|
+
if (cdnConfig.origin_protocol) {
|
|
59
|
+
await client.cdn.applyProtocolConfig(domainName, cdnConfig.origin_protocol);
|
|
60
|
+
}
|
|
61
|
+
if (cdnConfig.compression != null) {
|
|
62
|
+
await client.cdn.applyCompression(domainName, cdnConfig.compression);
|
|
63
|
+
}
|
|
64
|
+
if (cdnConfig.force_redirect_https != null) {
|
|
65
|
+
await client.cdn.applyHttpsRedirect(domainName, cdnConfig.force_redirect_https);
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
const buildApigwCdnDistributionConfig = (event, domainName, originDomain) => {
|
|
69
|
+
const cdnConfig = getCdnConfig(event);
|
|
70
|
+
return {
|
|
71
|
+
domainName,
|
|
72
|
+
cdnType: cdnConfig?.cdn_type ?? 'web',
|
|
73
|
+
sources: [
|
|
74
|
+
{
|
|
75
|
+
type: 'domain',
|
|
76
|
+
content: originDomain,
|
|
77
|
+
...(cdnConfig?.origin_protocol === 'https' ? { port: 443 } : {}),
|
|
78
|
+
},
|
|
79
|
+
],
|
|
80
|
+
scope: cdnConfig?.scope ?? 'global',
|
|
81
|
+
};
|
|
82
|
+
};
|
|
83
|
+
const createApigwCdnDistribution = async (context, client, event, domainName, originDomain, instances, certificate) => {
|
|
84
|
+
logger_1.logger.info(lang_1.lang.__('CREATING_CDN_DISTRIBUTION', {
|
|
85
|
+
domain: domainName,
|
|
86
|
+
origin: originDomain,
|
|
87
|
+
}));
|
|
88
|
+
await client.cdn.addCdnDomain(buildApigwCdnDistributionConfig(event, domainName, originDomain));
|
|
89
|
+
await applyCdnSettings(client, domainName, event);
|
|
90
|
+
if (certificate?.certificateBody && certificate.certificatePrivateKey) {
|
|
91
|
+
await client.cdn.setDomainServerCertificate(domainName, {
|
|
92
|
+
serverCertificate: certificate.certificateBody,
|
|
93
|
+
privateKey: certificate.certificatePrivateKey,
|
|
94
|
+
serverCertificateStatus: 'on',
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
const cdnDomainInfo = await client.cdn.describeCdnDomainDetail(domainName);
|
|
98
|
+
const cdnCname = cdnDomainInfo?.cname;
|
|
99
|
+
if (!cdnCname) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
const mainDomain = (0, domainUtils_1.extractMainDomain)(domainName);
|
|
103
|
+
const hostRecord = (0, domainUtils_1.extractHostRecord)(domainName, mainDomain);
|
|
104
|
+
const dnsRecordId = await client.dns.addDomainRecord({
|
|
105
|
+
domainName: mainDomain,
|
|
106
|
+
rr: hostRecord,
|
|
107
|
+
type: 'CNAME',
|
|
108
|
+
value: cdnCname,
|
|
109
|
+
ttl: 600,
|
|
110
|
+
});
|
|
111
|
+
const isWwwVariant = domainName.startsWith('www.');
|
|
112
|
+
const cdnInstance = {
|
|
113
|
+
sid: (0, common_1.buildSid)('aliyun', 'cdn', context.stage, domainName),
|
|
114
|
+
id: domainName,
|
|
115
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION,
|
|
116
|
+
domainName,
|
|
117
|
+
cname: cdnCname,
|
|
118
|
+
...(isWwwVariant ? { isWwwVariant: true } : {}),
|
|
119
|
+
};
|
|
120
|
+
instances.push(cdnInstance);
|
|
121
|
+
const dnsInstance = {
|
|
122
|
+
sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, dnsRecordId || domainName),
|
|
123
|
+
id: dnsRecordId || domainName,
|
|
124
|
+
type: types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME,
|
|
125
|
+
domain: domainName,
|
|
126
|
+
cname: cdnCname,
|
|
127
|
+
dnsRecordId: dnsRecordId || undefined,
|
|
128
|
+
...(isWwwVariant ? { isWwwVariant: true } : {}),
|
|
129
|
+
};
|
|
130
|
+
instances.push(dnsInstance);
|
|
131
|
+
};
|
|
132
|
+
const getApigwTrackedDomains = (domainName, wwwBindApex) => {
|
|
133
|
+
if (!domainName) {
|
|
134
|
+
return [];
|
|
135
|
+
}
|
|
136
|
+
return [domainName, ...(wwwBindApex ? [(0, domainUtils_1.deriveWwwDomain)(domainName)] : [])].filter((domain) => Boolean(domain));
|
|
137
|
+
};
|
|
138
|
+
const updateApigwCdnDistribution = async (context, client, event, domainName, originDomain, existingInstances, instances, certificate) => {
|
|
139
|
+
const trackedInstances = getTrackedApigwCdnInstances(existingInstances, [domainName]);
|
|
140
|
+
const hasTrackedDistribution = trackedInstances.some((instance) => instance.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION);
|
|
141
|
+
if (!hasTrackedDistribution) {
|
|
142
|
+
await createApigwCdnDistribution(context, client, event, domainName, originDomain, instances, certificate);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
await client.cdn.modifyCdnDomain(buildApigwCdnDistributionConfig(event, domainName, originDomain));
|
|
146
|
+
await applyCdnSettings(client, domainName, event);
|
|
147
|
+
if (certificate?.certificateBody && certificate.certificatePrivateKey) {
|
|
148
|
+
await client.cdn.setDomainServerCertificate(domainName, {
|
|
149
|
+
serverCertificate: certificate.certificateBody,
|
|
150
|
+
privateKey: certificate.certificatePrivateKey,
|
|
151
|
+
serverCertificateStatus: 'on',
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
const cdnDomainInfo = await client.cdn.describeCdnDomainDetail(domainName);
|
|
155
|
+
const cdnCname = cdnDomainInfo?.cname;
|
|
156
|
+
instances.push(...trackedInstances.map((instance) => ({
|
|
157
|
+
...instance,
|
|
158
|
+
...(cdnCname ? { cname: cdnCname } : {}),
|
|
159
|
+
})));
|
|
160
|
+
};
|
|
161
|
+
const getApigwCdnResourceDomain = (instance) => {
|
|
162
|
+
return instance.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION
|
|
163
|
+
? instance.domainName
|
|
164
|
+
: instance.domain;
|
|
165
|
+
};
|
|
166
|
+
const getTrackedApigwCdnInstances = (instances, domains) => {
|
|
167
|
+
return instances.filter((instance) => {
|
|
168
|
+
if (instance.type !== types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION &&
|
|
169
|
+
instance.type !== types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME) {
|
|
170
|
+
return false;
|
|
171
|
+
}
|
|
172
|
+
return domains.includes(getApigwCdnResourceDomain(instance));
|
|
173
|
+
});
|
|
174
|
+
};
|
|
175
|
+
const cleanupApigwCdnResources = async (client, instances, domains) => {
|
|
176
|
+
const matchedInstances = domains && domains.length > 0 ? getTrackedApigwCdnInstances(instances, domains) : [];
|
|
177
|
+
const resourcesToCleanup = domains && domains.length > 0 ? matchedInstances : instances;
|
|
178
|
+
const cdnInstances = resourcesToCleanup.filter((instance) => instance.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DISTRIBUTION);
|
|
179
|
+
for (const cdnInstance of cdnInstances) {
|
|
180
|
+
try {
|
|
181
|
+
await client.cdn.deleteCdnDomain(cdnInstance.domainName);
|
|
182
|
+
logger_1.logger.info(lang_1.lang.__('CDN_DOMAIN_DELETED', { domain: cdnInstance.domainName }));
|
|
183
|
+
}
|
|
184
|
+
catch (error) {
|
|
185
|
+
logger_1.logger.warn(lang_1.lang.__('CDN_DOMAIN_DELETE_FAILED', {
|
|
186
|
+
domain: cdnInstance.domainName,
|
|
187
|
+
error: String(error),
|
|
188
|
+
}));
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
const cdnDnsInstances = resourcesToCleanup.filter((instance) => instance.type === types_1.ResourceTypeEnum.ALIYUN_CDN_DNS_CNAME);
|
|
192
|
+
for (const dnsInstance of cdnDnsInstances) {
|
|
193
|
+
if (!dnsInstance.dnsRecordId) {
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
try {
|
|
197
|
+
await client.dns.deleteDomainRecord(dnsInstance.dnsRecordId);
|
|
198
|
+
}
|
|
199
|
+
catch {
|
|
200
|
+
// Best effort cleanup
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
};
|
|
12
204
|
const buildApigwGroupInstanceFromProvider = (info, stage) => {
|
|
13
205
|
return {
|
|
14
206
|
type: 'ALIYUN_APIGW_GROUP',
|
|
@@ -176,8 +368,21 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
176
368
|
try {
|
|
177
369
|
const primaryDomain = event.domain.domain_name;
|
|
178
370
|
const wwwBindApex = event.domain.www_bind_apex === true;
|
|
371
|
+
const isCdnEnabled = getIsCdnEnabled(event);
|
|
372
|
+
const originDomain = groupInfo.subDomain;
|
|
373
|
+
if (!originDomain) {
|
|
374
|
+
throw new Error(`API Gateway group ${groupId} has no subDomain for CDN origin`);
|
|
375
|
+
}
|
|
179
376
|
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
180
|
-
|
|
377
|
+
if (isCdnEnabled) {
|
|
378
|
+
await createApigwCdnDistribution(context, client, event, primaryDomain, originDomain, instances, {
|
|
379
|
+
certificateBody: domainConfig.certificateBody,
|
|
380
|
+
certificatePrivateKey: domainConfig.certificatePrivateKey,
|
|
381
|
+
});
|
|
382
|
+
}
|
|
383
|
+
else {
|
|
384
|
+
state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
|
|
385
|
+
}
|
|
181
386
|
const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
|
|
182
387
|
if (wwwDomain) {
|
|
183
388
|
logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
|
|
@@ -188,7 +393,15 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
188
393
|
? `${domainConfig.certificateName}-www`
|
|
189
394
|
: undefined,
|
|
190
395
|
};
|
|
191
|
-
|
|
396
|
+
if (isCdnEnabled) {
|
|
397
|
+
await createApigwCdnDistribution(context, client, event, wwwDomain, originDomain, instances, {
|
|
398
|
+
certificateBody: wwwDomainConfig.certificateBody,
|
|
399
|
+
certificatePrivateKey: wwwDomainConfig.certificatePrivateKey,
|
|
400
|
+
});
|
|
401
|
+
}
|
|
402
|
+
else {
|
|
403
|
+
state = await client.apigw.bindCustomDomain(wwwDomainConfig, state, logicalId);
|
|
404
|
+
}
|
|
192
405
|
}
|
|
193
406
|
}
|
|
194
407
|
catch (error) {
|
|
@@ -300,26 +513,65 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
300
513
|
if (event.domain) {
|
|
301
514
|
const primaryDomain = event.domain.domain_name;
|
|
302
515
|
const wwwBindApex = event.domain.www_bind_apex === true;
|
|
516
|
+
const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
|
|
517
|
+
const isCdnEnabled = getIsCdnEnabled(event);
|
|
303
518
|
const existingDomain = existingState.definition?.domain;
|
|
304
519
|
const previousWwwBindApex = existingDomain?.wwwBindApex === true;
|
|
305
520
|
const previousDomainName = existingDomain?.domainName;
|
|
521
|
+
const previousCdnEnabled = existingDomain?.cdnEnabled === true;
|
|
522
|
+
const previousTrackedDomains = getApigwTrackedDomains(previousDomainName, previousWwwBindApex);
|
|
523
|
+
const originDomain = groupInfo.subDomain;
|
|
524
|
+
if (isCdnEnabled && !originDomain) {
|
|
525
|
+
throw new Error(`API Gateway group ${groupId} has no subDomain for CDN origin`);
|
|
526
|
+
}
|
|
306
527
|
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
528
|
+
if (isCdnEnabled) {
|
|
529
|
+
const desiredDomains = [primaryDomain, ...(wwwDomain ? [wwwDomain] : [])];
|
|
530
|
+
const cdnDomainsToCleanup = previousCdnEnabled
|
|
531
|
+
? previousTrackedDomains.filter((domain) => !desiredDomains.includes(domain))
|
|
532
|
+
: [];
|
|
533
|
+
if (cdnDomainsToCleanup.length > 0) {
|
|
534
|
+
await cleanupApigwCdnResources(client, existingInstances, cdnDomainsToCleanup);
|
|
535
|
+
}
|
|
536
|
+
await updateApigwCdnDistribution(context, client, event, primaryDomain, originDomain, existingInstances, instances, {
|
|
537
|
+
certificateBody: domainConfig.certificateBody,
|
|
538
|
+
certificatePrivateKey: domainConfig.certificatePrivateKey,
|
|
539
|
+
});
|
|
540
|
+
if (wwwDomain) {
|
|
541
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
|
|
542
|
+
const wwwDomainConfig = {
|
|
543
|
+
...domainConfig,
|
|
544
|
+
domainName: wwwDomain,
|
|
545
|
+
certificateName: domainConfig.certificateName
|
|
546
|
+
? `${domainConfig.certificateName}-www`
|
|
547
|
+
: undefined,
|
|
548
|
+
};
|
|
549
|
+
await updateApigwCdnDistribution(context, client, event, wwwDomain, originDomain, existingInstances, instances, {
|
|
550
|
+
certificateBody: wwwDomainConfig.certificateBody,
|
|
551
|
+
certificatePrivateKey: wwwDomainConfig.certificatePrivateKey,
|
|
552
|
+
});
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
else {
|
|
556
|
+
if (previousCdnEnabled && previousTrackedDomains.length > 0) {
|
|
557
|
+
await cleanupApigwCdnResources(client, existingInstances, previousTrackedDomains);
|
|
558
|
+
}
|
|
559
|
+
state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
|
|
560
|
+
if (wwwDomain) {
|
|
561
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
|
|
562
|
+
const wwwDomainConfig = {
|
|
563
|
+
...domainConfig,
|
|
564
|
+
domainName: wwwDomain,
|
|
565
|
+
certificateName: domainConfig.certificateName
|
|
566
|
+
? `${domainConfig.certificateName}-www`
|
|
567
|
+
: undefined,
|
|
568
|
+
};
|
|
569
|
+
state = await client.apigw.bindCustomDomain(wwwDomainConfig, state, logicalId);
|
|
570
|
+
}
|
|
319
571
|
}
|
|
320
572
|
if (previousWwwBindApex && previousDomainName) {
|
|
321
573
|
const previousWwwDomain = (0, domainUtils_1.deriveWwwDomain)(previousDomainName);
|
|
322
|
-
if (previousWwwDomain && previousWwwDomain !== wwwDomain) {
|
|
574
|
+
if (previousWwwDomain && previousWwwDomain !== wwwDomain && !previousCdnEnabled) {
|
|
323
575
|
try {
|
|
324
576
|
await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
|
|
325
577
|
}
|
|
@@ -336,23 +588,29 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
336
588
|
const existingDomain = existingState.definition?.domain;
|
|
337
589
|
if (existingDomain?.domainName) {
|
|
338
590
|
const previousDomain = existingDomain.domainName;
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
catch (error) {
|
|
343
|
-
logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: previousDomain, error: String(error) }));
|
|
591
|
+
const previousCdnEnabled = existingDomain.cdnEnabled === true;
|
|
592
|
+
if (previousCdnEnabled) {
|
|
593
|
+
await cleanupApigwCdnResources(client, existingInstances);
|
|
344
594
|
}
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
595
|
+
else {
|
|
596
|
+
try {
|
|
597
|
+
await client.apigw.unbindCustomDomain(groupId, previousDomain);
|
|
598
|
+
}
|
|
599
|
+
catch (error) {
|
|
600
|
+
logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: previousDomain, error: String(error) }));
|
|
601
|
+
}
|
|
602
|
+
if (existingDomain.wwwBindApex === true) {
|
|
603
|
+
const previousWwwDomain = (0, domainUtils_1.deriveWwwDomain)(previousDomain);
|
|
604
|
+
if (previousWwwDomain) {
|
|
605
|
+
try {
|
|
606
|
+
await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
|
|
607
|
+
}
|
|
608
|
+
catch (error) {
|
|
609
|
+
logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
|
|
610
|
+
domain: previousWwwDomain,
|
|
611
|
+
error: String(error),
|
|
612
|
+
}));
|
|
613
|
+
}
|
|
356
614
|
}
|
|
357
615
|
}
|
|
358
616
|
}
|
|
@@ -395,23 +653,28 @@ const deleteApigwResource = async (context, logicalId, state) => {
|
|
|
395
653
|
const existingDomain = existingState.definition?.domain;
|
|
396
654
|
if (existingDomain?.domainName) {
|
|
397
655
|
const primaryDomain = existingDomain.domainName;
|
|
398
|
-
|
|
399
|
-
await client
|
|
656
|
+
if (existingDomain.cdnEnabled === true) {
|
|
657
|
+
await cleanupApigwCdnResources(client, existingInstances);
|
|
400
658
|
}
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
659
|
+
else {
|
|
660
|
+
try {
|
|
661
|
+
await client.apigw.unbindCustomDomain(groupId, primaryDomain);
|
|
662
|
+
}
|
|
663
|
+
catch (error) {
|
|
664
|
+
logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: primaryDomain, error: String(error) }));
|
|
665
|
+
}
|
|
666
|
+
if (existingDomain.wwwBindApex === true) {
|
|
667
|
+
const wwwDomain = (0, domainUtils_1.deriveWwwDomain)(primaryDomain);
|
|
668
|
+
if (wwwDomain) {
|
|
669
|
+
try {
|
|
670
|
+
await client.apigw.unbindCustomDomain(groupId, wwwDomain);
|
|
671
|
+
}
|
|
672
|
+
catch (error) {
|
|
673
|
+
logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
|
|
674
|
+
domain: wwwDomain,
|
|
675
|
+
error: String(error),
|
|
676
|
+
}));
|
|
677
|
+
}
|
|
415
678
|
}
|
|
416
679
|
}
|
|
417
680
|
}
|
|
@@ -155,11 +155,45 @@ const inferProtocolConfig = (protocol) => {
|
|
|
155
155
|
return { requestProtocol: protocol };
|
|
156
156
|
};
|
|
157
157
|
exports.inferProtocolConfig = inferProtocolConfig;
|
|
158
|
+
const getDomainCdnConfig = (domain) => {
|
|
159
|
+
const domainCdn = domain?.cdn;
|
|
160
|
+
if (domainCdn == null) {
|
|
161
|
+
return undefined;
|
|
162
|
+
}
|
|
163
|
+
if (typeof domainCdn === 'boolean') {
|
|
164
|
+
return domainCdn ? { enabled: true } : undefined;
|
|
165
|
+
}
|
|
166
|
+
if (typeof domainCdn === 'string') {
|
|
167
|
+
return undefined;
|
|
168
|
+
}
|
|
169
|
+
return {
|
|
170
|
+
enabled: domainCdn.enabled == null ? true : String(domainCdn.enabled) === 'true',
|
|
171
|
+
...(domainCdn.cdn_type != null
|
|
172
|
+
? { cdn_type: String(domainCdn.cdn_type) }
|
|
173
|
+
: {}),
|
|
174
|
+
...(domainCdn.scope != null ? { scope: String(domainCdn.scope) } : {}),
|
|
175
|
+
...(domainCdn.cache_ttl != null ? { cache_ttl: Number(domainCdn.cache_ttl) } : {}),
|
|
176
|
+
...(domainCdn.ignore_query_string != null
|
|
177
|
+
? { ignore_query_string: String(domainCdn.ignore_query_string) === 'true' }
|
|
178
|
+
: {}),
|
|
179
|
+
...(domainCdn.origin_protocol != null
|
|
180
|
+
? {
|
|
181
|
+
origin_protocol: String(domainCdn.origin_protocol),
|
|
182
|
+
}
|
|
183
|
+
: {}),
|
|
184
|
+
...(domainCdn.compression != null
|
|
185
|
+
? { compression: String(domainCdn.compression) === 'true' }
|
|
186
|
+
: {}),
|
|
187
|
+
...(domainCdn.force_redirect_https != null
|
|
188
|
+
? { force_redirect_https: String(domainCdn.force_redirect_https) === 'true' }
|
|
189
|
+
: {}),
|
|
190
|
+
};
|
|
191
|
+
};
|
|
158
192
|
const extractEventDomainDefinition = (domain) => {
|
|
159
193
|
if (!domain) {
|
|
160
194
|
return null;
|
|
161
195
|
}
|
|
162
|
-
|
|
196
|
+
const definition = {
|
|
163
197
|
domainName: domain.domain_name,
|
|
164
198
|
wwwBindApex: domain.www_bind_apex === true,
|
|
165
199
|
certificateId: domain.certificate_id ?? null,
|
|
@@ -167,5 +201,31 @@ const extractEventDomainDefinition = (domain) => {
|
|
|
167
201
|
certificatePrivateKey: domain.certificate_private_key ? '(managed)' : null,
|
|
168
202
|
protocol: domain.protocol ?? null,
|
|
169
203
|
};
|
|
204
|
+
const cdnConfig = getDomainCdnConfig(domain);
|
|
205
|
+
if (cdnConfig?.enabled === true) {
|
|
206
|
+
definition.cdnEnabled = true;
|
|
207
|
+
if (cdnConfig.cdn_type != null) {
|
|
208
|
+
definition.cdnType = cdnConfig.cdn_type;
|
|
209
|
+
}
|
|
210
|
+
if (cdnConfig.scope != null) {
|
|
211
|
+
definition.cdnScope = cdnConfig.scope;
|
|
212
|
+
}
|
|
213
|
+
if (cdnConfig.cache_ttl != null) {
|
|
214
|
+
definition.cdnCacheTtl = cdnConfig.cache_ttl;
|
|
215
|
+
}
|
|
216
|
+
if (cdnConfig.ignore_query_string != null) {
|
|
217
|
+
definition.cdnIgnoreQueryString = cdnConfig.ignore_query_string;
|
|
218
|
+
}
|
|
219
|
+
if (cdnConfig.origin_protocol != null) {
|
|
220
|
+
definition.cdnOriginProtocol = cdnConfig.origin_protocol;
|
|
221
|
+
}
|
|
222
|
+
if (cdnConfig.compression != null) {
|
|
223
|
+
definition.cdnCompression = cdnConfig.compression;
|
|
224
|
+
}
|
|
225
|
+
if (cdnConfig.force_redirect_https != null) {
|
|
226
|
+
definition.cdnForceRedirectHttps = cdnConfig.force_redirect_https;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
return definition;
|
|
170
230
|
};
|
|
171
231
|
exports.extractEventDomainDefinition = extractEventDomainDefinition;
|