@geek-fun/serverlessinsight 0.6.0 → 0.6.2
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 +94 -1
- package/README.zh-CN.md +94 -1
- package/dist/package.json +1 -1
- package/dist/src/common/aliyunClient/apigwOperations.js +5 -5
- package/dist/src/common/aliyunClient/ossOperations.js +231 -16
- package/dist/src/common/certUtils.js +33 -0
- package/dist/src/common/constants.js +10 -4
- package/dist/src/common/iacHelper.js +5 -9
- package/dist/src/common/index.js +2 -1
- package/dist/src/common/planFormatter.js +269 -0
- package/dist/src/common/retryUtils.js +5 -0
- package/dist/src/lang/en.js +49 -3
- package/dist/src/lang/zh-CN.js +47 -2
- package/dist/src/parser/bucketParser.js +17 -3
- package/dist/src/parser/index.js +0 -2
- package/dist/src/stack/aliyunStack/apigwPlanner.js +1 -1
- package/dist/src/stack/aliyunStack/apigwResource.js +29 -30
- package/dist/src/stack/aliyunStack/ossResource.js +25 -25
- package/dist/src/stack/scfStack/cosResource.js +22 -17
- package/dist/src/stack/scfStack/planner.js +1 -57
- package/dist/src/types/index.js +0 -1
- package/dist/src/validator/bucketSchema.js +27 -1
- package/dist/src/validator/eventSchema.js +25 -2
- package/dist/src/validator/iacSchema.js +0 -2
- package/dist/src/validator/rootSchema.js +0 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/src/common/certificateResolver.js +0 -63
- package/dist/src/parser/certificateParser.js +0 -23
- package/dist/src/types/domains/certificate.js +0 -2
- package/dist/src/validator/certificateSchema.js +0 -31
|
@@ -5,6 +5,7 @@ const aliyunClient_1 = require("../../common/aliyunClient");
|
|
|
5
5
|
const apigwTypes_1 = require("./apigwTypes");
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const common_1 = require("../../common");
|
|
8
|
+
const certUtils_1 = require("../../common/certUtils");
|
|
8
9
|
const logger_1 = require("../../common/logger");
|
|
9
10
|
const lang_1 = require("../../lang");
|
|
10
11
|
const buildApigwGroupInstanceFromProvider = (info, stage) => {
|
|
@@ -56,35 +57,33 @@ const buildApigwDeploymentInstance = (groupId, apiId, stageName, stage) => {
|
|
|
56
57
|
stageName,
|
|
57
58
|
};
|
|
58
59
|
};
|
|
59
|
-
const resolveDomainCertificate = async (domain,
|
|
60
|
-
if (domain.
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
const resolveDomainCertificate = async (domain, serviceName, eventKey, stage, client) => {
|
|
61
|
+
if (domain.certificate_id) {
|
|
62
|
+
const certId = domain.certificate_id;
|
|
63
|
+
const detail = await client.cas.getCertificate(certId);
|
|
64
|
+
if (!detail || !detail.cert || !detail.key) {
|
|
65
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: certId }));
|
|
63
66
|
}
|
|
64
|
-
const certDef = (0, common_1.getIacDefinition)(context.iac, domain.certificate);
|
|
65
|
-
if (!certDef || !(0, common_1.isCertificateDomain)(certDef)) {
|
|
66
|
-
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: String(domain.certificate) }));
|
|
67
|
-
}
|
|
68
|
-
const resolved = await (0, common_1.resolveCertificateDomain)(certDef, async (certId) => {
|
|
69
|
-
const detail = await client.cas.getCertificate(certId);
|
|
70
|
-
if (!detail)
|
|
71
|
-
return null;
|
|
72
|
-
return { cert: detail.cert, key: detail.key };
|
|
73
|
-
});
|
|
74
67
|
return {
|
|
75
|
-
certificateName:
|
|
76
|
-
certificateBody:
|
|
77
|
-
certificatePrivateKey:
|
|
68
|
+
certificateName: `${serviceName}-${stage}-apigw-${eventKey}`,
|
|
69
|
+
certificateBody: detail.cert,
|
|
70
|
+
certificatePrivateKey: detail.key,
|
|
78
71
|
};
|
|
79
72
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
73
|
+
if (domain.certificate_body && domain.certificate_private_key) {
|
|
74
|
+
const body = (0, certUtils_1.readPemContent)(domain.certificate_body);
|
|
75
|
+
const key = (0, certUtils_1.readPemContent)(domain.certificate_private_key);
|
|
76
|
+
(0, certUtils_1.warnInlinePem)(domain.certificate_private_key);
|
|
77
|
+
return {
|
|
78
|
+
certificateName: `${serviceName}-${stage}-apigw-${eventKey}`,
|
|
79
|
+
certificateBody: body,
|
|
80
|
+
certificatePrivateKey: key,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
return {};
|
|
85
84
|
};
|
|
86
|
-
const buildDomainBindingConfig = async (domain, groupId,
|
|
87
|
-
const certConfig = await resolveDomainCertificate(domain,
|
|
85
|
+
const buildDomainBindingConfig = async (domain, groupId, serviceName, eventKey, stage, client) => {
|
|
86
|
+
const certConfig = await resolveDomainCertificate(domain, serviceName, eventKey, stage, client);
|
|
88
87
|
const protocolConfig = (0, apigwTypes_1.inferProtocolConfig)(domain.protocol);
|
|
89
88
|
return {
|
|
90
89
|
groupId,
|
|
@@ -134,7 +133,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
134
133
|
domain: event.domain
|
|
135
134
|
? {
|
|
136
135
|
domainName: event.domain.domain_name,
|
|
137
|
-
|
|
136
|
+
hasCertificate: !!(event.domain.certificate_body || event.domain.certificate_id),
|
|
138
137
|
}
|
|
139
138
|
: null,
|
|
140
139
|
},
|
|
@@ -173,7 +172,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
173
172
|
domain: event.domain
|
|
174
173
|
? {
|
|
175
174
|
domainName: event.domain.domain_name,
|
|
176
|
-
|
|
175
|
+
hasCertificate: !!(event.domain.certificate_body || event.domain.certificate_id),
|
|
177
176
|
}
|
|
178
177
|
: null,
|
|
179
178
|
},
|
|
@@ -184,7 +183,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
184
183
|
}
|
|
185
184
|
if (event.domain) {
|
|
186
185
|
try {
|
|
187
|
-
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, context, client);
|
|
186
|
+
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
188
187
|
state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
|
|
189
188
|
}
|
|
190
189
|
catch (error) {
|
|
@@ -208,7 +207,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
208
207
|
domain: event.domain
|
|
209
208
|
? {
|
|
210
209
|
domainName: event.domain.domain_name,
|
|
211
|
-
|
|
210
|
+
hasCertificate: !!(event.domain.certificate_body || event.domain.certificate_id),
|
|
212
211
|
}
|
|
213
212
|
: null,
|
|
214
213
|
},
|
|
@@ -299,7 +298,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
299
298
|
}
|
|
300
299
|
}
|
|
301
300
|
if (event.domain) {
|
|
302
|
-
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, context, client);
|
|
301
|
+
const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
|
|
303
302
|
state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
|
|
304
303
|
}
|
|
305
304
|
const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
|
|
@@ -316,7 +315,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
|
|
|
316
315
|
domain: event.domain
|
|
317
316
|
? {
|
|
318
317
|
domainName: event.domain.domain_name,
|
|
319
|
-
|
|
318
|
+
hasCertificate: !!(event.domain.certificate_body || event.domain.certificate_id),
|
|
320
319
|
}
|
|
321
320
|
: null,
|
|
322
321
|
},
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.deleteBucketResource = exports.updateBucketResource = exports.readBucketResource = exports.createBucketResource = void 0;
|
|
7
7
|
const aliyunClient_1 = require("../../common/aliyunClient");
|
|
8
8
|
const common_1 = require("../../common");
|
|
9
|
+
const certUtils_1 = require("../../common/certUtils");
|
|
9
10
|
const types_1 = require("../../types");
|
|
10
11
|
const ossTypes_1 = require("./ossTypes");
|
|
11
12
|
const logger_1 = require("../../common/logger");
|
|
@@ -97,24 +98,25 @@ const buildOssInstanceFromProvider = (info, sid) => {
|
|
|
97
98
|
})),
|
|
98
99
|
};
|
|
99
100
|
};
|
|
100
|
-
const resolveBucketDomainCertificate = async (
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
const resolveBucketDomainCertificate = async (bucket, client) => {
|
|
102
|
+
const website = bucket.website;
|
|
103
|
+
if (!website)
|
|
104
|
+
return undefined;
|
|
105
|
+
if (website.domain_certificate_id) {
|
|
106
|
+
const certId = website.domain_certificate_id;
|
|
107
|
+
const detail = await client.cas.getCertificate(certId);
|
|
108
|
+
if (!detail || !detail.cert || !detail.key) {
|
|
109
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: certId }));
|
|
110
|
+
}
|
|
111
|
+
return { certificateBody: detail.cert, certificatePrivateKey: detail.key };
|
|
103
112
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
113
|
+
if (website.domain_certificate_body && website.domain_certificate_private_key) {
|
|
114
|
+
const body = (0, certUtils_1.readPemContent)(website.domain_certificate_body);
|
|
115
|
+
const key = (0, certUtils_1.readPemContent)(website.domain_certificate_private_key);
|
|
116
|
+
(0, certUtils_1.warnInlinePem)(website.domain_certificate_private_key);
|
|
117
|
+
return { certificateBody: body, certificatePrivateKey: key };
|
|
107
118
|
}
|
|
108
|
-
|
|
109
|
-
const detail = await client.cas.getCertificate(certId);
|
|
110
|
-
if (!detail)
|
|
111
|
-
return null;
|
|
112
|
-
return { cert: detail.cert, key: detail.key };
|
|
113
|
-
});
|
|
114
|
-
return {
|
|
115
|
-
certificateBody: resolved.certificateBody,
|
|
116
|
-
certificatePrivateKey: resolved.certificatePrivateKey,
|
|
117
|
-
};
|
|
119
|
+
return undefined;
|
|
118
120
|
};
|
|
119
121
|
const createBucketResource = async (context, bucket, state) => {
|
|
120
122
|
const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
|
|
@@ -144,9 +146,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
144
146
|
state = (0, common_1.setResource)(state, logicalId, partialResourceState);
|
|
145
147
|
let cnameInfo;
|
|
146
148
|
if (bucket.website?.domain) {
|
|
147
|
-
const certificate = bucket
|
|
148
|
-
? await resolveBucketDomainCertificate(bucket.website.domain_certificate, context, client)
|
|
149
|
-
: undefined;
|
|
149
|
+
const certificate = await resolveBucketDomainCertificate(bucket, client);
|
|
150
150
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
151
151
|
domain: bucket.website.domain,
|
|
152
152
|
bucketName: config.bucketName,
|
|
@@ -167,6 +167,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
167
167
|
domain: bucket.website.domain,
|
|
168
168
|
cname: cnameInfo.cname,
|
|
169
169
|
...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
|
|
170
|
+
...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
|
|
170
171
|
};
|
|
171
172
|
instances.push(dnsInstance);
|
|
172
173
|
// Refresh bucket info to capture auto-added CORS rule
|
|
@@ -233,11 +234,9 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
233
234
|
if (bucket.website?.domain) {
|
|
234
235
|
const domainChanged = existingDnsInstance?.domain !== bucket.website.domain;
|
|
235
236
|
if (domainChanged && existingDnsInstance) {
|
|
236
|
-
await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
|
|
237
|
+
await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId, existingDnsInstance.txtRecordId);
|
|
237
238
|
}
|
|
238
|
-
const certificate = bucket
|
|
239
|
-
? await resolveBucketDomainCertificate(bucket.website.domain_certificate, context, client)
|
|
240
|
-
: undefined;
|
|
239
|
+
const certificate = await resolveBucketDomainCertificate(bucket, client);
|
|
241
240
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
242
241
|
domain: bucket.website.domain,
|
|
243
242
|
bucketName: config.bucketName,
|
|
@@ -258,6 +257,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
258
257
|
domain: bucket.website.domain,
|
|
259
258
|
cname: cnameInfo.cname,
|
|
260
259
|
...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
|
|
260
|
+
...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
|
|
261
261
|
};
|
|
262
262
|
instances.push(dnsInstance);
|
|
263
263
|
// Refresh bucket info to capture auto-added CORS rule
|
|
@@ -268,7 +268,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
270
|
else if (existingDnsInstance) {
|
|
271
|
-
await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
|
|
271
|
+
await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId, existingDnsInstance.txtRecordId);
|
|
272
272
|
}
|
|
273
273
|
const resourceState = {
|
|
274
274
|
mode: 'managed',
|
|
@@ -285,7 +285,7 @@ const deleteBucketResource = async (context, bucketName, logicalId, state) => {
|
|
|
285
285
|
const existingState = state.resources[logicalId];
|
|
286
286
|
const dnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
|
|
287
287
|
if (dnsInstance) {
|
|
288
|
-
await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
|
|
288
|
+
await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId, dnsInstance.txtRecordId);
|
|
289
289
|
}
|
|
290
290
|
try {
|
|
291
291
|
await client.oss.deleteBucket(bucketName);
|
|
@@ -5,21 +5,30 @@ const types_1 = require("../../types");
|
|
|
5
5
|
const tencentClient_1 = require("../../common/tencentClient");
|
|
6
6
|
const cosTypes_1 = require("./cosTypes");
|
|
7
7
|
const common_1 = require("../../common");
|
|
8
|
-
const
|
|
8
|
+
const certUtils_1 = require("../../common/certUtils");
|
|
9
9
|
const logger_1 = require("../../common/logger");
|
|
10
10
|
const lang_1 = require("../../lang");
|
|
11
|
-
const resolveBucketDomainCertificate = (
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
const resolveBucketDomainCertificate = (bucket) => {
|
|
12
|
+
const website = bucket.website;
|
|
13
|
+
if (!website)
|
|
14
|
+
return undefined;
|
|
15
|
+
if (website.domain_certificate_id) {
|
|
16
|
+
throw new Error(lang_1.lang.__('TENCENT_CERT_REFERENCE_NOT_SUPPORTED', { name: bucket.key }));
|
|
14
17
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
if (website.domain_certificate_body && website.domain_certificate_private_key) {
|
|
19
|
+
if (!website.domain) {
|
|
20
|
+
throw new Error(lang_1.lang.__('BUCKET_DOMAIN_REQUIRED_FOR_CERT', { name: bucket.key }));
|
|
21
|
+
}
|
|
22
|
+
const body = (0, certUtils_1.readPemContent)(website.domain_certificate_body);
|
|
23
|
+
const key = (0, certUtils_1.readPemContent)(website.domain_certificate_private_key);
|
|
24
|
+
(0, certUtils_1.warnInlinePem)(website.domain_certificate_private_key);
|
|
25
|
+
return {
|
|
26
|
+
certificateName: website.domain.replace(/\./g, '_'),
|
|
27
|
+
certificateBody: body,
|
|
28
|
+
certificatePrivateKey: key,
|
|
29
|
+
};
|
|
21
30
|
}
|
|
22
|
-
return
|
|
31
|
+
return undefined;
|
|
23
32
|
};
|
|
24
33
|
const deployCertificateToCosDomain = async (client, resolved, bucketName, domain, region) => {
|
|
25
34
|
logger_1.logger.info(lang_1.lang.__('COS_BUCKET_CERT_DEPLOYING', { domain, bucketName }));
|
|
@@ -101,9 +110,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
101
110
|
];
|
|
102
111
|
let cnameInfo;
|
|
103
112
|
if (bucket.website?.domain) {
|
|
104
|
-
const resolved = bucket
|
|
105
|
-
? resolveBucketDomainCertificate(bucket.website.domain_certificate, context)
|
|
106
|
-
: undefined;
|
|
113
|
+
const resolved = resolveBucketDomainCertificate(bucket);
|
|
107
114
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
108
115
|
domain: bucket.website.domain,
|
|
109
116
|
bucketName: bucket.name,
|
|
@@ -171,9 +178,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
171
178
|
if (domainChanged && existingDnsInstance) {
|
|
172
179
|
await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
|
|
173
180
|
}
|
|
174
|
-
const resolved = bucket
|
|
175
|
-
? resolveBucketDomainCertificate(bucket.website.domain_certificate, context)
|
|
176
|
-
: undefined;
|
|
181
|
+
const resolved = resolveBucketDomainCertificate(bucket);
|
|
177
182
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
178
183
|
domain: bucket.website.domain,
|
|
179
184
|
bucketName: bucket.name,
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.displayPlan = exports.generateTencentPlan = void 0;
|
|
4
4
|
const common_1 = require("../../common");
|
|
5
|
+
Object.defineProperty(exports, "displayPlan", { enumerable: true, get: function () { return common_1.displayPlan; } });
|
|
5
6
|
const lang_1 = require("../../lang");
|
|
6
7
|
const scfPlanner_1 = require("./scfPlanner");
|
|
7
8
|
const cosPlanner_1 = require("./cosPlanner");
|
|
@@ -32,60 +33,3 @@ const generateTencentPlan = async (iac, backend) => {
|
|
|
32
33
|
};
|
|
33
34
|
};
|
|
34
35
|
exports.generateTencentPlan = generateTencentPlan;
|
|
35
|
-
const displayPlan = (planResult) => {
|
|
36
|
-
const separator = '========================================';
|
|
37
|
-
if (planResult.items.length === 0) {
|
|
38
|
-
common_1.logger.info(`${separator}\n${lang_1.lang.__('DEPLOYMENT_PLAN')}\n${separator}\n${lang_1.lang.__('NO_CHANGES_INFRASTRUCTURE_UP_TO_DATE')}`);
|
|
39
|
-
return;
|
|
40
|
-
}
|
|
41
|
-
const createActions = planResult.items.filter((item) => item.action === 'create');
|
|
42
|
-
const updateActions = planResult.items.filter((item) => item.action === 'update');
|
|
43
|
-
const deleteActions = planResult.items.filter((item) => item.action === 'delete');
|
|
44
|
-
const noopActions = planResult.items.filter((item) => item.action === 'noop');
|
|
45
|
-
const sections = [];
|
|
46
|
-
if (createActions.length > 0) {
|
|
47
|
-
const createLines = [`[${lang_1.lang.__('CREATE')}]:`];
|
|
48
|
-
for (const item of createActions) {
|
|
49
|
-
createLines.push(` + ${item.logicalId} (${item.resourceType})`);
|
|
50
|
-
if (item.changes?.after) {
|
|
51
|
-
const jsonStr = JSON.stringify(item.changes.after, null, 2);
|
|
52
|
-
createLines.push(` ${jsonStr.split('\n').join('\n ')}`);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
sections.push(createLines.join('\n'));
|
|
56
|
-
}
|
|
57
|
-
if (updateActions.length > 0) {
|
|
58
|
-
const updateLines = [`[${lang_1.lang.__('UPDATE')}]:`];
|
|
59
|
-
for (const item of updateActions) {
|
|
60
|
-
updateLines.push(` ~ ${item.logicalId} (${item.resourceType})`);
|
|
61
|
-
if (item.drifted) {
|
|
62
|
-
updateLines.push(` [${lang_1.lang.__('DRIFTED')}] ${lang_1.lang.__('REMOTE_CONFIG_DIFFERS')}`);
|
|
63
|
-
}
|
|
64
|
-
if (item.changes) {
|
|
65
|
-
const jsonStr = JSON.stringify(item.changes, null, 2);
|
|
66
|
-
updateLines.push(` ${lang_1.lang.__('CHANGES')}: ${jsonStr.split('\n').join('\n ')}`);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
sections.push(updateLines.join('\n'));
|
|
70
|
-
}
|
|
71
|
-
if (deleteActions.length > 0) {
|
|
72
|
-
const deleteLines = [`[${lang_1.lang.__('DELETE')}]:`];
|
|
73
|
-
for (const item of deleteActions) {
|
|
74
|
-
deleteLines.push(` - ${item.logicalId} (${item.resourceType})`);
|
|
75
|
-
if (item.changes?.before) {
|
|
76
|
-
const jsonStr = JSON.stringify(item.changes.before, null, 2);
|
|
77
|
-
deleteLines.push(` ${jsonStr.split('\n').join('\n ')}`);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
sections.push(deleteLines.join('\n'));
|
|
81
|
-
}
|
|
82
|
-
if (noopActions.length > 0) {
|
|
83
|
-
const noopLines = [`[${lang_1.lang.__('NO_CHANGE')}]:`];
|
|
84
|
-
for (const item of noopActions) {
|
|
85
|
-
noopLines.push(` = ${item.logicalId} (${item.resourceType})`);
|
|
86
|
-
}
|
|
87
|
-
sections.push(noopLines.join('\n'));
|
|
88
|
-
}
|
|
89
|
-
common_1.logger.info(`\n${separator}\n${lang_1.lang.__('DEPLOYMENT_PLAN')}\n${separator}\n${sections.join('\n\n')}\n\n${separator}\n${lang_1.lang.__('PLAN')}: ${createActions.length} ${lang_1.lang.__('TO_CREATE')}, ${updateActions.length} ${lang_1.lang.__('TO_UPDATE')}, ${deleteActions.length} ${lang_1.lang.__('TO_DELETE')}, ${noopActions.length} ${lang_1.lang.__('UNCHANGED')}\n${separator}`);
|
|
90
|
-
};
|
|
91
|
-
exports.displayPlan = displayPlan;
|
package/dist/src/types/index.js
CHANGED
|
@@ -26,5 +26,4 @@ __exportStar(require("./domains/table"), exports);
|
|
|
26
26
|
__exportStar(require("./domains/state"), exports);
|
|
27
27
|
__exportStar(require("./domains/lock"), exports);
|
|
28
28
|
__exportStar(require("./domains/backend"), exports);
|
|
29
|
-
__exportStar(require("./domains/certificate"), exports);
|
|
30
29
|
__exportStar(require("./assets"), exports);
|
|
@@ -59,7 +59,9 @@ exports.bucketSchema = {
|
|
|
59
59
|
type: 'object',
|
|
60
60
|
properties: {
|
|
61
61
|
domain_name: { type: 'string' },
|
|
62
|
-
|
|
62
|
+
certificate_id: { type: 'string' },
|
|
63
|
+
certificate_body: { type: 'string' },
|
|
64
|
+
certificate_private_key: { type: 'string' },
|
|
63
65
|
protocol: {
|
|
64
66
|
oneOf: [
|
|
65
67
|
{ type: 'string', enum: ['HTTP', 'HTTPS'] },
|
|
@@ -74,6 +76,30 @@ exports.bucketSchema = {
|
|
|
74
76
|
},
|
|
75
77
|
required: ['domain_name'],
|
|
76
78
|
additionalProperties: false,
|
|
79
|
+
oneOf: [
|
|
80
|
+
{
|
|
81
|
+
not: {
|
|
82
|
+
anyOf: [
|
|
83
|
+
{ required: ['certificate_id'] },
|
|
84
|
+
{ required: ['certificate_body'] },
|
|
85
|
+
{ required: ['certificate_private_key'] },
|
|
86
|
+
],
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
required: ['certificate_body', 'certificate_private_key'],
|
|
91
|
+
not: { required: ['certificate_id'] },
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
required: ['certificate_id'],
|
|
95
|
+
not: {
|
|
96
|
+
anyOf: [
|
|
97
|
+
{ required: ['certificate_body'] },
|
|
98
|
+
{ required: ['certificate_private_key'] },
|
|
99
|
+
],
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
],
|
|
77
103
|
},
|
|
78
104
|
],
|
|
79
105
|
},
|
|
@@ -26,10 +26,9 @@ exports.eventSchema = {
|
|
|
26
26
|
required: ['domain_name'],
|
|
27
27
|
properties: {
|
|
28
28
|
domain_name: { type: 'string' },
|
|
29
|
-
|
|
29
|
+
certificate_id: { type: 'string' },
|
|
30
30
|
certificate_body: { type: 'string' },
|
|
31
31
|
certificate_private_key: { type: 'string' },
|
|
32
|
-
certificate: { type: 'string' },
|
|
33
32
|
protocol: {
|
|
34
33
|
oneOf: [
|
|
35
34
|
{ type: 'string', enum: ['HTTP', 'HTTPS'] },
|
|
@@ -42,6 +41,30 @@ exports.eventSchema = {
|
|
|
42
41
|
],
|
|
43
42
|
},
|
|
44
43
|
},
|
|
44
|
+
oneOf: [
|
|
45
|
+
{
|
|
46
|
+
not: {
|
|
47
|
+
anyOf: [
|
|
48
|
+
{ required: ['certificate_id'] },
|
|
49
|
+
{ required: ['certificate_body'] },
|
|
50
|
+
{ required: ['certificate_private_key'] },
|
|
51
|
+
],
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
required: ['certificate_body', 'certificate_private_key'],
|
|
56
|
+
not: { required: ['certificate_id'] },
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
required: ['certificate_id'],
|
|
60
|
+
not: {
|
|
61
|
+
anyOf: [
|
|
62
|
+
{ required: ['certificate_body'] },
|
|
63
|
+
{ required: ['certificate_private_key'] },
|
|
64
|
+
],
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
],
|
|
45
68
|
},
|
|
46
69
|
},
|
|
47
70
|
required: ['name', 'type', 'triggers'],
|
|
@@ -12,7 +12,6 @@ const eventSchema_1 = require("./eventSchema");
|
|
|
12
12
|
const functionSchema_1 = require("./functionSchema");
|
|
13
13
|
const bucketSchema_1 = require("./bucketSchema");
|
|
14
14
|
const tableschema_1 = require("./tableschema");
|
|
15
|
-
const certificateSchema_1 = require("./certificateSchema");
|
|
16
15
|
const lang_1 = require("../lang");
|
|
17
16
|
class IacSchemaErrors extends Error {
|
|
18
17
|
constructor(errors) {
|
|
@@ -51,7 +50,6 @@ const validate = ajv
|
|
|
51
50
|
.addSchema(databaseSchema_1.databaseSchema)
|
|
52
51
|
.addSchema(tableschema_1.tableSchema)
|
|
53
52
|
.addSchema(bucketSchema_1.bucketSchema)
|
|
54
|
-
.addSchema(certificateSchema_1.certificateSchema)
|
|
55
53
|
.compile(rootSchema_1.rootSchema);
|
|
56
54
|
const validateRuntimeCompatibility = (iacJson) => {
|
|
57
55
|
if (!iacJson.functions) {
|
|
@@ -99,9 +99,6 @@ exports.rootSchema = {
|
|
|
99
99
|
tables: {
|
|
100
100
|
$ref: 'https://serverlessinsight.geekfun.club/schemas/tableschema.json',
|
|
101
101
|
},
|
|
102
|
-
certificates: {
|
|
103
|
-
$ref: 'https://serverlessinsight.geekfun.club/schemas/certificateschema.json',
|
|
104
|
-
},
|
|
105
102
|
backend: {
|
|
106
103
|
type: 'object',
|
|
107
104
|
properties: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/forceUnlock.ts","../src/commands/index.ts","../src/commands/local.ts","../src/commands/plan.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/
|
|
1
|
+
{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/forceUnlock.ts","../src/commands/index.ts","../src/commands/local.ts","../src/commands/plan.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/certUtils.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/credentials.ts","../src/common/domainUtils.ts","../src/common/fileUtils.ts","../src/common/getVersion.ts","../src/common/hashUtils.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/planFormatter.ts","../src/common/providerEnum.ts","../src/common/requestHelper.ts","../src/common/retryUtils.ts","../src/common/runtimeMapper.ts","../src/common/scfClient.ts","../src/common/sidUtils.ts","../src/common/stateManager.ts","../src/common/aliyunClient/apigwOperations.ts","../src/common/aliyunClient/casOperations.ts","../src/common/aliyunClient/dnsOperations.ts","../src/common/aliyunClient/ecsOperations.ts","../src/common/aliyunClient/esOperations.ts","../src/common/aliyunClient/fc3Operations.ts","../src/common/aliyunClient/index.ts","../src/common/aliyunClient/nasOperations.ts","../src/common/aliyunClient/ossOperations.ts","../src/common/aliyunClient/ramOperations.ts","../src/common/aliyunClient/rdsOperations.ts","../src/common/aliyunClient/slsOperations.ts","../src/common/aliyunClient/tablestoreOperations.ts","../src/common/aliyunClient/types.ts","../src/common/dependencyGraph/graph.ts","../src/common/dependencyGraph/index.ts","../src/common/dependencyGraph/types.ts","../src/common/stateBackend/cosStateBackend.ts","../src/common/stateBackend/index.ts","../src/common/stateBackend/localStateBackend.ts","../src/common/stateBackend/lockUtils.ts","../src/common/stateBackend/ossStateBackend.ts","../src/common/stateBackend/remoteStateBackend.ts","../src/common/stateBackend/types.ts","../src/common/tencentClient/cosOperations.ts","../src/common/tencentClient/dnspodOperations.ts","../src/common/tencentClient/esOperations.ts","../src/common/tencentClient/index.ts","../src/common/tencentClient/scfOperations.ts","../src/common/tencentClient/sslOperations.ts","../src/common/tencentClient/tdsqlcOperations.ts","../src/common/tencentClient/types.ts","../src/lang/en.ts","../src/lang/index.ts","../src/lang/zh-CN.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/parseUtils.ts","../src/parser/tableParser.ts","../src/parser/tagParser.ts","../src/stack/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/aliyunStack/apigwExecutor.ts","../src/stack/aliyunStack/apigwPlanner.ts","../src/stack/aliyunStack/apigwResource.ts","../src/stack/aliyunStack/apigwTypes.ts","../src/stack/aliyunStack/databaseExecutor.ts","../src/stack/aliyunStack/databasePlanner.ts","../src/stack/aliyunStack/databaseResource.ts","../src/stack/aliyunStack/deployer.ts","../src/stack/aliyunStack/destroyer.ts","../src/stack/aliyunStack/esServerlessTypes.ts","../src/stack/aliyunStack/fc3Executor.ts","../src/stack/aliyunStack/fc3Planner.ts","../src/stack/aliyunStack/fc3Resource.ts","../src/stack/aliyunStack/fc3Types.ts","../src/stack/aliyunStack/index.ts","../src/stack/aliyunStack/ossExecutor.ts","../src/stack/aliyunStack/ossPlanner.ts","../src/stack/aliyunStack/ossResource.ts","../src/stack/aliyunStack/ossTypes.ts","../src/stack/aliyunStack/planner.ts","../src/stack/aliyunStack/rdsTypes.ts","../src/stack/aliyunStack/tablestoreExecutor.ts","../src/stack/aliyunStack/tablestorePlanner.ts","../src/stack/aliyunStack/tablestoreResource.ts","../src/stack/aliyunStack/tablestoreTypes.ts","../src/stack/localStack/aliyunFc.ts","../src/stack/localStack/bucket.ts","../src/stack/localStack/event.ts","../src/stack/localStack/function.ts","../src/stack/localStack/functionRunner.ts","../src/stack/localStack/index.ts","../src/stack/localStack/localServer.ts","../src/stack/localStack/utils.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/scfStack/cosExecutor.ts","../src/stack/scfStack/cosPlanner.ts","../src/stack/scfStack/cosResource.ts","../src/stack/scfStack/cosTypes.ts","../src/stack/scfStack/deployer.ts","../src/stack/scfStack/destroyer.ts","../src/stack/scfStack/esServerlessExecutor.ts","../src/stack/scfStack/esServerlessPlanner.ts","../src/stack/scfStack/esServerlessResource.ts","../src/stack/scfStack/esServerlessTypes.ts","../src/stack/scfStack/index.ts","../src/stack/scfStack/planner.ts","../src/stack/scfStack/scfExecutor.ts","../src/stack/scfStack/scfPlanner.ts","../src/stack/scfStack/scfResource.ts","../src/stack/scfStack/scfTypes.ts","../src/stack/scfStack/tdsqlcExecutor.ts","../src/stack/scfStack/tdsqlcPlanner.ts","../src/stack/scfStack/tdsqlcResource.ts","../src/stack/scfStack/tdsqlcTypes.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/tablestore.d.ts","../src/types/domains/backend.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/lock.ts","../src/types/domains/provider.ts","../src/types/domains/resolvable.ts","../src/types/domains/state.ts","../src/types/domains/table.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/types/localStack/index.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts","../src/validator/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@geek-fun/serverlessinsight",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.2",
|
|
4
4
|
"description": "Full life cycle cross providers serverless application management for your fast-growing business.",
|
|
5
5
|
"homepage": "https://serverlessinsight.geekfun.club",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.resolveCertificateDomain = exports.resolveReferenceCertificate = exports.resolveUploadCertificate = void 0;
|
|
7
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
-
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
|
-
const certificateParser_1 = require("../parser/certificateParser");
|
|
10
|
-
const logger_1 = require("./logger");
|
|
11
|
-
const lang_1 = require("../lang");
|
|
12
|
-
const readPemContent = (value) => {
|
|
13
|
-
if (!(0, certificateParser_1.isFilePath)(value)) {
|
|
14
|
-
return value;
|
|
15
|
-
}
|
|
16
|
-
const filePath = node_path_1.default.resolve(process.cwd(), value);
|
|
17
|
-
if (!node_fs_1.default.existsSync(filePath)) {
|
|
18
|
-
throw new Error(lang_1.lang.__('CERT_FILE_NOT_FOUND', { filePath }));
|
|
19
|
-
}
|
|
20
|
-
logger_1.logger.info(lang_1.lang.__('CERT_READING_FILE', { filePath }));
|
|
21
|
-
return node_fs_1.default.readFileSync(filePath, 'utf-8');
|
|
22
|
-
};
|
|
23
|
-
const resolveUploadCertificate = (cert) => {
|
|
24
|
-
if (!cert.certificate_body || !cert.private_key) {
|
|
25
|
-
throw new Error(lang_1.lang.__('CERT_INVALID_CONFIGURATION', { name: cert.key }));
|
|
26
|
-
}
|
|
27
|
-
logger_1.logger.info(lang_1.lang.__('CERT_RESOLVED_UPLOAD', { name: cert.key }));
|
|
28
|
-
logger_1.logger.info(lang_1.lang.__('CERT_READING_PEM_FILES', { name: cert.key }));
|
|
29
|
-
const body = readPemContent(cert.certificate_body);
|
|
30
|
-
const key = readPemContent(cert.private_key);
|
|
31
|
-
const chain = cert.chain ? readPemContent(cert.chain) : undefined;
|
|
32
|
-
return {
|
|
33
|
-
certificateName: cert.key,
|
|
34
|
-
certificateBody: chain ? `${body}\n${chain}` : body,
|
|
35
|
-
certificatePrivateKey: key,
|
|
36
|
-
};
|
|
37
|
-
};
|
|
38
|
-
exports.resolveUploadCertificate = resolveUploadCertificate;
|
|
39
|
-
const resolveReferenceCertificate = async (cert, getCertificateFromProvider) => {
|
|
40
|
-
if (!cert.certificate_id) {
|
|
41
|
-
throw new Error(lang_1.lang.__('CERT_INVALID_CONFIGURATION', { name: cert.key }));
|
|
42
|
-
}
|
|
43
|
-
const certId = cert.certificate_id;
|
|
44
|
-
logger_1.logger.info(lang_1.lang.__('CERT_RESOLVED_REFERENCE', { name: cert.key, certId }));
|
|
45
|
-
logger_1.logger.info(lang_1.lang.__('CAS_FETCHING_CERT', { certId }));
|
|
46
|
-
const certDetail = await getCertificateFromProvider(certId);
|
|
47
|
-
if (!certDetail || !certDetail.cert || !certDetail.key) {
|
|
48
|
-
throw new Error(lang_1.lang.__('CAS_CERT_NOT_FOUND', { certId }));
|
|
49
|
-
}
|
|
50
|
-
return {
|
|
51
|
-
certificateName: cert.key,
|
|
52
|
-
certificateBody: certDetail.cert,
|
|
53
|
-
certificatePrivateKey: certDetail.key,
|
|
54
|
-
};
|
|
55
|
-
};
|
|
56
|
-
exports.resolveReferenceCertificate = resolveReferenceCertificate;
|
|
57
|
-
const resolveCertificateDomain = async (cert, getCertificateFromProvider) => {
|
|
58
|
-
if (cert.certificate_id) {
|
|
59
|
-
return (0, exports.resolveReferenceCertificate)(cert, getCertificateFromProvider);
|
|
60
|
-
}
|
|
61
|
-
return (0, exports.resolveUploadCertificate)(cert);
|
|
62
|
-
};
|
|
63
|
-
exports.resolveCertificateDomain = resolveCertificateDomain;
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isFilePath = exports.parseCertificate = void 0;
|
|
4
|
-
const isFilePath = (value) => {
|
|
5
|
-
if (value.startsWith('./') || value.startsWith('../')) {
|
|
6
|
-
return true;
|
|
7
|
-
}
|
|
8
|
-
return /\.(pem|crt|key)$/.test(value);
|
|
9
|
-
};
|
|
10
|
-
exports.isFilePath = isFilePath;
|
|
11
|
-
const parseCertificate = (certificates) => {
|
|
12
|
-
if (!certificates) {
|
|
13
|
-
return undefined;
|
|
14
|
-
}
|
|
15
|
-
return Object.entries(certificates).map(([key, cert]) => ({
|
|
16
|
-
key,
|
|
17
|
-
certificate_body: cert.certificate_body != null ? String(cert.certificate_body) : undefined,
|
|
18
|
-
private_key: cert.private_key != null ? String(cert.private_key) : undefined,
|
|
19
|
-
chain: cert.chain != null ? String(cert.chain) : undefined,
|
|
20
|
-
certificate_id: cert.certificate_id != null ? String(cert.certificate_id) : undefined,
|
|
21
|
-
}));
|
|
22
|
-
};
|
|
23
|
-
exports.parseCertificate = parseCertificate;
|