@geek-fun/serverlessinsight 0.9.0 → 0.9.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/.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 +3 -3
- 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-poc-timer-app-insight-poc-timer.json.backup +109 -0
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +3 -3
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +2 -2
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/CHANGELOG.md +17 -0
- package/README.md +78 -2
- package/README.zh-CN.md +69 -2
- package/codecov +0 -0
- package/codecov.SHA256SUM +1 -0
- package/codecov.SHA256SUM.sig +16 -0
- package/dist/package.json +2 -2
- package/dist/src/commands/deploy.js +9 -3
- package/dist/src/commands/destroy.js +8 -2
- package/dist/src/commands/forceUnlock.js +5 -5
- package/dist/src/commands/index.js +173 -85
- package/dist/src/commands/login.js +12 -1
- package/dist/src/commands/migrate.js +287 -0
- package/dist/src/commands/plan.js +28 -2
- package/dist/src/commands/schema.js +24 -0
- package/dist/src/commands/show.js +99 -33
- package/dist/src/commands/validate.js +34 -2
- 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 +39 -4
- 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/constants.js +7 -1
- package/dist/src/common/context.js +5 -4
- package/dist/src/common/jsonOutput.js +77 -0
- package/dist/src/common/lockManager.js +1 -1
- package/dist/src/common/logger.js +6 -3
- package/dist/src/common/migrationMarker.js +34 -0
- package/dist/src/common/noColor.js +9 -0
- package/dist/src/common/planFormatter.js +12 -6
- package/dist/src/common/runtimeMapper.js +7 -3
- package/dist/src/common/siCron.js +415 -0
- 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 +88 -9
- package/dist/src/common/stateManager.js +56 -5
- package/dist/src/common/tencentClient/cosOperations.js +1 -1
- package/dist/src/common/tencentClient/scfOperations.js +4 -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 +48 -3
- package/dist/src/lang/en.js +254 -1
- package/dist/src/lang/index.js +36 -1
- package/dist/src/lang/zh-CN.js +253 -1
- package/dist/src/parser/functionParser.js +47 -1
- package/dist/src/parser/index.js +1 -1
- package/dist/src/stack/aliyunStack/apigwExecutor.js +2 -2
- 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 +2 -2
- package/dist/src/stack/aliyunStack/databaseResource.js +18 -10
- 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 +26 -0
- package/dist/src/stack/aliyunStack/fc3Resource.js +190 -13
- package/dist/src/stack/aliyunStack/ossExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/ossResource.js +5 -1
- package/dist/src/stack/aliyunStack/rdsTypes.js +5 -1
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/tablestoreResource.js +3 -3
- package/dist/src/stack/aliyunStack/tablestoreTypes.js +3 -2
- package/dist/src/stack/deploy.js +2 -3
- package/dist/src/stack/localStack/event.js +2 -13
- package/dist/src/stack/localStack/function.js +2 -13
- package/dist/src/stack/localStack/functionRunner.js +5 -4
- package/dist/src/stack/localStack/index.js +8 -1
- package/dist/src/stack/localStack/timer.js +162 -0
- package/dist/src/stack/localStack/utils.js +19 -1
- package/dist/src/stack/scfStack/cosExecutor.js +2 -2
- package/dist/src/stack/scfStack/cosResource.js +2 -2
- package/dist/src/stack/scfStack/esServerlessExecutor.js +5 -5
- package/dist/src/stack/scfStack/esServerlessResource.js +7 -3
- 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 +52 -18
- package/dist/src/stack/scfStack/scfResource.js +202 -12
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +5 -5
- package/dist/src/stack/scfStack/tdsqlcResource.js +7 -3
- package/dist/src/stack/volcengineStack/apigwExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/apigwResource.js +7 -4
- package/dist/src/stack/volcengineStack/tosExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/tosResource.js +1 -1
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +49 -0
- package/dist/src/stack/volcengineStack/vefaasResource.js +221 -4
- package/dist/src/validator/functionSchema.js +25 -2
- package/dist/src/validator/iacSchema.js +2 -1
- package/dist/src/validator/index.js +4 -1
- package/dist/src/validator/rootSchema.js +77 -19
- package/dist/src/validator/schemaExport.js +60 -0
- package/dist/src/validator/semanticValidation.js +79 -0
- package/dist/src/validator/templateRefSchema.js +9 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/samples/aliyun-poc-timer.yml +39 -0
|
@@ -148,7 +148,7 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
148
148
|
"RDS_MSSQL_SERVERLESS" /* DatabaseEnum.RDS_MSSQL_SERVERLESS */,
|
|
149
149
|
].includes(database.type);
|
|
150
150
|
if (!isEs && !isRds) {
|
|
151
|
-
throw new Error(
|
|
151
|
+
throw new Error(lang_1.lang.__('DATABASE_TYPE_UNSUPPORTED', { type: database.type }));
|
|
152
152
|
}
|
|
153
153
|
const resourceType = isEs ? 'ALIYUN_ES_SERVERLESS' : 'ALIYUN_RDS_SERVERLESS';
|
|
154
154
|
const definition = isEs
|
|
@@ -181,7 +181,11 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
181
181
|
const probe = await client.es.getApp(config.appName);
|
|
182
182
|
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTagShape(probe.tags))) {
|
|
183
183
|
instanceId = probe.appId ?? config.appName;
|
|
184
|
-
logger_1.logger.info(
|
|
184
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
185
|
+
resourceType: 'ES app',
|
|
186
|
+
name: config.appName,
|
|
187
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
188
|
+
}));
|
|
185
189
|
}
|
|
186
190
|
else {
|
|
187
191
|
throw new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
@@ -198,7 +202,7 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
198
202
|
// Refresh state from provider to get all attributes
|
|
199
203
|
const appInfo = await client.es.getApp(instanceId);
|
|
200
204
|
if (!appInfo) {
|
|
201
|
-
throw new Error(
|
|
205
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_ES_APP', { appId: instanceId }));
|
|
202
206
|
}
|
|
203
207
|
const sid = (0, common_1.buildSid)('aliyun', 'es', context.stage, instanceId);
|
|
204
208
|
instance = buildEsInstanceFromProvider(appInfo, sid);
|
|
@@ -215,7 +219,11 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
215
219
|
if (probe?.dbInstanceId &&
|
|
216
220
|
(0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTagShape(probe.tags))) {
|
|
217
221
|
instanceId = probe.dbInstanceId;
|
|
218
|
-
logger_1.logger.info(
|
|
222
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
223
|
+
resourceType: 'RDS instance',
|
|
224
|
+
name: config.dbInstanceDescription,
|
|
225
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
226
|
+
}));
|
|
219
227
|
}
|
|
220
228
|
else {
|
|
221
229
|
throw new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
@@ -232,7 +240,7 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
232
240
|
// Refresh state from provider to get all attributes
|
|
233
241
|
const rdsInfo = await client.rds.getInstance(instanceId);
|
|
234
242
|
if (!rdsInfo) {
|
|
235
|
-
throw new Error(
|
|
243
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_RDS_INSTANCE', { instanceId }));
|
|
236
244
|
}
|
|
237
245
|
const sid = (0, common_1.buildSid)('aliyun', 'rds', context.stage, instanceId);
|
|
238
246
|
instance = buildRdsInstanceFromProvider(rdsInfo, sid);
|
|
@@ -265,7 +273,7 @@ const readDatabaseResource = async (context, instanceId, resourceType) => {
|
|
|
265
273
|
else if (resourceType === 'ALIYUN_RDS_SERVERLESS') {
|
|
266
274
|
return await client.rds.getInstance(instanceId);
|
|
267
275
|
}
|
|
268
|
-
throw new Error(
|
|
276
|
+
throw new Error(lang_1.lang.__('RESOURCE_TYPE_UNSUPPORTED', { type: resourceType }));
|
|
269
277
|
};
|
|
270
278
|
exports.readDatabaseResource = readDatabaseResource;
|
|
271
279
|
const updateDatabaseResource = async (context, database, instanceId, resourceType, state) => {
|
|
@@ -278,7 +286,7 @@ const updateDatabaseResource = async (context, database, instanceId, resourceTyp
|
|
|
278
286
|
// Refresh state from provider to get all attributes
|
|
279
287
|
const appInfo = await client.es.getApp(instanceId);
|
|
280
288
|
if (!appInfo) {
|
|
281
|
-
throw new Error(
|
|
289
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_ES_APP', { appId: instanceId }));
|
|
282
290
|
}
|
|
283
291
|
definition = (0, esServerlessTypes_1.extractEsDefinition)(config);
|
|
284
292
|
const sid = (0, common_1.buildSid)('aliyun', 'es', context.stage, instanceId);
|
|
@@ -290,14 +298,14 @@ const updateDatabaseResource = async (context, database, instanceId, resourceTyp
|
|
|
290
298
|
// Refresh state from provider to get all attributes
|
|
291
299
|
const rdsInfo = await client.rds.getInstance(instanceId);
|
|
292
300
|
if (!rdsInfo) {
|
|
293
|
-
throw new Error(
|
|
301
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_RDS_INSTANCE', { instanceId }));
|
|
294
302
|
}
|
|
295
303
|
definition = (0, rdsTypes_1.extractRdsDefinition)(config);
|
|
296
304
|
const sid = (0, common_1.buildSid)('aliyun', 'rds', context.stage, instanceId);
|
|
297
305
|
instance = buildRdsInstanceFromProvider(rdsInfo, sid);
|
|
298
306
|
}
|
|
299
307
|
else {
|
|
300
|
-
throw new Error(
|
|
308
|
+
throw new Error(lang_1.lang.__('RESOURCE_TYPE_UNSUPPORTED', { type: resourceType }));
|
|
301
309
|
}
|
|
302
310
|
const resourceState = {
|
|
303
311
|
mode: 'managed',
|
|
@@ -326,7 +334,7 @@ const deleteDatabaseResource = async (context, instanceId, resourceType, logical
|
|
|
326
334
|
await client.rds.deleteInstance(instanceId);
|
|
327
335
|
}
|
|
328
336
|
else {
|
|
329
|
-
throw new Error(
|
|
337
|
+
throw new Error(lang_1.lang.__('RESOURCE_TYPE_UNSUPPORTED', { type: resourceType }));
|
|
330
338
|
}
|
|
331
339
|
}
|
|
332
340
|
catch (err) {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cloudEsToDefinition = exports.extractEsDefinition = exports.databaseToEsConfig = void 0;
|
|
4
|
+
const lang_1 = require("../../lang");
|
|
4
5
|
// Map database versions to ES versions
|
|
5
6
|
const esVersionMap = new Map([
|
|
6
7
|
[
|
|
@@ -23,7 +24,7 @@ const esVersionMap = new Map([
|
|
|
23
24
|
const databaseToEsConfig = (database) => {
|
|
24
25
|
const engineConfig = esVersionMap.get(`${database.type}-${database.version}`);
|
|
25
26
|
if (!engineConfig) {
|
|
26
|
-
throw new Error(
|
|
27
|
+
throw new Error(lang_1.lang.__('ES_DB_TYPE_VERSION_UNSUPPORTED', { type: database.type, version: database.version }));
|
|
27
28
|
}
|
|
28
29
|
const { version, category } = engineConfig;
|
|
29
30
|
const config = {
|
|
@@ -35,14 +35,14 @@ const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
|
35
35
|
case 'create': {
|
|
36
36
|
const fn = functionsMap.get(item.logicalId);
|
|
37
37
|
if (!fn) {
|
|
38
|
-
throw new Error(
|
|
38
|
+
throw new Error(lang_1.lang.__('RESOURCE_FUNCTION_NOT_FOUND', { logicalId: item.logicalId }));
|
|
39
39
|
}
|
|
40
40
|
return executeCreateAction(context, fn, currentState);
|
|
41
41
|
}
|
|
42
42
|
case 'update': {
|
|
43
43
|
const fn = functionsMap.get(item.logicalId);
|
|
44
44
|
if (!fn) {
|
|
45
|
-
throw new Error(
|
|
45
|
+
throw new Error(lang_1.lang.__('RESOURCE_FUNCTION_NOT_FOUND', { logicalId: item.logicalId }));
|
|
46
46
|
}
|
|
47
47
|
return executeUpdateAction(context, fn, currentState, item.drifted);
|
|
48
48
|
}
|
|
@@ -9,6 +9,7 @@ const ecsOperations_1 = require("../../common/aliyunClient/ecsOperations");
|
|
|
9
9
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
10
10
|
const planCompare_1 = require("../../common/planCompare");
|
|
11
11
|
const concurrency_1 = require("../../common/concurrency");
|
|
12
|
+
const siCron_1 = require("../../common/siCron");
|
|
12
13
|
const fc3Types_1 = require("./fc3Types");
|
|
13
14
|
const fc3Resource_1 = require("./fc3Resource");
|
|
14
15
|
const lang_1 = require("../../lang");
|
|
@@ -278,6 +279,31 @@ const detectFunctionNestedDrift = async (context, client, fn, currentState) => {
|
|
|
278
279
|
}
|
|
279
280
|
}
|
|
280
281
|
}
|
|
282
|
+
// Issue #258: timer trigger drift — the live trigger list is compared
|
|
283
|
+
// against the desired timers (name-keyed). A trigger missing from the cloud
|
|
284
|
+
// (manual delete), an edited cron/payload/enable, or an extra undeclared
|
|
285
|
+
// timer all count as drift.
|
|
286
|
+
const timerStateInstances = currentState.instances?.filter((i) => i.type === 'ALIYUN_FC3_TIMER_TRIGGER');
|
|
287
|
+
const desiredTimers = fn.triggers?.timer ?? [];
|
|
288
|
+
if (desiredTimers.length > 0 || timerStateInstances.length > 0) {
|
|
289
|
+
const liveTriggerList = await (0, refreshCache_1.cachedRefreshRead)(context, `fc3.listTriggers:${fn.name}`, () => client.fc3.listTriggers(fn.name));
|
|
290
|
+
const liveTimers = (liveTriggerList ?? []).filter((trigger) => trigger.triggerType === 'timer' && trigger.triggerName);
|
|
291
|
+
const desiredNames = new Set(desiredTimers.map((timer) => timer.name));
|
|
292
|
+
const extraTimer = liveTimers.some((trigger) => !desiredNames.has(trigger.triggerName));
|
|
293
|
+
const desiredChanged = desiredTimers.some((timer) => {
|
|
294
|
+
const live = liveTimers.find((trigger) => trigger.triggerName === timer.name);
|
|
295
|
+
if (!live) {
|
|
296
|
+
return true;
|
|
297
|
+
}
|
|
298
|
+
const liveConfig = (live.triggerConfig ?? {});
|
|
299
|
+
return (liveConfig.cronExpression !== (0, siCron_1.translateSiCron)(timer.cron, 'aliyun') ||
|
|
300
|
+
(liveConfig.payload ?? '') !== (timer.payload ?? '') ||
|
|
301
|
+
(liveConfig.enable === true || liveConfig.enable === 'true') !== timer.enable);
|
|
302
|
+
});
|
|
303
|
+
if (extraTimer || desiredChanged) {
|
|
304
|
+
return 'PLAN_DRIFT_TIMER_TRIGGER';
|
|
305
|
+
}
|
|
306
|
+
}
|
|
281
307
|
return null;
|
|
282
308
|
};
|
|
283
309
|
const generateFunctionPlan = async (context, state, functions) => {
|
|
@@ -10,6 +10,7 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
10
10
|
const common_1 = require("../../common");
|
|
11
11
|
const constants_1 = require("../../common/constants");
|
|
12
12
|
const types_1 = require("../../types");
|
|
13
|
+
const siCron_1 = require("../../common/siCron");
|
|
13
14
|
const fc3Types_1 = require("./fc3Types");
|
|
14
15
|
const slsOperations_1 = require("../../common/aliyunClient/slsOperations");
|
|
15
16
|
const ecsOperations_1 = require("../../common/aliyunClient/ecsOperations");
|
|
@@ -197,7 +198,11 @@ const ensureOssCodeUpload = async (client, codePath, region, functionName) => {
|
|
|
197
198
|
return undefined;
|
|
198
199
|
}
|
|
199
200
|
const bucketName = `${constants_1.SI_BOOTSTRAP_BUCKET_PREFIX}-${region}`;
|
|
200
|
-
logger_1.logger.info(
|
|
201
|
+
logger_1.logger.info(lang_1.lang.__('FC3_UPLOADING_CODE', {
|
|
202
|
+
zipPath: node_path_1.default.basename(codePath),
|
|
203
|
+
size: (fileSize / (1024 * 1024)).toFixed(1),
|
|
204
|
+
bucketName,
|
|
205
|
+
}));
|
|
201
206
|
const existingBucket = await client.oss.getBucket(bucketName);
|
|
202
207
|
if (!existingBucket) {
|
|
203
208
|
logger_1.logger.info(lang_1.lang.__('CREATING_BOOTSTRAP_BUCKET', { bucketName }));
|
|
@@ -294,6 +299,136 @@ const buildHttpTriggerConfig = (trigger) => {
|
|
|
294
299
|
...(disableURLInternet !== undefined ? { disableURLInternet } : {}),
|
|
295
300
|
};
|
|
296
301
|
};
|
|
302
|
+
const TIMER_TRIGGER_INSTANCE_TYPE = 'ALIYUN_FC3_TIMER_TRIGGER';
|
|
303
|
+
/** FC3 timer dialect: 6-field cron (UTC+8), payload passthrough, enable flag. */
|
|
304
|
+
const buildFc3TimerTriggerConfig = (timer) => ({
|
|
305
|
+
payload: timer.payload ?? '',
|
|
306
|
+
cronExpression: (0, siCron_1.translateSiCron)(timer.cron, 'aliyun'),
|
|
307
|
+
enable: timer.enable,
|
|
308
|
+
...(timer.description !== undefined ? { description: timer.description } : {}),
|
|
309
|
+
});
|
|
310
|
+
const normalizeLiveTimerConfig = (config, description) => ({
|
|
311
|
+
payload: typeof config?.payload === 'string' ? config.payload : '',
|
|
312
|
+
cronExpression: typeof config?.cronExpression === 'string' ? config.cronExpression : '',
|
|
313
|
+
enable: config?.enable === true || config?.enable === 'true',
|
|
314
|
+
...(description ? { description } : {}),
|
|
315
|
+
});
|
|
316
|
+
const timerConfigFromAttributes = (attrs) => {
|
|
317
|
+
const cron = typeof attrs.cron === 'string' ? attrs.cron : undefined;
|
|
318
|
+
if (!cron) {
|
|
319
|
+
return null;
|
|
320
|
+
}
|
|
321
|
+
try {
|
|
322
|
+
return {
|
|
323
|
+
payload: typeof attrs.payload === 'string' ? attrs.payload : '',
|
|
324
|
+
cronExpression: (0, siCron_1.translateSiCron)(cron, 'aliyun'),
|
|
325
|
+
enable: attrs.enable !== false,
|
|
326
|
+
...(typeof attrs.description === 'string' ? { description: attrs.description } : {}),
|
|
327
|
+
};
|
|
328
|
+
}
|
|
329
|
+
catch {
|
|
330
|
+
return null;
|
|
331
|
+
}
|
|
332
|
+
};
|
|
333
|
+
const buildTimerTriggerAttributes = (timer) => ({
|
|
334
|
+
cron: timer.cron,
|
|
335
|
+
...(timer.payload !== undefined ? { payload: timer.payload } : {}),
|
|
336
|
+
enable: timer.enable,
|
|
337
|
+
...(timer.description !== undefined ? { description: timer.description } : {}),
|
|
338
|
+
});
|
|
339
|
+
const buildTimerTriggerInstance = (context, fn, timer) => ({
|
|
340
|
+
type: TIMER_TRIGGER_INSTANCE_TYPE,
|
|
341
|
+
id: timer.name,
|
|
342
|
+
sid: (0, common_1.buildSid)('aliyun', 'fc3-timer-trigger', context.stage, `${fn.name}.${timer.name}`),
|
|
343
|
+
attributes: buildTimerTriggerAttributes(timer),
|
|
344
|
+
});
|
|
345
|
+
const isTriggerNotFound = (error) => error?.code === 'TriggerNotFound';
|
|
346
|
+
/**
|
|
347
|
+
* Reconcile the function's timer triggers against the provider (issue #258).
|
|
348
|
+
*
|
|
349
|
+
* The live trigger list is the reconcile baseline, so cloud-side edits
|
|
350
|
+
* (console cron change, manual delete, extra triggers) converge on every
|
|
351
|
+
* deploy — not just when local state disagrees. When the probe fails the
|
|
352
|
+
* state-recorded instances take over as the baseline. Name is the drift key:
|
|
353
|
+
* si-cron stays the stored form and is translated only at the edge.
|
|
354
|
+
*/
|
|
355
|
+
const reconcileFc3TimerTriggers = async (context, fn, previousInstances, client) => {
|
|
356
|
+
const desiredTimers = fn.triggers?.timer ?? [];
|
|
357
|
+
const previousTimers = previousInstances.filter((i) => i.type === TIMER_TRIGGER_INSTANCE_TYPE);
|
|
358
|
+
if (desiredTimers.length === 0 && previousTimers.length === 0) {
|
|
359
|
+
return [];
|
|
360
|
+
}
|
|
361
|
+
let liveTimers = [];
|
|
362
|
+
let liveAvailable = true;
|
|
363
|
+
try {
|
|
364
|
+
liveTimers = (await client.fc3.listTriggers(fn.name))
|
|
365
|
+
.filter((trigger) => trigger.triggerType === 'timer' && trigger.triggerName)
|
|
366
|
+
.map((trigger) => ({
|
|
367
|
+
name: trigger.triggerName,
|
|
368
|
+
config: normalizeLiveTimerConfig((trigger.triggerConfig ?? {}), trigger.description || undefined),
|
|
369
|
+
}));
|
|
370
|
+
}
|
|
371
|
+
catch (error) {
|
|
372
|
+
liveAvailable = false;
|
|
373
|
+
logger_1.logger.warn(lang_1.lang.__('PLAN_TIMER_TRIGGER_PROBE_FAILED', { functionName: fn.name, error: String(error) }));
|
|
374
|
+
}
|
|
375
|
+
const baseline = liveAvailable
|
|
376
|
+
? liveTimers
|
|
377
|
+
: previousTimers.flatMap((instance) => {
|
|
378
|
+
const config = timerConfigFromAttributes(instance.attributes ?? {});
|
|
379
|
+
return config ? [{ name: instance.id, config }] : [];
|
|
380
|
+
});
|
|
381
|
+
const resultingInstances = [];
|
|
382
|
+
for (const timer of desiredTimers) {
|
|
383
|
+
const desiredConfig = buildFc3TimerTriggerConfig(timer);
|
|
384
|
+
const live = baseline.find((entry) => entry.name === timer.name);
|
|
385
|
+
if (!live) {
|
|
386
|
+
logger_1.logger.info(lang_1.lang.__('CREATING_TIMER_TRIGGER', { triggerName: timer.name, functionName: fn.name }));
|
|
387
|
+
}
|
|
388
|
+
else if (!(0, common_1.attributesEqual)(live.config, desiredConfig)) {
|
|
389
|
+
logger_1.logger.info(lang_1.lang.__('UPDATING_TIMER_TRIGGER', { triggerName: timer.name, functionName: fn.name }));
|
|
390
|
+
try {
|
|
391
|
+
await client.fc3.deleteTrigger(fn.name, timer.name);
|
|
392
|
+
}
|
|
393
|
+
catch (error) {
|
|
394
|
+
if (!isTriggerNotFound(error))
|
|
395
|
+
throw error;
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
else {
|
|
399
|
+
resultingInstances.push(buildTimerTriggerInstance(context, fn, timer));
|
|
400
|
+
continue;
|
|
401
|
+
}
|
|
402
|
+
try {
|
|
403
|
+
await client.fc3.createTrigger(fn.name, timer.name, 'timer', desiredConfig, undefined, timer.description);
|
|
404
|
+
}
|
|
405
|
+
catch (error) {
|
|
406
|
+
// a leftover trigger from an adopted function may already carry the name
|
|
407
|
+
if (!(0, alreadyExists_1.isResourceAlreadyExistsError)(error))
|
|
408
|
+
throw error;
|
|
409
|
+
logger_1.logger.warn(lang_1.lang.__('TIMER_TRIGGER_ALREADY_ATTACHED', {
|
|
410
|
+
triggerName: timer.name,
|
|
411
|
+
functionName: fn.name,
|
|
412
|
+
}));
|
|
413
|
+
}
|
|
414
|
+
logger_1.logger.info(lang_1.lang.__('TIMER_TRIGGER_CREATED', { triggerName: timer.name, functionName: fn.name }));
|
|
415
|
+
resultingInstances.push(buildTimerTriggerInstance(context, fn, timer));
|
|
416
|
+
}
|
|
417
|
+
const desiredNames = new Set(desiredTimers.map((timer) => timer.name));
|
|
418
|
+
for (const stale of baseline.filter((entry) => !desiredNames.has(entry.name))) {
|
|
419
|
+
logger_1.logger.info(lang_1.lang.__('DELETING_TIMER_TRIGGER', { triggerName: stale.name, functionName: fn.name }));
|
|
420
|
+
try {
|
|
421
|
+
await client.fc3.deleteTrigger(fn.name, stale.name);
|
|
422
|
+
logger_1.logger.info(lang_1.lang.__('TIMER_TRIGGER_DELETED', { triggerName: stale.name }));
|
|
423
|
+
}
|
|
424
|
+
catch (error) {
|
|
425
|
+
if (!isTriggerNotFound(error))
|
|
426
|
+
throw error;
|
|
427
|
+
logger_1.logger.warn(lang_1.lang.__('TIMER_TRIGGER_NOT_FOUND', { triggerName: stale.name }));
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
return resultingInstances;
|
|
431
|
+
};
|
|
297
432
|
const createDependentResources = async (context, fn, serviceName, existingInstances = [], state, options) => {
|
|
298
433
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
299
434
|
const instances = [];
|
|
@@ -544,7 +679,7 @@ const deleteDependentResources = async (context, instances) => {
|
|
|
544
679
|
case 'ALIYUN_FC3_HTTP_TRIGGER':
|
|
545
680
|
// HTTP trigger deletion requires functionName which is not available here.
|
|
546
681
|
// It is handled directly in deleteResource before calling this function.
|
|
547
|
-
logger_1.logger.warn(
|
|
682
|
+
logger_1.logger.warn(lang_1.lang.__('FC3_HTTP_TRIGGER_DEPENDENT_CLEANUP', { triggerName: instance.id }));
|
|
548
683
|
break;
|
|
549
684
|
case 'ALIYUN_FC3_CUSTOM_DOMAIN':
|
|
550
685
|
logger_1.logger.info(lang_1.lang.__('DELETING_CUSTOM_DOMAIN', { domainName: instance.id }));
|
|
@@ -650,22 +785,31 @@ const createResource = async (context, fn, state) => {
|
|
|
650
785
|
}
|
|
651
786
|
catch (error) {
|
|
652
787
|
if (isRecoverableCreateError(error)) {
|
|
653
|
-
logger_1.logger.warn(
|
|
788
|
+
logger_1.logger.warn(lang_1.lang.__('FC3_CREATE_RECOVERABLE_RECONCILE', {
|
|
789
|
+
functionName: fn.name,
|
|
790
|
+
error: String(error),
|
|
791
|
+
}));
|
|
654
792
|
const functionAfterError = await client.fc3.getFunction(fn.name);
|
|
655
793
|
if (functionAfterError) {
|
|
656
794
|
if (functionAfterError.state === 'Failed') {
|
|
657
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
795
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('FC3_FAILED_AFTER_CREATE', {
|
|
796
|
+
functionName: fn.name,
|
|
797
|
+
reason: functionAfterError.stateReason ?? 'unknown',
|
|
798
|
+
})));
|
|
658
799
|
}
|
|
659
|
-
logger_1.logger.info(
|
|
800
|
+
logger_1.logger.info(lang_1.lang.__('FC3_FOUND_AFTER_CREATE_RECONCILE', { functionName: fn.name }));
|
|
660
801
|
}
|
|
661
802
|
else {
|
|
662
803
|
await delay(RECOVERY_GET_FUNCTION_DELAY_MS);
|
|
663
804
|
const functionAfterDelay = await client.fc3.getFunction(fn.name);
|
|
664
805
|
if (functionAfterDelay) {
|
|
665
806
|
if (functionAfterDelay.state === 'Failed') {
|
|
666
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
807
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('FC3_FAILED_AFTER_CREATE', {
|
|
808
|
+
functionName: fn.name,
|
|
809
|
+
reason: functionAfterDelay.stateReason ?? 'unknown',
|
|
810
|
+
})));
|
|
667
811
|
}
|
|
668
|
-
logger_1.logger.info(
|
|
812
|
+
logger_1.logger.info(lang_1.lang.__('FC3_FOUND_AFTER_DELAYED_RECONCILE', { functionName: fn.name }));
|
|
669
813
|
}
|
|
670
814
|
else {
|
|
671
815
|
throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
|
|
@@ -681,7 +825,11 @@ const createResource = async (context, fn, state) => {
|
|
|
681
825
|
// a resource that was never ours).
|
|
682
826
|
const probe = await client.fc3.getFunction(fn.name);
|
|
683
827
|
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.tags)) {
|
|
684
|
-
logger_1.logger.info(
|
|
828
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
829
|
+
resourceType: 'Function',
|
|
830
|
+
name: fn.name,
|
|
831
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
832
|
+
}));
|
|
685
833
|
}
|
|
686
834
|
else {
|
|
687
835
|
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
@@ -703,10 +851,13 @@ const createResource = async (context, fn, state) => {
|
|
|
703
851
|
throw new types_1.PartialResourceError(stateAfterDependents, error instanceof Error ? error : new Error(String(error)));
|
|
704
852
|
}
|
|
705
853
|
if (!functionInfo) {
|
|
706
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
854
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('REFRESH_STATE_FUNCTION', { name: fn.name })));
|
|
707
855
|
}
|
|
708
856
|
if (functionInfo.state === 'Failed') {
|
|
709
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
857
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('FC3_FUNCTION_FAILED_STATE', {
|
|
858
|
+
functionName: fn.name,
|
|
859
|
+
reason: functionInfo.stateReason ?? 'unknown',
|
|
860
|
+
})));
|
|
710
861
|
}
|
|
711
862
|
const sid = (0, common_1.buildSid)('aliyun', 'fc3', context.stage, fn.name);
|
|
712
863
|
const fcInstance = buildFc3InstanceFromProvider(functionInfo, sid);
|
|
@@ -724,6 +875,7 @@ const createResource = async (context, fn, state) => {
|
|
|
724
875
|
attributes: { ...triggerConfig },
|
|
725
876
|
});
|
|
726
877
|
}
|
|
878
|
+
lifecycleInstances.push(...(await reconcileFc3TimerTriggers(context, fn, [], client)));
|
|
727
879
|
if (fn.domain) {
|
|
728
880
|
logger_1.logger.info(lang_1.lang.__('CREATING_CUSTOM_DOMAIN', { domainName: fn.domain.domain_name }));
|
|
729
881
|
let certConfig;
|
|
@@ -756,7 +908,13 @@ const createResource = async (context, fn, state) => {
|
|
|
756
908
|
mode: 'managed',
|
|
757
909
|
region: context.region,
|
|
758
910
|
definition,
|
|
759
|
-
|
|
911
|
+
// DependentInstance's optional sid is always filled by construction here —
|
|
912
|
+
// widened to ResourceInstance at the state boundary
|
|
913
|
+
instances: [
|
|
914
|
+
fcInstance,
|
|
915
|
+
...lifecycleInstances,
|
|
916
|
+
...dependentInstances,
|
|
917
|
+
],
|
|
760
918
|
lastUpdated: new Date().toISOString(),
|
|
761
919
|
status: 'ready',
|
|
762
920
|
};
|
|
@@ -1205,6 +1363,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1205
1363
|
}
|
|
1206
1364
|
const existingCustomDomain = existingInstances.find((i) => i.type === 'ALIYUN_FC3_CUSTOM_DOMAIN');
|
|
1207
1365
|
const desiredDomain = fn.domain;
|
|
1366
|
+
const timerInstances = await reconcileFc3TimerTriggers(context, fn, existingInstances, client);
|
|
1208
1367
|
if (desiredDomain && !existingCustomDomain) {
|
|
1209
1368
|
logger_1.logger.info(lang_1.lang.__('CREATING_CUSTOM_DOMAIN', { domainName: desiredDomain.domain_name }));
|
|
1210
1369
|
let certConfig;
|
|
@@ -1272,7 +1431,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1272
1431
|
}
|
|
1273
1432
|
const functionInfo = await client.fc3.getFunction(fn.name);
|
|
1274
1433
|
if (!functionInfo) {
|
|
1275
|
-
throw new Error(
|
|
1434
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_FUNCTION', { name: fn.name }));
|
|
1276
1435
|
}
|
|
1277
1436
|
const codeHash = codePath ? await (0, common_1.computeZipContentHash)(codePath) : null;
|
|
1278
1437
|
const baseDefinition = (0, fc3Types_1.extractFc3Definition)(config, codeHash);
|
|
@@ -1289,6 +1448,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1289
1448
|
attributes: { ...triggerConfig },
|
|
1290
1449
|
});
|
|
1291
1450
|
}
|
|
1451
|
+
lifecycleInstances.push(...timerInstances);
|
|
1292
1452
|
if (fn.domain) {
|
|
1293
1453
|
lifecycleInstances.push({
|
|
1294
1454
|
type: 'ALIYUN_FC3_CUSTOM_DOMAIN',
|
|
@@ -1300,6 +1460,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1300
1460
|
const existingDependentInstances = existingInstances
|
|
1301
1461
|
.filter((i) => i.type !== 'ALIYUN_FC3_FUNCTION')
|
|
1302
1462
|
.filter((i) => i.type !== 'ALIYUN_FC3_HTTP_TRIGGER')
|
|
1463
|
+
.filter((i) => i.type !== TIMER_TRIGGER_INSTANCE_TYPE)
|
|
1303
1464
|
.filter((i) => i.type !== 'ALIYUN_FC3_CUSTOM_DOMAIN')
|
|
1304
1465
|
.filter((i) => !(typeof fn.iam?.role === 'string' && i.type === 'ALIYUN_RAM_ROLE'))
|
|
1305
1466
|
.filter((i) => !(i.type === 'ALIYUN_RAM_ROLE' && droppedRamRoleIds.has(i.id)))
|
|
@@ -1351,7 +1512,23 @@ const deleteResource = async (context, functionName, logicalId, state) => {
|
|
|
1351
1512
|
const existingState = (0, common_1.getResource)(state, logicalId);
|
|
1352
1513
|
const existingInstances = (existingState?.instances ?? []);
|
|
1353
1514
|
const client = (0, aliyunClient_1.createAliyunClient)(context);
|
|
1354
|
-
// Delete HTTP trigger and custom domain before function (they depend on it)
|
|
1515
|
+
// Delete timers, HTTP trigger and custom domain before function (they depend on it)
|
|
1516
|
+
const timerTriggerInstances = existingInstances.filter((i) => i.type === TIMER_TRIGGER_INSTANCE_TYPE);
|
|
1517
|
+
for (const timerInstance of timerTriggerInstances) {
|
|
1518
|
+
logger_1.logger.info(lang_1.lang.__('DELETING_TIMER_TRIGGER', {
|
|
1519
|
+
triggerName: timerInstance.id,
|
|
1520
|
+
functionName,
|
|
1521
|
+
}));
|
|
1522
|
+
try {
|
|
1523
|
+
await client.fc3.deleteTrigger(functionName, timerInstance.id);
|
|
1524
|
+
logger_1.logger.info(lang_1.lang.__('TIMER_TRIGGER_DELETED', { triggerName: timerInstance.id }));
|
|
1525
|
+
}
|
|
1526
|
+
catch (err) {
|
|
1527
|
+
if (!isTriggerNotFound(err))
|
|
1528
|
+
throw err;
|
|
1529
|
+
logger_1.logger.warn(lang_1.lang.__('TIMER_TRIGGER_NOT_FOUND', { triggerName: timerInstance.id }));
|
|
1530
|
+
}
|
|
1531
|
+
}
|
|
1355
1532
|
const httpTriggerInstance = existingInstances.find((i) => i.type === 'ALIYUN_FC3_HTTP_TRIGGER');
|
|
1356
1533
|
if (httpTriggerInstance) {
|
|
1357
1534
|
logger_1.logger.info(lang_1.lang.__('DELETING_HTTP_TRIGGER', { triggerName: httpTriggerInstance.id, functionName }));
|
|
@@ -33,14 +33,14 @@ const executeSingleItem = async (context, item, bucketsMap, currentState) => {
|
|
|
33
33
|
case 'create': {
|
|
34
34
|
const bucket = bucketsMap.get(item.logicalId);
|
|
35
35
|
if (!bucket) {
|
|
36
|
-
throw new Error(
|
|
36
|
+
throw new Error(lang_1.lang.__('RESOURCE_BUCKET_NOT_FOUND', { logicalId: item.logicalId }));
|
|
37
37
|
}
|
|
38
38
|
return executeCreateAction(context, bucket, currentState);
|
|
39
39
|
}
|
|
40
40
|
case 'update': {
|
|
41
41
|
const bucket = bucketsMap.get(item.logicalId);
|
|
42
42
|
if (!bucket) {
|
|
43
|
-
throw new Error(
|
|
43
|
+
throw new Error(lang_1.lang.__('RESOURCE_BUCKET_NOT_FOUND', { logicalId: item.logicalId }));
|
|
44
44
|
}
|
|
45
45
|
return executeUpdateAction(context, bucket, currentState);
|
|
46
46
|
}
|
|
@@ -246,7 +246,11 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
246
246
|
const probe = await client.oss.getBucket(config.bucketName);
|
|
247
247
|
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, toOwnershipTags(probe.tags))) {
|
|
248
248
|
existingBucketOnRetry = probe;
|
|
249
|
-
logger_1.logger.info(
|
|
249
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
250
|
+
resourceType: 'Bucket',
|
|
251
|
+
name: config.bucketName,
|
|
252
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
253
|
+
}));
|
|
250
254
|
}
|
|
251
255
|
else {
|
|
252
256
|
throw new types_1.PartialResourceError(stateAfterDependents, refuseAdoptionError());
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cloudRdsToDefinition = exports.extractRdsDefinition = exports.databaseToRdsConfig = void 0;
|
|
4
|
+
const lang_1 = require("../../lang");
|
|
4
5
|
// Map database versions to RDS engine versions
|
|
5
6
|
const rdsEngineMap = new Map([
|
|
6
7
|
[
|
|
@@ -150,7 +151,10 @@ const rdsEngineMap = new Map([
|
|
|
150
151
|
const databaseToRdsConfig = (database) => {
|
|
151
152
|
const engineConfig = rdsEngineMap.get(`${database.type}-${database.version}`);
|
|
152
153
|
if (!engineConfig) {
|
|
153
|
-
throw new Error(
|
|
154
|
+
throw new Error(lang_1.lang.__('RDS_DB_TYPE_VERSION_UNSUPPORTED', {
|
|
155
|
+
type: database.type,
|
|
156
|
+
version: database.version,
|
|
157
|
+
}));
|
|
154
158
|
}
|
|
155
159
|
const { engine, version, category, dbInstanceClass, quota, storage } = engineConfig;
|
|
156
160
|
const config = {
|
|
@@ -45,14 +45,14 @@ const executeSingleItem = async (context, item, tablesMap, currentState) => {
|
|
|
45
45
|
case 'create': {
|
|
46
46
|
const table = tablesMap.get(item.logicalId);
|
|
47
47
|
if (!table) {
|
|
48
|
-
throw new Error(
|
|
48
|
+
throw new Error(lang_1.lang.__('RESOURCE_TABLE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
49
49
|
}
|
|
50
50
|
return executeCreateAction(context, table, currentState);
|
|
51
51
|
}
|
|
52
52
|
case 'update': {
|
|
53
53
|
const table = tablesMap.get(item.logicalId);
|
|
54
54
|
if (!table) {
|
|
55
|
-
throw new Error(
|
|
55
|
+
throw new Error(lang_1.lang.__('RESOURCE_TABLE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
56
56
|
}
|
|
57
57
|
return executeUpdateAction(context, table, currentState);
|
|
58
58
|
}
|
|
@@ -77,7 +77,7 @@ const createTableResource = async (context, table, state) => {
|
|
|
77
77
|
// Refresh state from provider to get all attributes
|
|
78
78
|
const tableInfo = await tablestoreClient.getTable(config.tableName);
|
|
79
79
|
if (!tableInfo) {
|
|
80
|
-
throw new Error(
|
|
80
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_TABLE', { tableName: config.tableName }));
|
|
81
81
|
}
|
|
82
82
|
const resourceState = {
|
|
83
83
|
mode: 'managed',
|
|
@@ -130,7 +130,7 @@ const updateTableResource = async (context, table, state) => {
|
|
|
130
130
|
// Refresh state from provider to get all attributes
|
|
131
131
|
const tableInfo = await tablestoreClient.getTable(config.tableName);
|
|
132
132
|
if (!tableInfo) {
|
|
133
|
-
throw new Error(
|
|
133
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_TABLE', { tableName: config.tableName }));
|
|
134
134
|
}
|
|
135
135
|
const definition = (0, tablestoreTypes_1.extractTableStoreDefinition)(config);
|
|
136
136
|
const sid = (0, common_1.buildSid)('aliyun', 'ots', context.stage, `${config.instanceName}/${config.tableName}`);
|
|
@@ -156,7 +156,7 @@ const deleteTableResource = async (context, instanceName, tableName, logicalId,
|
|
|
156
156
|
catch (err) {
|
|
157
157
|
const errorMessage = err?.message ?? '';
|
|
158
158
|
if (errorMessage.includes('OTSObjectNotExist') || errorMessage.includes('does not exist')) {
|
|
159
|
-
logger_1.logger.warn(
|
|
159
|
+
logger_1.logger.warn(lang_1.lang.__('OTS_TABLE_MISSING_SKIP_DELETE', { tableName, instanceId: instanceName }));
|
|
160
160
|
}
|
|
161
161
|
else {
|
|
162
162
|
throw err;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cloudTableStoreToDefinition = exports.extractTableStoreDefinition = exports.tableToTableStoreConfig = void 0;
|
|
4
4
|
const types_1 = require("../../types");
|
|
5
|
+
const lang_1 = require("../../lang");
|
|
5
6
|
// Map from TableStore cluster type to TableEnum
|
|
6
7
|
const clusterTypeMap = new Map([
|
|
7
8
|
["TABLE_STORE_C" /* TableEnum.TABLE_STORE_C */, 'HYBRID'],
|
|
@@ -26,13 +27,13 @@ const attributeTypeToTableStoreType = (type) => {
|
|
|
26
27
|
const tableToTableStoreConfig = (table) => {
|
|
27
28
|
const clusterType = clusterTypeMap.get(table.type);
|
|
28
29
|
if (!clusterType) {
|
|
29
|
-
throw new Error(
|
|
30
|
+
throw new Error(lang_1.lang.__('OTS_TABLE_TYPE_UNSUPPORTED', { type: table.type }));
|
|
30
31
|
}
|
|
31
32
|
// Extract primary keys from keySchema
|
|
32
33
|
const primaryKey = table.keySchema.map((key) => {
|
|
33
34
|
const attribute = table.attributes.find((attr) => attr.name === key.name);
|
|
34
35
|
if (!attribute) {
|
|
35
|
-
throw new Error(
|
|
36
|
+
throw new Error(lang_1.lang.__('OTS_ATTRIBUTE_NOT_FOUND', { key: key.name }));
|
|
36
37
|
}
|
|
37
38
|
return {
|
|
38
39
|
name: key.name,
|
package/dist/src/stack/deploy.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deployStack = void 0;
|
|
4
|
+
const lang_1 = require("../lang");
|
|
4
5
|
const common_1 = require("../common");
|
|
5
6
|
const scfStack_1 = require("./scfStack");
|
|
6
7
|
const aliyunStack_1 = require("./aliyunStack");
|
|
7
8
|
const volcengineStack_1 = require("./volcengineStack");
|
|
8
9
|
const deployHuawei = async () => {
|
|
9
|
-
throw new Error(
|
|
10
|
-
'The provider currently generates HCL templates but does not deploy them. ' +
|
|
11
|
-
'Please use Aliyun or Tencent providers, or contribute Huawei deployment support.');
|
|
10
|
+
throw new Error(lang_1.lang.__('HUAWEI_DEPLOY_NOT_IMPLEMENTED'));
|
|
12
11
|
};
|
|
13
12
|
/**
|
|
14
13
|
* `plan` (issue #246): the exact plan shown to the user for approval is the
|