@geek-fun/serverlessinsight 0.5.8 → 0.6.0
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/AGENTS.md +372 -0
- package/README.md +2 -2
- package/README.zh-CN.md +11 -8
- package/dist/package.json +3 -1
- package/dist/src/commands/index.js +5 -4
- package/dist/src/common/aliyunClient/apigwOperations.js +96 -9
- package/dist/src/common/aliyunClient/casOperations.js +116 -0
- package/dist/src/common/aliyunClient/index.js +8 -0
- package/dist/src/common/aliyunClient/ossOperations.js +61 -4
- package/dist/src/common/aliyunClient/ramOperations.js +65 -20
- package/dist/src/common/certificateResolver.js +63 -0
- package/dist/src/common/iacHelper.js +9 -1
- package/dist/src/common/index.js +1 -0
- package/dist/src/common/tencentClient/index.js +18 -0
- package/dist/src/common/tencentClient/sslOperations.js +107 -0
- package/dist/src/lang/en.js +169 -0
- package/dist/src/lang/index.js +6 -0
- package/dist/src/lang/zh-CN.js +167 -0
- package/dist/src/parser/bucketParser.js +19 -1
- package/dist/src/parser/certificateParser.js +23 -0
- package/dist/src/parser/index.js +2 -0
- package/dist/src/stack/aliyunStack/apigwExecutor.js +15 -9
- package/dist/src/stack/aliyunStack/apigwPlanner.js +15 -2
- package/dist/src/stack/aliyunStack/apigwResource.js +44 -17
- package/dist/src/stack/aliyunStack/apigwTypes.js +36 -5
- package/dist/src/stack/aliyunStack/databaseExecutor.js +24 -9
- package/dist/src/stack/aliyunStack/databaseResource.js +5 -1
- package/dist/src/stack/aliyunStack/deployer.js +11 -2
- package/dist/src/stack/aliyunStack/destroyer.js +5 -1
- package/dist/src/stack/aliyunStack/fc3Executor.js +10 -9
- package/dist/src/stack/aliyunStack/fc3Resource.js +36 -27
- package/dist/src/stack/aliyunStack/ossExecutor.js +9 -9
- package/dist/src/stack/aliyunStack/ossResource.js +48 -5
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +21 -9
- package/dist/src/stack/localStack/event.js +1 -1
- package/dist/src/stack/scfStack/cosExecutor.js +9 -9
- package/dist/src/stack/scfStack/cosResource.js +45 -7
- package/dist/src/stack/scfStack/deployer.js +5 -1
- package/dist/src/stack/scfStack/destroyer.js +5 -1
- package/dist/src/stack/scfStack/esServerlessExecutor.js +21 -9
- package/dist/src/stack/scfStack/esServerlessResource.js +2 -1
- package/dist/src/stack/scfStack/scfExecutor.js +9 -9
- package/dist/src/stack/scfStack/scfResource.js +2 -1
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +9 -9
- package/dist/src/stack/scfStack/tdsqlcResource.js +5 -1
- package/dist/src/types/domains/certificate.js +2 -0
- package/dist/src/types/index.js +1 -0
- package/dist/src/validator/bucketSchema.js +27 -1
- package/dist/src/validator/certificateSchema.js +31 -0
- package/dist/src/validator/eventSchema.js +12 -0
- package/dist/src/validator/iacSchema.js +2 -0
- package/dist/src/validator/rootSchema.js +3 -0
- package/dist/src/validator/templateRefSchema.js +3 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
|
@@ -6,27 +6,27 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, bucket, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'bucket', name: bucket.name }));
|
|
10
10
|
const newState = await (0, ossResource_1.createBucketResource)(context, bucket, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'bucket', name: bucket.name }));
|
|
12
12
|
return newState;
|
|
13
13
|
};
|
|
14
14
|
const executeUpdateAction = async (context, bucket, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
15
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'bucket', name: bucket.name }));
|
|
16
16
|
const newState = await (0, ossResource_1.updateBucketResource)(context, bucket, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
17
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'bucket', name: bucket.name }));
|
|
18
18
|
return newState;
|
|
19
19
|
};
|
|
20
20
|
const executeDeleteAction = async (context, bucketName, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'bucket', name: bucketName }));
|
|
22
22
|
const newState = await (0, ossResource_1.deleteBucketResource)(context, bucketName, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
23
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'bucket', name: bucketName }));
|
|
24
24
|
return newState;
|
|
25
25
|
};
|
|
26
26
|
const executeSingleItem = async (context, item, bucketsMap, currentState) => {
|
|
27
27
|
switch (item.action) {
|
|
28
28
|
case 'noop':
|
|
29
|
-
common_1.logger.info(
|
|
29
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
30
30
|
return null;
|
|
31
31
|
case 'create': {
|
|
32
32
|
const bucket = bucketsMap.get(item.logicalId);
|
|
@@ -45,14 +45,14 @@ const executeSingleItem = async (context, item, bucketsMap, currentState) => {
|
|
|
45
45
|
case 'delete': {
|
|
46
46
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
47
47
|
if (!state) {
|
|
48
|
-
common_1.logger.warn(
|
|
48
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
49
49
|
return null;
|
|
50
50
|
}
|
|
51
51
|
const bucketName = state.definition.bucketName;
|
|
52
52
|
return executeDeleteAction(context, bucketName, item.logicalId, currentState);
|
|
53
53
|
}
|
|
54
54
|
default:
|
|
55
|
-
common_1.logger.warn(
|
|
55
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
56
56
|
return null;
|
|
57
57
|
}
|
|
58
58
|
};
|
|
@@ -97,6 +97,25 @@ const buildOssInstanceFromProvider = (info, sid) => {
|
|
|
97
97
|
})),
|
|
98
98
|
};
|
|
99
99
|
};
|
|
100
|
+
const resolveBucketDomainCertificate = async (domainCertificate, context, client) => {
|
|
101
|
+
if (!context.iac) {
|
|
102
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: domainCertificate }));
|
|
103
|
+
}
|
|
104
|
+
const certDef = (0, common_1.getIacDefinition)(context.iac, domainCertificate);
|
|
105
|
+
if (!certDef || !(0, common_1.isCertificateDomain)(certDef)) {
|
|
106
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: domainCertificate }));
|
|
107
|
+
}
|
|
108
|
+
const resolved = await (0, common_1.resolveCertificateDomain)(certDef, async (certId) => {
|
|
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
|
+
};
|
|
118
|
+
};
|
|
100
119
|
const createBucketResource = async (context, bucket, state) => {
|
|
101
120
|
const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
|
|
102
121
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
@@ -125,8 +144,20 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
125
144
|
state = (0, common_1.setResource)(state, logicalId, partialResourceState);
|
|
126
145
|
let cnameInfo;
|
|
127
146
|
if (bucket.website?.domain) {
|
|
128
|
-
|
|
129
|
-
|
|
147
|
+
const certificate = bucket.website.domain_certificate
|
|
148
|
+
? await resolveBucketDomainCertificate(bucket.website.domain_certificate, context, client)
|
|
149
|
+
: undefined;
|
|
150
|
+
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
151
|
+
domain: bucket.website.domain,
|
|
152
|
+
bucketName: config.bucketName,
|
|
153
|
+
}));
|
|
154
|
+
if (certificate) {
|
|
155
|
+
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
|
|
156
|
+
domain: bucket.website.domain,
|
|
157
|
+
bucketName: config.bucketName,
|
|
158
|
+
}));
|
|
159
|
+
}
|
|
160
|
+
cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
|
|
130
161
|
if (cnameInfo) {
|
|
131
162
|
const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
|
|
132
163
|
const dnsInstance = {
|
|
@@ -204,8 +235,20 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
204
235
|
if (domainChanged && existingDnsInstance) {
|
|
205
236
|
await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
|
|
206
237
|
}
|
|
207
|
-
|
|
208
|
-
|
|
238
|
+
const certificate = bucket.website.domain_certificate
|
|
239
|
+
? await resolveBucketDomainCertificate(bucket.website.domain_certificate, context, client)
|
|
240
|
+
: undefined;
|
|
241
|
+
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
242
|
+
domain: bucket.website.domain,
|
|
243
|
+
bucketName: config.bucketName,
|
|
244
|
+
}));
|
|
245
|
+
if (certificate) {
|
|
246
|
+
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
|
|
247
|
+
domain: bucket.website.domain,
|
|
248
|
+
bucketName: config.bucketName,
|
|
249
|
+
}));
|
|
250
|
+
}
|
|
251
|
+
const cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
|
|
209
252
|
if (cnameInfo) {
|
|
210
253
|
const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
|
|
211
254
|
const dnsInstance = {
|
|
@@ -250,7 +293,7 @@ const deleteBucketResource = async (context, bucketName, logicalId, state) => {
|
|
|
250
293
|
catch (err) {
|
|
251
294
|
const errorCode = err?.code;
|
|
252
295
|
if (errorCode === 'NoSuchBucket') {
|
|
253
|
-
logger_1.logger.warn(
|
|
296
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', { resourceType: 'Bucket', name: bucketName }));
|
|
254
297
|
}
|
|
255
298
|
else {
|
|
256
299
|
throw err;
|
|
@@ -6,27 +6,39 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, table, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', {
|
|
10
|
+
resourceType: 'table',
|
|
11
|
+
name: `${table.collection}/${table.name}`,
|
|
12
|
+
}));
|
|
10
13
|
const newState = await (0, tablestoreResource_1.createTableResource)(context, table, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
14
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', {
|
|
15
|
+
resourceType: 'table',
|
|
16
|
+
name: `${table.collection}/${table.name}`,
|
|
17
|
+
}));
|
|
12
18
|
return newState;
|
|
13
19
|
};
|
|
14
20
|
const executeUpdateAction = async (context, table, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', {
|
|
22
|
+
resourceType: 'table',
|
|
23
|
+
name: `${table.collection}/${table.name}`,
|
|
24
|
+
}));
|
|
16
25
|
const newState = await (0, tablestoreResource_1.updateTableResource)(context, table, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
26
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', {
|
|
27
|
+
resourceType: 'table',
|
|
28
|
+
name: `${table.collection}/${table.name}`,
|
|
29
|
+
}));
|
|
18
30
|
return newState;
|
|
19
31
|
};
|
|
20
32
|
const executeDeleteAction = async (context, instanceName, tableName, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
33
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'table', name: `${instanceName}/${tableName}` }));
|
|
22
34
|
const newState = await (0, tablestoreResource_1.deleteTableResource)(context, instanceName, tableName, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
35
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'table', name: `${instanceName}/${tableName}` }));
|
|
24
36
|
return newState;
|
|
25
37
|
};
|
|
26
38
|
const executeSingleItem = async (context, item, tablesMap, currentState) => {
|
|
27
39
|
switch (item.action) {
|
|
28
40
|
case 'noop':
|
|
29
|
-
common_1.logger.info(
|
|
41
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
30
42
|
return null;
|
|
31
43
|
case 'create': {
|
|
32
44
|
const table = tablesMap.get(item.logicalId);
|
|
@@ -45,7 +57,7 @@ const executeSingleItem = async (context, item, tablesMap, currentState) => {
|
|
|
45
57
|
case 'delete': {
|
|
46
58
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
47
59
|
if (!state) {
|
|
48
|
-
common_1.logger.warn(
|
|
60
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
49
61
|
return null;
|
|
50
62
|
}
|
|
51
63
|
const instanceName = state.definition.instanceName;
|
|
@@ -53,7 +65,7 @@ const executeSingleItem = async (context, item, tablesMap, currentState) => {
|
|
|
53
65
|
return executeDeleteAction(context, instanceName, tableName, item.logicalId, currentState);
|
|
54
66
|
}
|
|
55
67
|
default:
|
|
56
|
-
common_1.logger.warn(
|
|
68
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
57
69
|
return null;
|
|
58
70
|
}
|
|
59
71
|
};
|
|
@@ -63,7 +63,7 @@ const servEvent = async (req, parsed, iac) => {
|
|
|
63
63
|
}
|
|
64
64
|
if (matchedTrigger.backend) {
|
|
65
65
|
const backendDef = (0, common_1.getIacDefinition)(iac, matchedTrigger.backend);
|
|
66
|
-
if (!backendDef) {
|
|
66
|
+
if (!backendDef || !(0, common_1.isFunctionDomain)(backendDef)) {
|
|
67
67
|
const endTime = new Date();
|
|
68
68
|
if (isAliyun) {
|
|
69
69
|
(0, aliyunFc_1.logApiGatewayRequest)(requestId, parsed.url, 500, startTime, endTime, sourceIp);
|
|
@@ -6,27 +6,27 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, bucket, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'bucket', name: bucket.name }));
|
|
10
10
|
const newState = await (0, cosResource_1.createBucketResource)(context, bucket, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'bucket', name: bucket.name }));
|
|
12
12
|
return newState;
|
|
13
13
|
};
|
|
14
14
|
const executeUpdateAction = async (context, bucket, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
15
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'bucket', name: bucket.name }));
|
|
16
16
|
const newState = await (0, cosResource_1.updateBucketResource)(context, bucket, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
17
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'bucket', name: bucket.name }));
|
|
18
18
|
return newState;
|
|
19
19
|
};
|
|
20
20
|
const executeDeleteAction = async (context, bucketName, region, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'bucket', name: bucketName }));
|
|
22
22
|
const newState = await (0, cosResource_1.deleteBucketResource)(context, bucketName, region, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
23
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'bucket', name: bucketName }));
|
|
24
24
|
return newState;
|
|
25
25
|
};
|
|
26
26
|
const executeSingleItem = async (context, item, bucketsMap, currentState) => {
|
|
27
27
|
switch (item.action) {
|
|
28
28
|
case 'noop':
|
|
29
|
-
common_1.logger.info(
|
|
29
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
30
30
|
return null;
|
|
31
31
|
case 'create': {
|
|
32
32
|
const bucket = bucketsMap.get(item.logicalId);
|
|
@@ -45,14 +45,14 @@ const executeSingleItem = async (context, item, bucketsMap, currentState) => {
|
|
|
45
45
|
case 'delete': {
|
|
46
46
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
47
47
|
if (!state) {
|
|
48
|
-
common_1.logger.warn(
|
|
48
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
49
49
|
return null;
|
|
50
50
|
}
|
|
51
51
|
const bucketName = state.definition.bucket;
|
|
52
52
|
return executeDeleteAction(context, bucketName, state.region, item.logicalId, currentState);
|
|
53
53
|
}
|
|
54
54
|
default:
|
|
55
|
-
common_1.logger.warn(
|
|
55
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
56
56
|
return null;
|
|
57
57
|
}
|
|
58
58
|
};
|
|
@@ -4,9 +4,29 @@ exports.deleteBucketResource = exports.updateBucketResource = exports.readBucket
|
|
|
4
4
|
const types_1 = require("../../types");
|
|
5
5
|
const tencentClient_1 = require("../../common/tencentClient");
|
|
6
6
|
const cosTypes_1 = require("./cosTypes");
|
|
7
|
-
const stateManager_1 = require("../../common/stateManager");
|
|
8
7
|
const common_1 = require("../../common");
|
|
8
|
+
const certificateResolver_1 = require("../../common/certificateResolver");
|
|
9
9
|
const logger_1 = require("../../common/logger");
|
|
10
|
+
const lang_1 = require("../../lang");
|
|
11
|
+
const resolveBucketDomainCertificate = (domainCertificate, context) => {
|
|
12
|
+
if (!context.iac) {
|
|
13
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: domainCertificate }));
|
|
14
|
+
}
|
|
15
|
+
const certDef = (0, common_1.getIacDefinition)(context.iac, domainCertificate);
|
|
16
|
+
if (!certDef || !(0, common_1.isCertificateDomain)(certDef)) {
|
|
17
|
+
throw new Error(lang_1.lang.__('CERT_REFERENCE_NOT_FOUND', { reference: domainCertificate }));
|
|
18
|
+
}
|
|
19
|
+
if (certDef.certificate_id) {
|
|
20
|
+
throw new Error(lang_1.lang.__('TENCENT_CERT_REFERENCE_NOT_SUPPORTED', { name: certDef.key }));
|
|
21
|
+
}
|
|
22
|
+
return (0, certificateResolver_1.resolveUploadCertificate)(certDef);
|
|
23
|
+
};
|
|
24
|
+
const deployCertificateToCosDomain = async (client, resolved, bucketName, domain, region) => {
|
|
25
|
+
logger_1.logger.info(lang_1.lang.__('COS_BUCKET_CERT_DEPLOYING', { domain, bucketName }));
|
|
26
|
+
const certInfo = await client.ssl.uploadCertificate(resolved.certificateName, resolved.certificateBody, resolved.certificatePrivateKey);
|
|
27
|
+
const instanceId = `${region}|${bucketName}|${domain}`;
|
|
28
|
+
await client.ssl.deployCertificateInstance(certInfo.certificateId, 'cos', [instanceId]);
|
|
29
|
+
};
|
|
10
30
|
const buildCosInstanceFromProvider = (info, sid) => {
|
|
11
31
|
return {
|
|
12
32
|
sid,
|
|
@@ -81,7 +101,13 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
81
101
|
];
|
|
82
102
|
let cnameInfo;
|
|
83
103
|
if (bucket.website?.domain) {
|
|
84
|
-
|
|
104
|
+
const resolved = bucket.website.domain_certificate
|
|
105
|
+
? resolveBucketDomainCertificate(bucket.website.domain_certificate, context)
|
|
106
|
+
: undefined;
|
|
107
|
+
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
108
|
+
domain: bucket.website.domain,
|
|
109
|
+
bucketName: bucket.name,
|
|
110
|
+
}));
|
|
85
111
|
cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
|
|
86
112
|
if (cnameInfo) {
|
|
87
113
|
const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
|
|
@@ -99,6 +125,9 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
99
125
|
if (refreshedInfo) {
|
|
100
126
|
instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
|
|
101
127
|
}
|
|
128
|
+
if (resolved && cnameInfo.bucketDomainBound) {
|
|
129
|
+
await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
|
|
130
|
+
}
|
|
102
131
|
}
|
|
103
132
|
}
|
|
104
133
|
const resourceState = {
|
|
@@ -108,7 +137,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
108
137
|
instances,
|
|
109
138
|
lastUpdated: new Date().toISOString(),
|
|
110
139
|
};
|
|
111
|
-
return (0,
|
|
140
|
+
return (0, common_1.setResource)(state, logicalId, resourceState);
|
|
112
141
|
};
|
|
113
142
|
exports.createBucketResource = createBucketResource;
|
|
114
143
|
const readBucketResource = async (context, bucketName, region) => {
|
|
@@ -142,7 +171,13 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
142
171
|
if (domainChanged && existingDnsInstance) {
|
|
143
172
|
await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
|
|
144
173
|
}
|
|
145
|
-
|
|
174
|
+
const resolved = bucket.website.domain_certificate
|
|
175
|
+
? resolveBucketDomainCertificate(bucket.website.domain_certificate, context)
|
|
176
|
+
: undefined;
|
|
177
|
+
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
178
|
+
domain: bucket.website.domain,
|
|
179
|
+
bucketName: bucket.name,
|
|
180
|
+
}));
|
|
146
181
|
const cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
|
|
147
182
|
if (cnameInfo) {
|
|
148
183
|
const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
|
|
@@ -160,6 +195,9 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
160
195
|
if (refreshedInfo) {
|
|
161
196
|
instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
|
|
162
197
|
}
|
|
198
|
+
if (resolved && cnameInfo.bucketDomainBound) {
|
|
199
|
+
await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
|
|
200
|
+
}
|
|
163
201
|
}
|
|
164
202
|
}
|
|
165
203
|
else if (existingDnsInstance) {
|
|
@@ -172,7 +210,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
172
210
|
instances,
|
|
173
211
|
lastUpdated: new Date().toISOString(),
|
|
174
212
|
};
|
|
175
|
-
return (0,
|
|
213
|
+
return (0, common_1.setResource)(state, logicalId, resourceState);
|
|
176
214
|
};
|
|
177
215
|
exports.updateBucketResource = updateBucketResource;
|
|
178
216
|
const deleteBucketResource = async (context, bucketName, region, logicalId, state) => {
|
|
@@ -189,12 +227,12 @@ const deleteBucketResource = async (context, bucketName, region, logicalId, stat
|
|
|
189
227
|
const errorCode = err?.code;
|
|
190
228
|
const statusCode = err?.statusCode;
|
|
191
229
|
if (errorCode === 'NoSuchBucket' || statusCode === 404) {
|
|
192
|
-
logger_1.logger.warn(
|
|
230
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', { resourceType: 'Bucket', name: bucketName }));
|
|
193
231
|
}
|
|
194
232
|
else {
|
|
195
233
|
throw err;
|
|
196
234
|
}
|
|
197
235
|
}
|
|
198
|
-
return (0,
|
|
236
|
+
return (0, common_1.removeResource)(state, logicalId);
|
|
199
237
|
};
|
|
200
238
|
exports.deleteBucketResource = deleteBucketResource;
|
|
@@ -43,7 +43,11 @@ const deployTencentStack = async (iac, backend) => {
|
|
|
43
43
|
};
|
|
44
44
|
common_1.logger.info(`${lang_1.lang.__('PLAN_GENERATED')}: ${combinedPlan.items.length} ${lang_1.lang.__('ACTIONS')}`);
|
|
45
45
|
combinedPlan.items.forEach((item) => {
|
|
46
|
-
common_1.logger.info(
|
|
46
|
+
common_1.logger.info(lang_1.lang.__('EXECUTION_PLAN_ITEM', {
|
|
47
|
+
action: item.action.toUpperCase(),
|
|
48
|
+
logicalId: item.logicalId,
|
|
49
|
+
resourceType: item.resourceType,
|
|
50
|
+
}));
|
|
47
51
|
});
|
|
48
52
|
common_1.logger.info(lang_1.lang.__('EXECUTING_PLAN'));
|
|
49
53
|
const functionResult = await (0, scfExecutor_1.executeFunctionPlan)(context, functionPlan, iac.functions, state, onStateChange);
|
|
@@ -42,7 +42,11 @@ const destroyTencentStack = async (backend) => {
|
|
|
42
42
|
};
|
|
43
43
|
common_1.logger.info(`${lang_1.lang.__('PLAN_GENERATED')}: ${combinedPlan.items.length} ${lang_1.lang.__('ACTIONS')}`);
|
|
44
44
|
combinedPlan.items.forEach((item) => {
|
|
45
|
-
common_1.logger.info(
|
|
45
|
+
common_1.logger.info(lang_1.lang.__('EXECUTION_PLAN_ITEM', {
|
|
46
|
+
action: item.action.toUpperCase(),
|
|
47
|
+
logicalId: item.logicalId,
|
|
48
|
+
resourceType: item.resourceType,
|
|
49
|
+
}));
|
|
46
50
|
});
|
|
47
51
|
const functionResult = await (0, scfExecutor_1.executeFunctionPlan)(context, functionPlan, undefined, state, onStateChange);
|
|
48
52
|
state = functionResult.state;
|
|
@@ -6,21 +6,33 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, database, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', {
|
|
10
|
+
resourceType: 'Tencent ES serverless space',
|
|
11
|
+
name: database.name,
|
|
12
|
+
}));
|
|
10
13
|
const newState = await (0, esServerlessResource_1.createEsResource)(context, database, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
14
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', {
|
|
15
|
+
resourceType: 'Tencent ES serverless space',
|
|
16
|
+
name: database.name,
|
|
17
|
+
}));
|
|
12
18
|
return newState;
|
|
13
19
|
};
|
|
14
20
|
const executeUpdateAction = async (context, database, spaceId, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', {
|
|
22
|
+
resourceType: 'Tencent ES serverless space',
|
|
23
|
+
name: database.name,
|
|
24
|
+
}));
|
|
16
25
|
const newState = await (0, esServerlessResource_1.updateEsResource)(context, database, spaceId, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
26
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', {
|
|
27
|
+
resourceType: 'Tencent ES serverless space',
|
|
28
|
+
name: database.name,
|
|
29
|
+
}));
|
|
18
30
|
return newState;
|
|
19
31
|
};
|
|
20
32
|
const executeDeleteAction = async (context, spaceId, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
33
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'Tencent ES serverless space', name: spaceId }));
|
|
22
34
|
const newState = await (0, esServerlessResource_1.deleteEsResource)(context, spaceId, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
35
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'Tencent ES serverless space', name: spaceId }));
|
|
24
36
|
return newState;
|
|
25
37
|
};
|
|
26
38
|
const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
@@ -29,7 +41,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
29
41
|
}
|
|
30
42
|
switch (item.action) {
|
|
31
43
|
case 'noop':
|
|
32
|
-
common_1.logger.info(
|
|
44
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
33
45
|
return null;
|
|
34
46
|
case 'create': {
|
|
35
47
|
const database = databasesMap.get(item.logicalId);
|
|
@@ -56,7 +68,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
56
68
|
case 'delete': {
|
|
57
69
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
58
70
|
if (!state) {
|
|
59
|
-
common_1.logger.warn(
|
|
71
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
60
72
|
return null;
|
|
61
73
|
}
|
|
62
74
|
const spaceId = state.metadata?.spaceId || state.instances?.[0]?.id;
|
|
@@ -66,7 +78,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
66
78
|
return executeDeleteAction(context, spaceId, item.logicalId, currentState);
|
|
67
79
|
}
|
|
68
80
|
default:
|
|
69
|
-
common_1.logger.warn(
|
|
81
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
70
82
|
return null;
|
|
71
83
|
}
|
|
72
84
|
};
|
|
@@ -6,6 +6,7 @@ const esServerlessTypes_1 = require("./esServerlessTypes");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const common_1 = require("../../common");
|
|
8
8
|
const logger_1 = require("../../common/logger");
|
|
9
|
+
const lang_1 = require("../../lang");
|
|
9
10
|
const buildEsSpaceFromProvider = (info, sid) => {
|
|
10
11
|
return {
|
|
11
12
|
sid,
|
|
@@ -96,7 +97,7 @@ const deleteEsResource = async (context, spaceId, logicalId, state) => {
|
|
|
96
97
|
catch (err) {
|
|
97
98
|
const errorCode = err?.code;
|
|
98
99
|
if (errorCode === 'ResourceNotFound' || errorCode === 'InvalidParameterValue') {
|
|
99
|
-
logger_1.logger.warn(
|
|
100
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', { resourceType: 'ES space', name: spaceId }));
|
|
100
101
|
}
|
|
101
102
|
else {
|
|
102
103
|
throw err;
|
|
@@ -6,27 +6,27 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, fn, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
10
10
|
const newState = await (0, scfResource_1.createResource)(context, fn, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'function', name: fn.name }));
|
|
12
12
|
return newState;
|
|
13
13
|
};
|
|
14
14
|
const executeUpdateAction = async (context, fn, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
15
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
16
16
|
const newState = await (0, scfResource_1.updateResource)(context, fn, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
17
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'function', name: fn.name }));
|
|
18
18
|
return newState;
|
|
19
19
|
};
|
|
20
20
|
const executeDeleteAction = async (context, functionName, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'function', name: functionName }));
|
|
22
22
|
const newState = await (0, scfResource_1.deleteResource)(context, functionName, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
23
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'function', name: functionName }));
|
|
24
24
|
return newState;
|
|
25
25
|
};
|
|
26
26
|
const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
27
27
|
switch (item.action) {
|
|
28
28
|
case 'noop':
|
|
29
|
-
common_1.logger.info(
|
|
29
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
30
30
|
return null;
|
|
31
31
|
case 'create': {
|
|
32
32
|
const fn = functionsMap.get(item.logicalId);
|
|
@@ -45,14 +45,14 @@ const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
|
45
45
|
case 'delete': {
|
|
46
46
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
47
47
|
if (!state) {
|
|
48
|
-
common_1.logger.warn(
|
|
48
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
49
49
|
return null;
|
|
50
50
|
}
|
|
51
51
|
const functionName = state.definition.functionName;
|
|
52
52
|
return executeDeleteAction(context, functionName, item.logicalId, currentState);
|
|
53
53
|
}
|
|
54
54
|
default:
|
|
55
|
-
common_1.logger.warn(
|
|
55
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
56
56
|
return null;
|
|
57
57
|
}
|
|
58
58
|
};
|
|
@@ -8,6 +8,7 @@ const stateManager_1 = require("../../common/stateManager");
|
|
|
8
8
|
const common_1 = require("../../common");
|
|
9
9
|
const hashUtils_1 = require("../../common/hashUtils");
|
|
10
10
|
const logger_1 = require("../../common/logger");
|
|
11
|
+
const lang_1 = require("../../lang");
|
|
11
12
|
const buildScfInstanceFromProvider = (info, sid) => {
|
|
12
13
|
const envMap = info.Environment?.Variables?.reduce((acc, v) => ({ ...acc, [v.Key]: v.Value }), {}) ?? {};
|
|
13
14
|
const triggersArray = info.Triggers?.map((t) => ({
|
|
@@ -218,7 +219,7 @@ const deleteResource = async (context, functionName, logicalId, state) => {
|
|
|
218
219
|
catch (err) {
|
|
219
220
|
const errorCode = err?.code;
|
|
220
221
|
if (errorCode === 'ResourceNotFound.FunctionName') {
|
|
221
|
-
logger_1.logger.warn(
|
|
222
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', { resourceType: 'Function', name: functionName }));
|
|
222
223
|
}
|
|
223
224
|
else {
|
|
224
225
|
throw err;
|
|
@@ -6,21 +6,21 @@ const common_1 = require("../../common");
|
|
|
6
6
|
const stateManager_1 = require("../../common/stateManager");
|
|
7
7
|
const lang_1 = require("../../lang");
|
|
8
8
|
const executeCreateAction = async (context, database, currentState) => {
|
|
9
|
-
common_1.logger.info(
|
|
9
|
+
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'TDSQL-C database', name: database.name }));
|
|
10
10
|
const newState = await (0, tdsqlcResource_1.createDatabaseResource)(context, database, currentState);
|
|
11
|
-
common_1.logger.info(
|
|
11
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'TDSQL-C database', name: database.name }));
|
|
12
12
|
return newState;
|
|
13
13
|
};
|
|
14
14
|
const executeUpdateAction = async (context, database, clusterId, currentState) => {
|
|
15
|
-
common_1.logger.info(
|
|
15
|
+
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'TDSQL-C database', name: database.name }));
|
|
16
16
|
const newState = await (0, tdsqlcResource_1.updateDatabaseResource)(context, database, clusterId, currentState);
|
|
17
|
-
common_1.logger.info(
|
|
17
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'TDSQL-C database', name: database.name }));
|
|
18
18
|
return newState;
|
|
19
19
|
};
|
|
20
20
|
const executeDeleteAction = async (context, clusterId, logicalId, currentState) => {
|
|
21
|
-
common_1.logger.info(
|
|
21
|
+
common_1.logger.info(lang_1.lang.__('DELETING_RESOURCE', { resourceType: 'TDSQL-C database', name: clusterId }));
|
|
22
22
|
const newState = await (0, tdsqlcResource_1.deleteDatabaseResource)(context, clusterId, logicalId, currentState);
|
|
23
|
-
common_1.logger.info(
|
|
23
|
+
common_1.logger.info(lang_1.lang.__('RESOURCE_DELETED', { resourceType: 'TDSQL-C database', name: clusterId }));
|
|
24
24
|
return newState;
|
|
25
25
|
};
|
|
26
26
|
const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
@@ -29,7 +29,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
29
29
|
}
|
|
30
30
|
switch (item.action) {
|
|
31
31
|
case 'noop':
|
|
32
|
-
common_1.logger.info(
|
|
32
|
+
common_1.logger.info(lang_1.lang.__('NO_CHANGESForResource', { logicalId: item.logicalId }));
|
|
33
33
|
return null;
|
|
34
34
|
case 'create': {
|
|
35
35
|
const database = databasesMap.get(item.logicalId);
|
|
@@ -56,7 +56,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
56
56
|
case 'delete': {
|
|
57
57
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
58
58
|
if (!state) {
|
|
59
|
-
common_1.logger.warn(
|
|
59
|
+
common_1.logger.warn(lang_1.lang.__('STATE_NOT_FOUND_SKIPPING', { logicalId: item.logicalId }));
|
|
60
60
|
return null;
|
|
61
61
|
}
|
|
62
62
|
const clusterId = state.metadata?.clusterId || state.instances?.[0]?.id;
|
|
@@ -66,7 +66,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
66
66
|
return executeDeleteAction(context, clusterId, item.logicalId, currentState);
|
|
67
67
|
}
|
|
68
68
|
default:
|
|
69
|
-
common_1.logger.warn(
|
|
69
|
+
common_1.logger.warn(lang_1.lang.__('UNKNOWN_ACTION_FOR_RESOURCE', { action: item.action, logicalId: item.logicalId }));
|
|
70
70
|
return null;
|
|
71
71
|
}
|
|
72
72
|
};
|