@geek-fun/serverlessinsight 0.8.9 → 0.9.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/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +1 -1
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +123 -0
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +4 -4
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +93 -0
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +148 -0
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/CHANGELOG.md +29 -0
- package/README.md +2 -2
- package/README.zh-CN.md +2 -2
- package/dist/package.json +2 -2
- package/dist/src/commands/deploy.js +12 -4
- package/dist/src/commands/destroy.js +8 -2
- package/dist/src/commands/forceUnlock.js +5 -5
- package/dist/src/commands/index.js +114 -53
- package/dist/src/commands/login.js +12 -1
- package/dist/src/commands/migrate.js +287 -0
- package/dist/src/commands/plan.js +7 -1
- package/dist/src/commands/show.js +37 -25
- package/dist/src/common/aliyunClient/apigwOperations.js +4 -4
- package/dist/src/common/aliyunClient/ecsOperations.js +22 -13
- package/dist/src/common/aliyunClient/fc3Operations.js +12 -3
- package/dist/src/common/aliyunClient/nasOperations.js +4 -3
- package/dist/src/common/aliyunClient/ossOperations.js +52 -8
- package/dist/src/common/aliyunClient/slsOperations.js +3 -2
- package/dist/src/common/aliyunClient/tablestoreOperations.js +22 -11
- package/dist/src/common/apiClient.js +22 -5
- package/dist/src/common/context.js +5 -4
- package/dist/src/common/lockManager.js +1 -1
- package/dist/src/common/migrationMarker.js +34 -0
- package/dist/src/common/nameBuilder.js +13 -1
- package/dist/src/common/planCompare.js +31 -1
- package/dist/src/common/planFormatter.js +69 -54
- package/dist/src/common/refreshPlanner.js +31 -8
- package/dist/src/common/runtimeMapper.js +7 -3
- package/dist/src/common/stateBackend/cosStateBackend.js +1 -1
- package/dist/src/common/stateBackend/index.js +5 -2
- package/dist/src/common/stateBackend/localStateBackend.js +8 -2
- package/dist/src/common/stateBackend/ossStateBackend.js +1 -1
- package/dist/src/common/stateBackend/remoteStateBackend.js +19 -2
- package/dist/src/common/stateBackend/saasStateBackend.js +83 -5
- package/dist/src/common/stateManager.js +56 -5
- package/dist/src/common/tencentClient/cosOperations.js +1 -1
- package/dist/src/common/tencentClient/scfOperations.js +2 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +2 -2
- package/dist/src/common/volcengineClient/index.js +6 -2
- package/dist/src/common/volcengineClient/vefaasOperations.js +3 -3
- package/dist/src/lang/en.js +231 -7
- package/dist/src/lang/zh-CN.js +230 -7
- package/dist/src/parser/index.js +1 -1
- package/dist/src/stack/aliyunStack/apigwExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/apigwPlanner.js +26 -5
- package/dist/src/stack/aliyunStack/apigwResource.js +22 -10
- package/dist/src/stack/aliyunStack/databaseExecutor.js +5 -5
- package/dist/src/stack/aliyunStack/databasePlanner.js +8 -3
- package/dist/src/stack/aliyunStack/databaseResource.js +28 -12
- package/dist/src/stack/aliyunStack/deployer.js +30 -13
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/aliyunStack/fc3Executor.js +2 -2
- package/dist/src/stack/aliyunStack/fc3Planner.js +46 -25
- package/dist/src/stack/aliyunStack/fc3Resource.js +80 -31
- package/dist/src/stack/aliyunStack/ossExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/ossPlanner.js +6 -1
- package/dist/src/stack/aliyunStack/ossResource.js +14 -3
- package/dist/src/stack/aliyunStack/rdsTypes.js +5 -1
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/tablestorePlanner.js +2 -1
- package/dist/src/stack/aliyunStack/tablestoreResource.js +5 -4
- package/dist/src/stack/aliyunStack/tablestoreTypes.js +3 -2
- package/dist/src/stack/deploy.js +12 -7
- package/dist/src/stack/localStack/functionRunner.js +5 -4
- package/dist/src/stack/scfStack/cosExecutor.js +2 -2
- package/dist/src/stack/scfStack/cosPlanner.js +6 -1
- package/dist/src/stack/scfStack/cosResource.js +8 -4
- package/dist/src/stack/scfStack/deployer.js +21 -6
- package/dist/src/stack/scfStack/esServerlessExecutor.js +5 -5
- package/dist/src/stack/scfStack/esServerlessPlanner.js +6 -1
- package/dist/src/stack/scfStack/esServerlessResource.js +12 -4
- package/dist/src/stack/scfStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/scfStack/scfExecutor.js +2 -2
- package/dist/src/stack/scfStack/scfPlanner.js +26 -27
- package/dist/src/stack/scfStack/scfResource.js +38 -13
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +5 -5
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +6 -1
- package/dist/src/stack/scfStack/tdsqlcResource.js +12 -4
- package/dist/src/stack/volcengineStack/apigwExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/apigwPlanner.js +5 -1
- package/dist/src/stack/volcengineStack/apigwResource.js +7 -4
- package/dist/src/stack/volcengineStack/deployer.js +15 -4
- package/dist/src/stack/volcengineStack/tosExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/tosPlanner.js +6 -1
- package/dist/src/stack/volcengineStack/tosResource.js +11 -4
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +39 -11
- package/dist/src/stack/volcengineStack/vefaasResource.js +11 -3
- package/dist/src/validator/rootSchema.js +29 -2
- package/dist/src/validator/semanticValidation.js +24 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -6,7 +6,9 @@ const backend_1 = require("../types/domains/backend");
|
|
|
6
6
|
const common_1 = require("../common");
|
|
7
7
|
const lockManager_1 = require("../common/lockManager");
|
|
8
8
|
const stateBackend_1 = require("../common/stateBackend");
|
|
9
|
+
const migrationMarker_1 = require("../common/migrationMarker");
|
|
9
10
|
const logger_1 = require("../common/logger");
|
|
11
|
+
const lang_1 = require("../lang");
|
|
10
12
|
const formatTimeAgo = (dateStr) => {
|
|
11
13
|
const date = new Date(dateStr);
|
|
12
14
|
const now = new Date();
|
|
@@ -15,12 +17,12 @@ const formatTimeAgo = (dateStr) => {
|
|
|
15
17
|
const diffHours = Math.floor(diffMs / 3600000);
|
|
16
18
|
const diffDays = Math.floor(diffMs / 86400000);
|
|
17
19
|
if (diffDays > 0)
|
|
18
|
-
return
|
|
20
|
+
return lang_1.lang.__('SHOW_TIME_DAYS_AGO', { count: String(diffDays) });
|
|
19
21
|
if (diffHours > 0)
|
|
20
|
-
return
|
|
22
|
+
return lang_1.lang.__('SHOW_TIME_HOURS_AGO', { count: String(diffHours) });
|
|
21
23
|
if (diffMins > 0)
|
|
22
|
-
return
|
|
23
|
-
return '
|
|
24
|
+
return lang_1.lang.__('SHOW_TIME_MINUTES_AGO', { count: String(diffMins) });
|
|
25
|
+
return lang_1.lang.__('SHOW_TIME_JUST_NOW');
|
|
24
26
|
};
|
|
25
27
|
const formatFunctionOutput = (logicalId, resource) => {
|
|
26
28
|
const lines = [];
|
|
@@ -173,7 +175,7 @@ const show = async (options) => {
|
|
|
173
175
|
const context = (0, common_1.getContext)();
|
|
174
176
|
const stage = options.stage ?? context.stage;
|
|
175
177
|
const baseDir = options.location ?? process.cwd();
|
|
176
|
-
logger_1.logger.info(
|
|
178
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_LOADING_STATE', { app: context.app, service: context.service, stage }));
|
|
177
179
|
let state;
|
|
178
180
|
let lockInfo;
|
|
179
181
|
let stateLocation;
|
|
@@ -184,7 +186,12 @@ const show = async (options) => {
|
|
|
184
186
|
!backendType;
|
|
185
187
|
if (shouldUseRemoteBackend) {
|
|
186
188
|
try {
|
|
187
|
-
|
|
189
|
+
// Read-only command: a migrated state only warns here.
|
|
190
|
+
const backend = (0, stateBackend_1.createStateBackend)(options.iac.backend, {
|
|
191
|
+
...context,
|
|
192
|
+
declaredOrg: options.iac.org,
|
|
193
|
+
migrationMarker: 'warn',
|
|
194
|
+
});
|
|
188
195
|
state = await backend.loadState(context.provider, context.app, context.service, stage);
|
|
189
196
|
lockInfo = await backend.readLock();
|
|
190
197
|
usingRemoteBackend = true;
|
|
@@ -195,12 +202,17 @@ const show = async (options) => {
|
|
|
195
202
|
}
|
|
196
203
|
catch (error) {
|
|
197
204
|
if (backendType === backend_1.StateBackendType.SAAS || !backendType) {
|
|
198
|
-
logger_1.logger.warn(
|
|
205
|
+
logger_1.logger.warn(lang_1.lang.__('SHOW_SAAS_BACKEND_FALLBACK', { error: String(error) }));
|
|
199
206
|
}
|
|
200
207
|
else {
|
|
201
|
-
logger_1.logger.warn(
|
|
208
|
+
logger_1.logger.warn(lang_1.lang.__('SHOW_REMOTE_BACKEND_FALLBACK', { error: String(error) }));
|
|
202
209
|
}
|
|
203
210
|
state = loadLocalState(context.provider, context.app, context.service, stage, baseDir);
|
|
211
|
+
// A local copy of a MIGRATED state is stale by definition — showing it
|
|
212
|
+
// after a remote failure would mislead the user (decision D-3/D-4).
|
|
213
|
+
if ((0, migrationMarker_1.isMigratedToSaas)(state)) {
|
|
214
|
+
throw new Error(lang_1.lang.__('MIGRATION_MARKER_REFUSED'), { cause: error });
|
|
215
|
+
}
|
|
204
216
|
lockInfo = readLocalLock(context.app, context.service, baseDir);
|
|
205
217
|
stateLocation = (0, common_1.getStatePath)(context.app, context.service, baseDir);
|
|
206
218
|
}
|
|
@@ -213,19 +225,19 @@ const show = async (options) => {
|
|
|
213
225
|
const resources = state.resources;
|
|
214
226
|
const resourceCount = Object.keys(resources).length;
|
|
215
227
|
if (resourceCount === 0) {
|
|
216
|
-
logger_1.logger.info(
|
|
228
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_NO_RESOURCES'));
|
|
217
229
|
logger_1.logger.info('');
|
|
218
|
-
logger_1.logger.info(
|
|
230
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_STATE_LOCATION', { stateLocation }));
|
|
219
231
|
if (usingRemoteBackend) {
|
|
220
|
-
logger_1.logger.info('
|
|
232
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_BACKEND_REMOTE'));
|
|
221
233
|
}
|
|
222
234
|
logger_1.logger.info('');
|
|
223
|
-
logger_1.logger.info('
|
|
235
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_DEPLOY_HINT'));
|
|
224
236
|
return;
|
|
225
237
|
}
|
|
226
238
|
logger_1.logger.info('');
|
|
227
239
|
logger_1.logger.info('═'.repeat(60));
|
|
228
|
-
logger_1.logger.info('
|
|
240
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_HEADER_DEPLOYED'));
|
|
229
241
|
logger_1.logger.info('═'.repeat(60));
|
|
230
242
|
const groupedResources = {};
|
|
231
243
|
for (const [logicalId, resource] of Object.entries(resources)) {
|
|
@@ -264,7 +276,7 @@ const show = async (options) => {
|
|
|
264
276
|
if (!resourcesInCategory || resourcesInCategory.length === 0)
|
|
265
277
|
continue;
|
|
266
278
|
logger_1.logger.info('');
|
|
267
|
-
logger_1.logger.info(
|
|
279
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_CATEGORY_HEADER', { label: categoryLabels[category] }));
|
|
268
280
|
logger_1.logger.info('─'.repeat(40));
|
|
269
281
|
for (const [logicalId, resource] of resourcesInCategory) {
|
|
270
282
|
const lines = formatResourceOutput(logicalId, resource);
|
|
@@ -275,14 +287,14 @@ const show = async (options) => {
|
|
|
275
287
|
}
|
|
276
288
|
logger_1.logger.info('');
|
|
277
289
|
logger_1.logger.info('═'.repeat(60));
|
|
278
|
-
logger_1.logger.info('
|
|
290
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_HEADER_SUMMARY'));
|
|
279
291
|
logger_1.logger.info('═'.repeat(60));
|
|
280
292
|
logger_1.logger.info('');
|
|
281
|
-
logger_1.logger.info(
|
|
282
|
-
logger_1.logger.info(
|
|
283
|
-
logger_1.logger.info(
|
|
284
|
-
logger_1.logger.info(
|
|
285
|
-
logger_1.logger.info(
|
|
293
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_PROVIDER', { value: state.provider }));
|
|
294
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_APP', { value: state.app }));
|
|
295
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_SERVICE', { value: state.service }));
|
|
296
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_STAGE', { value: stage }));
|
|
297
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_RESOURCES', { value: String(resourceCount) }));
|
|
286
298
|
if (Object.keys(resources).length > 0) {
|
|
287
299
|
const lastUpdated = Object.values(resources).reduce((latest, r) => {
|
|
288
300
|
if (!r.lastUpdated)
|
|
@@ -292,19 +304,19 @@ const show = async (options) => {
|
|
|
292
304
|
return r.lastUpdated > latest ? r.lastUpdated : latest;
|
|
293
305
|
}, undefined);
|
|
294
306
|
if (lastUpdated) {
|
|
295
|
-
logger_1.logger.info(
|
|
307
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_SUMMARY_LAST_UPDATED', { value: formatTimeAgo(lastUpdated) }));
|
|
296
308
|
}
|
|
297
309
|
}
|
|
298
310
|
logger_1.logger.info('');
|
|
299
|
-
logger_1.logger.info(
|
|
311
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_STATE_LOCATION', { stateLocation }));
|
|
300
312
|
if (usingRemoteBackend) {
|
|
301
|
-
logger_1.logger.info('
|
|
313
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_BACKEND_REMOTE'));
|
|
302
314
|
}
|
|
303
315
|
if (lockInfo) {
|
|
304
|
-
logger_1.logger.info(
|
|
316
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_LOCKED_BY', { user: lockInfo.user || 'unknown' }));
|
|
305
317
|
}
|
|
306
318
|
else {
|
|
307
|
-
logger_1.logger.info('
|
|
319
|
+
logger_1.logger.info(lang_1.lang.__('SHOW_UNLOCKED'));
|
|
308
320
|
}
|
|
309
321
|
};
|
|
310
322
|
exports.show = show;
|
|
@@ -103,7 +103,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
103
103
|
}
|
|
104
104
|
};
|
|
105
105
|
if (!shouldLoop) {
|
|
106
|
-
logger_1.logger.info('
|
|
106
|
+
logger_1.logger.info(lang_1.lang.__('APIGW_CHECKING_DNS_STATUS'));
|
|
107
107
|
return await checkPropagation();
|
|
108
108
|
}
|
|
109
109
|
logger_1.logger.info(lang_1.lang.__('APIGW_DNS_PROPAGATION_WAITING'));
|
|
@@ -371,7 +371,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
371
371
|
});
|
|
372
372
|
const response = await apigwClient.createApiGroup(request);
|
|
373
373
|
if (!response.body?.groupId) {
|
|
374
|
-
throw new Error('
|
|
374
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_CREATE_NO_ID'));
|
|
375
375
|
}
|
|
376
376
|
return response.body.groupId;
|
|
377
377
|
},
|
|
@@ -609,7 +609,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
609
609
|
});
|
|
610
610
|
const response = await apigwClient.createApi(request);
|
|
611
611
|
if (!response.body?.apiId) {
|
|
612
|
-
throw new Error('
|
|
612
|
+
throw new Error(lang_1.lang.__('APIGW_API_CREATE_NO_ID'));
|
|
613
613
|
}
|
|
614
614
|
return response.body.apiId;
|
|
615
615
|
},
|
|
@@ -976,7 +976,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
976
976
|
const groupSubdomain = groupInfo.body?.subDomain;
|
|
977
977
|
const groupId = groupInfo.body?.groupId || config.groupId;
|
|
978
978
|
if (!groupSubdomain) {
|
|
979
|
-
throw new Error(
|
|
979
|
+
throw new Error(lang_1.lang.__('APIGW_GROUP_NO_SUBDOMAIN', { groupName: config.groupId }));
|
|
980
980
|
}
|
|
981
981
|
if (!skipDns) {
|
|
982
982
|
logger_1.logger.info(lang_1.lang.__('APIGW_ENSURING_CNAME', { domain: config.domainName }));
|
|
@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.createEcsOperations = exports.parseSecurityGroupRule = exports.canonicalSecurityGroupRule = exports.securityGroupRangeMap = void 0;
|
|
37
37
|
const ecs = __importStar(require("@alicloud/ecs20140526"));
|
|
38
38
|
const logger_1 = require("../logger");
|
|
39
|
+
const lang_1 = require("../../lang");
|
|
39
40
|
exports.securityGroupRangeMap = {
|
|
40
41
|
TCP: '1/65535',
|
|
41
42
|
UDP: '1/65535',
|
|
@@ -61,13 +62,13 @@ exports.canonicalSecurityGroupRule = canonicalSecurityGroupRule;
|
|
|
61
62
|
/* istanbul ignore next */ const parseSecurityGroupRule = (rule) => {
|
|
62
63
|
const [rawProtocol, second, third, ...rest] = rule.split(':');
|
|
63
64
|
if (rest.length > 0 || !rawProtocol || !second || !third) {
|
|
64
|
-
throw new Error(
|
|
65
|
+
throw new Error(lang_1.lang.__('SG_INVALID_RULE_FORMAT', { rule }));
|
|
65
66
|
}
|
|
66
67
|
const protocol = normalizeProtocol(rawProtocol);
|
|
67
68
|
const secondTrimmed = second.trim();
|
|
68
69
|
const thirdTrimmed = third.trim();
|
|
69
70
|
if (!secondTrimmed || !thirdTrimmed) {
|
|
70
|
-
throw new Error(
|
|
71
|
+
throw new Error(lang_1.lang.__('SG_INVALID_RULE_FORMAT', { rule }));
|
|
71
72
|
}
|
|
72
73
|
return { protocol, cidr: secondTrimmed, portRange: thirdTrimmed };
|
|
73
74
|
};
|
|
@@ -98,7 +99,7 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
98
99
|
const response = await ecsClient.createSecurityGroup(createRequest);
|
|
99
100
|
const securityGroupId = response.body?.securityGroupId;
|
|
100
101
|
if (!securityGroupId) {
|
|
101
|
-
throw new Error('
|
|
102
|
+
throw new Error(lang_1.lang.__('SG_CREATE_FAILED'));
|
|
102
103
|
}
|
|
103
104
|
// Add ingress rules
|
|
104
105
|
for (const rule of ingressRules) {
|
|
@@ -107,7 +108,7 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
107
108
|
parsedRule = (0, exports.parseSecurityGroupRule)(rule);
|
|
108
109
|
}
|
|
109
110
|
catch (error) {
|
|
110
|
-
logger_1.logger.warn(
|
|
111
|
+
logger_1.logger.warn(lang_1.lang.__('SG_SKIP_INVALID_INGRESS', { rule, error: String(error) }));
|
|
111
112
|
continue;
|
|
112
113
|
}
|
|
113
114
|
const ingressRequest = new ecs.AuthorizeSecurityGroupRequest({
|
|
@@ -122,10 +123,10 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
122
123
|
}
|
|
123
124
|
catch (error) {
|
|
124
125
|
if (isDuplicateSecurityGroupRuleError(error)) {
|
|
125
|
-
logger_1.logger.debug(
|
|
126
|
+
logger_1.logger.debug(lang_1.lang.__('SG_INGRESS_ALREADY_EXISTS', { rule }));
|
|
126
127
|
continue;
|
|
127
128
|
}
|
|
128
|
-
logger_1.logger.warn(
|
|
129
|
+
logger_1.logger.warn(lang_1.lang.__('SG_ADD_INGRESS_FAILED', { rule, error: String(error) }));
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
// Add egress rules
|
|
@@ -135,7 +136,7 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
135
136
|
parsedRule = (0, exports.parseSecurityGroupRule)(rule);
|
|
136
137
|
}
|
|
137
138
|
catch (error) {
|
|
138
|
-
logger_1.logger.warn(
|
|
139
|
+
logger_1.logger.warn(lang_1.lang.__('SG_SKIP_INVALID_EGRESS', { rule, error: String(error) }));
|
|
139
140
|
continue;
|
|
140
141
|
}
|
|
141
142
|
const egressRequest = new ecs.AuthorizeSecurityGroupEgressRequest({
|
|
@@ -150,10 +151,10 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
150
151
|
}
|
|
151
152
|
catch (error) {
|
|
152
153
|
if (isDuplicateSecurityGroupRuleError(error)) {
|
|
153
|
-
logger_1.logger.debug(
|
|
154
|
+
logger_1.logger.debug(lang_1.lang.__('SG_EGRESS_ALREADY_EXISTS', { rule }));
|
|
154
155
|
continue;
|
|
155
156
|
}
|
|
156
|
-
logger_1.logger.warn(
|
|
157
|
+
logger_1.logger.warn(lang_1.lang.__('SG_ADD_EGRESS_FAILED', { rule, error: String(error) }));
|
|
157
158
|
}
|
|
158
159
|
}
|
|
159
160
|
const sg = await operations.getSecurityGroup(securityGroupId);
|
|
@@ -195,7 +196,11 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
195
196
|
if (isDuplicateSecurityGroupRuleError(error)) {
|
|
196
197
|
continue;
|
|
197
198
|
}
|
|
198
|
-
logger_1.logger.warn(
|
|
199
|
+
logger_1.logger.warn(lang_1.lang.__('SG_AUTHORIZE_RULE_FAILED', {
|
|
200
|
+
ruleType: direction,
|
|
201
|
+
target: securityGroupId,
|
|
202
|
+
error: String(error),
|
|
203
|
+
}));
|
|
199
204
|
}
|
|
200
205
|
}
|
|
201
206
|
},
|
|
@@ -224,7 +229,11 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
224
229
|
}
|
|
225
230
|
}
|
|
226
231
|
catch (error) {
|
|
227
|
-
logger_1.logger.warn(
|
|
232
|
+
logger_1.logger.warn(lang_1.lang.__('SG_REVOKE_RULE_FAILED', {
|
|
233
|
+
ruleType: direction,
|
|
234
|
+
target: securityGroupId,
|
|
235
|
+
error: String(error),
|
|
236
|
+
}));
|
|
228
237
|
}
|
|
229
238
|
}
|
|
230
239
|
},
|
|
@@ -254,7 +263,7 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
254
263
|
}
|
|
255
264
|
}
|
|
256
265
|
catch (error) {
|
|
257
|
-
logger_1.logger.debug(
|
|
266
|
+
logger_1.logger.debug(lang_1.lang.__('SG_GET_INGRESS_FAILED', { error: String(error) }));
|
|
258
267
|
}
|
|
259
268
|
try {
|
|
260
269
|
const request = new ecs.DescribeSecurityGroupAttributeRequest({
|
|
@@ -279,7 +288,7 @@ const isDuplicateSecurityGroupRuleError = (error) => {
|
|
|
279
288
|
}
|
|
280
289
|
}
|
|
281
290
|
catch (error) {
|
|
282
|
-
logger_1.logger.debug(
|
|
291
|
+
logger_1.logger.debug(lang_1.lang.__('SG_GET_EGRESS_FAILED', { error: String(error) }));
|
|
283
292
|
}
|
|
284
293
|
return { ingressRules, egressRules };
|
|
285
294
|
},
|
|
@@ -41,6 +41,7 @@ const fc = __importStar(require("@alicloud/fc20230330"));
|
|
|
41
41
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
42
42
|
const polling_1 = require("../polling");
|
|
43
43
|
const constants_1 = require("../constants");
|
|
44
|
+
const lang_1 = require("../../lang");
|
|
44
45
|
const buildCodeLocation = (codePath, ossCode) => {
|
|
45
46
|
if (ossCode) {
|
|
46
47
|
return new fc.InputCodeLocation({
|
|
@@ -48,6 +49,11 @@ const buildCodeLocation = (codePath, ossCode) => {
|
|
|
48
49
|
ossObjectName: ossCode.ossObjectName,
|
|
49
50
|
});
|
|
50
51
|
}
|
|
52
|
+
if (!codePath) {
|
|
53
|
+
// Container-only functions take no zip — the image lives in
|
|
54
|
+
// customContainerConfig; FC 3.0 rejects a code payload for them.
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
51
57
|
const codeBuffer = node_fs_1.default.readFileSync(codePath);
|
|
52
58
|
const codeBase64 = codeBuffer.toString('base64');
|
|
53
59
|
return new fc.InputCodeLocation({ zipFile: codeBase64 });
|
|
@@ -61,7 +67,10 @@ const buildCodeLocation = (codePath, ossCode) => {
|
|
|
61
67
|
fetch: () => operations.getFunction(functionName),
|
|
62
68
|
isDone: (info) => {
|
|
63
69
|
if (info?.state === 'Failed') {
|
|
64
|
-
throw new Error(
|
|
70
|
+
throw new Error(lang_1.lang.__('FC3_FUNCTION_FAILED_STATE', {
|
|
71
|
+
functionName,
|
|
72
|
+
reason: info.stateReason ?? 'unknown',
|
|
73
|
+
}));
|
|
65
74
|
}
|
|
66
75
|
// Built-in runtimes (zip code) never reach Active (issue #219):
|
|
67
76
|
// they hold Pending while a create/update transition is in flight
|
|
@@ -78,7 +87,7 @@ const buildCodeLocation = (codePath, ossCode) => {
|
|
|
78
87
|
}
|
|
79
88
|
catch (e) {
|
|
80
89
|
if (e instanceof polling_1.PollingTimeoutError) {
|
|
81
|
-
throw new Error(
|
|
90
|
+
throw new Error(lang_1.lang.__('FC3_TIMEOUT_ACTIVE', { functionName }), {
|
|
82
91
|
cause: e,
|
|
83
92
|
});
|
|
84
93
|
}
|
|
@@ -97,7 +106,7 @@ const buildCodeLocation = (codePath, ossCode) => {
|
|
|
97
106
|
}
|
|
98
107
|
catch (e) {
|
|
99
108
|
if (e instanceof polling_1.PollingTimeoutError) {
|
|
100
|
-
throw new Error(
|
|
109
|
+
throw new Error(lang_1.lang.__('FC3_TIMEOUT_DELETED', { functionName }), {
|
|
101
110
|
cause: e,
|
|
102
111
|
});
|
|
103
112
|
}
|
|
@@ -37,6 +37,7 @@ exports.createNasOperations = void 0;
|
|
|
37
37
|
const logger_1 = require("../logger");
|
|
38
38
|
const nas = __importStar(require("@alicloud/nas20170626"));
|
|
39
39
|
const types_1 = require("../../types");
|
|
40
|
+
const lang_1 = require("../../lang");
|
|
40
41
|
const storageClassMap = {
|
|
41
42
|
[types_1.NasStorageClassEnum.STANDARD_CAPACITY]: { fileSystemType: 'standard', storageType: 'Capacity' },
|
|
42
43
|
[types_1.NasStorageClassEnum.STANDARD_PERFORMANCE]: {
|
|
@@ -117,7 +118,7 @@ const createNasOperations = (nasClient) => {
|
|
|
117
118
|
const response = await nasClient.createFileSystem(request);
|
|
118
119
|
const fileSystemId = response.body?.fileSystemId;
|
|
119
120
|
if (!fileSystemId) {
|
|
120
|
-
throw new Error('
|
|
121
|
+
throw new Error(lang_1.lang.__('NAS_CREATE_FS_FAILED'));
|
|
121
122
|
}
|
|
122
123
|
// Wait for file system to be ready
|
|
123
124
|
let retries = 0;
|
|
@@ -185,7 +186,7 @@ const createNasOperations = (nasClient) => {
|
|
|
185
186
|
const response = await nasClient.createMountTarget(request);
|
|
186
187
|
const mountTargetDomain = response.body?.mountTargetDomain;
|
|
187
188
|
if (!mountTargetDomain) {
|
|
188
|
-
throw new Error('
|
|
189
|
+
throw new Error(lang_1.lang.__('NAS_CREATE_MOUNT_TARGET_FAILED'));
|
|
189
190
|
}
|
|
190
191
|
// Wait for mount target to be ready
|
|
191
192
|
let retries = 0;
|
|
@@ -221,7 +222,7 @@ const createNasOperations = (nasClient) => {
|
|
|
221
222
|
}));
|
|
222
223
|
}
|
|
223
224
|
catch (error) {
|
|
224
|
-
logger_1.logger.debug(
|
|
225
|
+
logger_1.logger.debug(lang_1.lang.__('NAS_LIST_MOUNT_TARGETS_FAILED', { error: String(error) }));
|
|
225
226
|
return [];
|
|
226
227
|
}
|
|
227
228
|
},
|
|
@@ -126,6 +126,41 @@ const parseReplicationRules = (xml) => {
|
|
|
126
126
|
expireTime: parsed.expireTime || '',
|
|
127
127
|
};
|
|
128
128
|
};
|
|
129
|
+
// ListCname (GET /?cname) → the CNAME entries bound to THIS bucket with their
|
|
130
|
+
// certificate info. Used to verify desired state after a 409 CnameAlreadyExists,
|
|
131
|
+
// since that error only means "bound elsewhere or image-processing domain"
|
|
132
|
+
// per the PutCname docs — it never guarantees the bind landed on this bucket.
|
|
133
|
+
const listBucketCnames = async (bucketName) => {
|
|
134
|
+
useBucket(bucketName);
|
|
135
|
+
const response = await ossRequest(ossClient, {
|
|
136
|
+
method: 'GET',
|
|
137
|
+
bucket: bucketName,
|
|
138
|
+
subres: { cname: '' },
|
|
139
|
+
successStatuses: [200],
|
|
140
|
+
});
|
|
141
|
+
const xml = response.data || '';
|
|
142
|
+
const entries = [];
|
|
143
|
+
const cnameRegex = /<Cname>([\s\S]*?)<\/Cname>/g;
|
|
144
|
+
let match;
|
|
145
|
+
while ((match = cnameRegex.exec(xml)) !== null) {
|
|
146
|
+
const cnameXml = match[1];
|
|
147
|
+
const read = (tag) => {
|
|
148
|
+
const m = new RegExp(`<${tag}>([\\s\\S]*?)<\\/${tag}>`).exec(cnameXml);
|
|
149
|
+
return m ? m[1].trim() : undefined;
|
|
150
|
+
};
|
|
151
|
+
const hasCertificate = /<Certificate>[\s\S]*?<\/Certificate>/.test(cnameXml);
|
|
152
|
+
entries.push({
|
|
153
|
+
domain: read('Domain') ?? '',
|
|
154
|
+
status: read('Status') ?? '',
|
|
155
|
+
certBound: hasCertificate,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
return entries;
|
|
159
|
+
};
|
|
160
|
+
const verifyCnameBoundToBucket = async (bucketName, domain) => {
|
|
161
|
+
const entries = await listBucketCnames(bucketName);
|
|
162
|
+
return entries.some((entry) => entry.domain === domain && (entry.status === 'Enabled' || entry.status === ''));
|
|
163
|
+
};
|
|
129
164
|
const putBucketCname = async (bucketName, domain, certificate) => {
|
|
130
165
|
useBucket(bucketName);
|
|
131
166
|
const certXml = buildCertificateXml(certificate);
|
|
@@ -149,24 +184,33 @@ const parseReplicationRules = (xml) => {
|
|
|
149
184
|
};
|
|
150
185
|
await ossClient.request(params);
|
|
151
186
|
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CNAME_BOUND', { domain }));
|
|
152
|
-
return { success: true, needVerification: false };
|
|
187
|
+
return { success: true, needVerification: false, certBound: Boolean(certificate) };
|
|
153
188
|
}
|
|
154
189
|
catch (error) {
|
|
155
190
|
const err = error;
|
|
156
191
|
if (err.code === 'CnameAlreadyExists' || err.status === 409) {
|
|
157
|
-
|
|
158
|
-
|
|
192
|
+
// Per the PutCname docs, 409 CnameAlreadyExists fires when the domain is
|
|
193
|
+
// bound to ANOTHER bucket (or is an image-processing domain) — a rebind
|
|
194
|
+
// to the same bucket is idempotent 200. So never trust the 409 alone:
|
|
195
|
+
// cross-check via ListCname whether the domain is actually bound here.
|
|
196
|
+
const boundToThisBucket = await verifyCnameBoundToBucket(bucketName, domain);
|
|
197
|
+
if (boundToThisBucket) {
|
|
198
|
+
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CNAME_EXISTS', { domain }));
|
|
199
|
+
return { success: true, needVerification: false, certBound: false };
|
|
200
|
+
}
|
|
201
|
+
// eslint-disable-next-line preserve-caught-error
|
|
202
|
+
throw new Error(lang_1.lang.__('OSS_BUCKET_CNAME_CONFLICT', { domain, bucketName, error: String(error) }));
|
|
159
203
|
}
|
|
160
204
|
if (err.code === 'NeedVerifyDomainOwnership') {
|
|
161
205
|
logger_1.logger.warn(lang_1.lang.__('OSS_BUCKET_CNAME_NEED_VERIFY', { domain }));
|
|
162
|
-
return { success: false, needVerification: true };
|
|
206
|
+
return { success: false, needVerification: true, certBound: false };
|
|
163
207
|
}
|
|
164
208
|
if (certificate) {
|
|
165
209
|
// eslint-disable-next-line preserve-caught-error
|
|
166
210
|
throw new Error(lang_1.lang.__('OSS_BUCKET_CNAME_BIND_FAILED', { error: String(error) }));
|
|
167
211
|
}
|
|
168
212
|
logger_1.logger.warn(lang_1.lang.__('OSS_BUCKET_CNAME_BIND_FAILED', { error: String(error) }));
|
|
169
|
-
return { success: false, needVerification: false };
|
|
213
|
+
return { success: false, needVerification: false, certBound: false };
|
|
170
214
|
}
|
|
171
215
|
};
|
|
172
216
|
const deleteBucketCname = async (bucketName, domain) => {
|
|
@@ -276,7 +320,7 @@ const parseReplicationRules = (xml) => {
|
|
|
276
320
|
txtRecordId = verificationResult.txtRecordId;
|
|
277
321
|
}
|
|
278
322
|
const bucketCnameBound = cnameResult.success;
|
|
279
|
-
if (certificate &&
|
|
323
|
+
if (certificate && cnameResult.certBound) {
|
|
280
324
|
logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BOUND', { domain: normalizedDomain }));
|
|
281
325
|
}
|
|
282
326
|
await addCorsRuleForDomain(bucketName, normalizedDomain);
|
|
@@ -429,7 +473,7 @@ const parseReplicationRules = (xml) => {
|
|
|
429
473
|
domain,
|
|
430
474
|
txtRecord: `${fullTxtRecord}.${(0, domainUtils_1.extractMainDomain)(domain)}`,
|
|
431
475
|
}));
|
|
432
|
-
return { success: false, needVerification: true };
|
|
476
|
+
return { success: false, needVerification: true, certBound: false };
|
|
433
477
|
};
|
|
434
478
|
const createOrFindDnsCnameRecord = async (domain, mainDomain, hostRecord, ossEndpoint, bucketCnameBound) => {
|
|
435
479
|
try {
|
|
@@ -456,7 +500,7 @@ const parseReplicationRules = (xml) => {
|
|
|
456
500
|
}
|
|
457
501
|
catch (error) {
|
|
458
502
|
logger_1.logger.warn(lang_1.lang.__('OSS_DNS_DOMAIN_NOT_MANAGED', { domain, cname: ossEndpoint }));
|
|
459
|
-
logger_1.logger.debug(
|
|
503
|
+
logger_1.logger.debug(lang_1.lang.__('DNS_OPERATION_ERROR', { error: String(error) }));
|
|
460
504
|
return { domain, cname: ossEndpoint, bucketCnameBound };
|
|
461
505
|
}
|
|
462
506
|
};
|
|
@@ -37,6 +37,7 @@ exports.createSlsOperations = exports.SLS_LOGSTORE_SHARDS = exports.SLS_LOGSTORE
|
|
|
37
37
|
const sls = __importStar(require("@alicloud/sls20201230"));
|
|
38
38
|
const logger_1 = require("../logger");
|
|
39
39
|
const polling_1 = require("../polling");
|
|
40
|
+
const lang_1 = require("../../lang");
|
|
40
41
|
// The logstore attributes si creates with (issue #234 M1): `fn.log` is a
|
|
41
42
|
// boolean — these are stack constants, so live values differing from them are
|
|
42
43
|
// out-of-band drift.
|
|
@@ -60,7 +61,7 @@ const waitForSlsProject = async (getProject, projectName) => {
|
|
|
60
61
|
maxAttempts: 30,
|
|
61
62
|
onProgress: (project) => {
|
|
62
63
|
if (project) {
|
|
63
|
-
logger_1.logger.info(
|
|
64
|
+
logger_1.logger.info(lang_1.lang.__('SLS_WAITING_PROJECT', { projectName, status: project.status ?? 'unknown' }));
|
|
64
65
|
}
|
|
65
66
|
},
|
|
66
67
|
});
|
|
@@ -91,7 +92,7 @@ const waitForSlsLogstore = async (getLogstore, projectName, logstoreName, ttl) =
|
|
|
91
92
|
maxAttempts: 30,
|
|
92
93
|
onProgress: (logstore) => {
|
|
93
94
|
if (logstore) {
|
|
94
|
-
logger_1.logger.info(
|
|
95
|
+
logger_1.logger.info(lang_1.lang.__('SLS_WAITING_LOGSTORE', { projectName, logstoreName }));
|
|
95
96
|
}
|
|
96
97
|
},
|
|
97
98
|
});
|
|
@@ -7,6 +7,7 @@ exports.createTablestoreOperations = exports.TableStoreInstanceStatus = void 0;
|
|
|
7
7
|
const tablestore_1 = __importDefault(require("tablestore"));
|
|
8
8
|
const logger_1 = require("../logger");
|
|
9
9
|
const polling_1 = require("../polling");
|
|
10
|
+
const lang_1 = require("../../lang");
|
|
10
11
|
var TableStoreInstanceStatus;
|
|
11
12
|
(function (TableStoreInstanceStatus) {
|
|
12
13
|
TableStoreInstanceStatus["RUNNING"] = "RUNNING";
|
|
@@ -24,15 +25,19 @@ const waitForTableReady = async (describeTable, tableName) => {
|
|
|
24
25
|
maxAttempts: 60,
|
|
25
26
|
onProgress: (table, attempt, maxAttempts) => {
|
|
26
27
|
if (!table) {
|
|
27
|
-
logger_1.logger.info(
|
|
28
|
+
logger_1.logger.info(lang_1.lang.__('OTS_WAITING_TABLE', {
|
|
29
|
+
tableName,
|
|
30
|
+
attempt: String(attempt),
|
|
31
|
+
maxAttempts: String(maxAttempts),
|
|
32
|
+
}));
|
|
28
33
|
}
|
|
29
34
|
},
|
|
30
35
|
});
|
|
31
|
-
logger_1.logger.info(
|
|
36
|
+
logger_1.logger.info(lang_1.lang.__('OTS_TABLE_READY', { tableName }));
|
|
32
37
|
}
|
|
33
38
|
catch (e) {
|
|
34
39
|
if (e instanceof polling_1.PollingTimeoutError) {
|
|
35
|
-
throw new Error(
|
|
40
|
+
throw new Error(lang_1.lang.__('OTS_TABLE_TIMEOUT', { tableName }), { cause: e });
|
|
36
41
|
}
|
|
37
42
|
throw e;
|
|
38
43
|
}
|
|
@@ -69,11 +74,14 @@ const createTablestoreOperations = (endpoint, instanceName, context) => {
|
|
|
69
74
|
return new Promise((resolve, reject) => {
|
|
70
75
|
client.createTable(params, (err) => {
|
|
71
76
|
if (err) {
|
|
72
|
-
logger_1.logger.error(
|
|
77
|
+
logger_1.logger.error(lang_1.lang.__('OTS_CREATE_TABLE_FAILED', {
|
|
78
|
+
tableName: config.tableName,
|
|
79
|
+
error: err.message,
|
|
80
|
+
}));
|
|
73
81
|
reject(err);
|
|
74
82
|
}
|
|
75
83
|
else {
|
|
76
|
-
logger_1.logger.info(
|
|
84
|
+
logger_1.logger.info(lang_1.lang.__('OTS_TABLE_CREATED', { tableName: config.tableName }));
|
|
77
85
|
resolve();
|
|
78
86
|
}
|
|
79
87
|
});
|
|
@@ -92,7 +100,7 @@ const createTablestoreOperations = (endpoint, instanceName, context) => {
|
|
|
92
100
|
resolve(null);
|
|
93
101
|
}
|
|
94
102
|
else {
|
|
95
|
-
logger_1.logger.error(
|
|
103
|
+
logger_1.logger.error(lang_1.lang.__('OTS_DESCRIBE_TABLE_FAILED', { tableName, error: errorMessage }));
|
|
96
104
|
reject(err);
|
|
97
105
|
}
|
|
98
106
|
}
|
|
@@ -133,11 +141,14 @@ const createTablestoreOperations = (endpoint, instanceName, context) => {
|
|
|
133
141
|
return new Promise((resolve, reject) => {
|
|
134
142
|
client.updateTable(params, (err) => {
|
|
135
143
|
if (err) {
|
|
136
|
-
logger_1.logger.error(
|
|
144
|
+
logger_1.logger.error(lang_1.lang.__('OTS_UPDATE_TABLE_FAILED', {
|
|
145
|
+
tableName: config.tableName,
|
|
146
|
+
error: err.message,
|
|
147
|
+
}));
|
|
137
148
|
reject(err);
|
|
138
149
|
}
|
|
139
150
|
else {
|
|
140
|
-
logger_1.logger.info(
|
|
151
|
+
logger_1.logger.info(lang_1.lang.__('OTS_TABLE_UPDATED', { tableName: config.tableName }));
|
|
141
152
|
resolve();
|
|
142
153
|
}
|
|
143
154
|
});
|
|
@@ -154,16 +165,16 @@ const createTablestoreOperations = (endpoint, instanceName, context) => {
|
|
|
154
165
|
// If table doesn't exist, consider deletion successful
|
|
155
166
|
if (errorMessage.includes('OTSObjectNotExist') ||
|
|
156
167
|
errorMessage.includes('does not exist')) {
|
|
157
|
-
logger_1.logger.info(
|
|
168
|
+
logger_1.logger.info(lang_1.lang.__('OTS_TABLE_ALREADY_DELETED', { tableName }));
|
|
158
169
|
resolve();
|
|
159
170
|
}
|
|
160
171
|
else {
|
|
161
|
-
logger_1.logger.error(
|
|
172
|
+
logger_1.logger.error(lang_1.lang.__('OTS_DELETE_TABLE_FAILED', { tableName, error: errorMessage }));
|
|
162
173
|
reject(err);
|
|
163
174
|
}
|
|
164
175
|
}
|
|
165
176
|
else {
|
|
166
|
-
logger_1.logger.info(
|
|
177
|
+
logger_1.logger.info(lang_1.lang.__('OTS_TABLE_DELETED', { tableName }));
|
|
167
178
|
resolve();
|
|
168
179
|
}
|
|
169
180
|
});
|