@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
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteResource = exports.updateResource = exports.readResource = exports.createResource = exports.deriveScfExecutionStatements = void 0;
|
|
4
4
|
const types_1 = require("../../types");
|
|
5
|
+
const siCron_1 = require("../../common/siCron");
|
|
5
6
|
const tencentClient_1 = require("../../common/tencentClient");
|
|
6
7
|
const fileUtils_1 = require("../../common/fileUtils");
|
|
7
8
|
const scfTypes_1 = require("./scfTypes");
|
|
@@ -35,6 +36,148 @@ const buildTencentTriggerDesc = (authType, netConfig) => JSON.stringify({
|
|
|
35
36
|
// Function URL trigger is identified by Type 'http' + a TriggerDesc carrying
|
|
36
37
|
// the NetConfig field (the API Gateway flavor uses api/service/release instead).
|
|
37
38
|
const isFunctionUrlTrigger = (t) => t.Type === 'http' && typeof t.TriggerDesc === 'string' && t.TriggerDesc.includes('NetConfig');
|
|
39
|
+
const TIMER_TRIGGER_INSTANCE_TYPE = 'TENCENT_SCF_TIMER_TRIGGER';
|
|
40
|
+
/** Tencent timer dialect: 7-field cron (UTC+8, `*` year), payload → CustomArgument. */
|
|
41
|
+
const buildScfTimerTriggerConfig = (timer) => ({
|
|
42
|
+
cron: (0, siCron_1.translateSiCron)(timer.cron, 'tencent'),
|
|
43
|
+
...(timer.payload !== undefined ? { payload: timer.payload } : {}),
|
|
44
|
+
enable: timer.enable,
|
|
45
|
+
...(timer.description !== undefined ? { description: timer.description } : {}),
|
|
46
|
+
});
|
|
47
|
+
const normalizeScfLiveTimerConfig = (trigger) => ({
|
|
48
|
+
cron: trigger.TriggerDesc ?? '',
|
|
49
|
+
...(trigger.CustomArgument !== undefined && trigger.CustomArgument !== ''
|
|
50
|
+
? { payload: trigger.CustomArgument }
|
|
51
|
+
: {}),
|
|
52
|
+
enable: trigger.Enable === 1 || trigger.Enable === 'OPEN',
|
|
53
|
+
...(trigger.Description ? { description: trigger.Description } : {}),
|
|
54
|
+
});
|
|
55
|
+
const scfTimerConfigFromAttributes = (attrs) => {
|
|
56
|
+
const cron = typeof attrs.cron === 'string' ? attrs.cron : undefined;
|
|
57
|
+
if (!cron) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
return {
|
|
62
|
+
cron: (0, siCron_1.translateSiCron)(cron, 'tencent'),
|
|
63
|
+
...(attrs.payload !== undefined ? { payload: String(attrs.payload) } : {}),
|
|
64
|
+
enable: attrs.enable !== false,
|
|
65
|
+
...(attrs.description !== undefined ? { description: String(attrs.description) } : {}),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
const buildScfTimerTriggerInstance = (context, fn, timer) => ({
|
|
73
|
+
sid: (0, common_1.buildSid)('tencent', 'scf-timer-trigger', context.stage, `${fn.name}.${timer.name}`),
|
|
74
|
+
type: TIMER_TRIGGER_INSTANCE_TYPE,
|
|
75
|
+
id: timer.name,
|
|
76
|
+
cron: timer.cron,
|
|
77
|
+
...(timer.payload !== undefined ? { payload: timer.payload } : {}),
|
|
78
|
+
enable: timer.enable,
|
|
79
|
+
...(timer.description !== undefined ? { description: timer.description } : {}),
|
|
80
|
+
});
|
|
81
|
+
const deleteScfTimerTrigger = async (fnName, triggerName, client) => {
|
|
82
|
+
try {
|
|
83
|
+
await client.scf.deleteTrigger({
|
|
84
|
+
FunctionName: fnName,
|
|
85
|
+
TriggerName: triggerName,
|
|
86
|
+
Type: 'timer',
|
|
87
|
+
});
|
|
88
|
+
logger_1.logger.info(lang_1.lang.__('TIMER_TRIGGER_DELETED', { triggerName }));
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
const errorCode = err?.code;
|
|
93
|
+
if (errorCode === 'ResourceNotFound.TriggerName' || errorCode === 'ResourceNotFound') {
|
|
94
|
+
logger_1.logger.warn(lang_1.lang.__('TIMER_TRIGGER_NOT_FOUND', { triggerName }));
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
throw err;
|
|
98
|
+
}
|
|
99
|
+
};
|
|
100
|
+
/**
|
|
101
|
+
* Reconcile the function's timer triggers against the provider (issue #258).
|
|
102
|
+
*
|
|
103
|
+
* The live trigger list from GetFunction is the reconcile baseline, so
|
|
104
|
+
* console-side cron edits, manual deletions and extra triggers converge on
|
|
105
|
+
* every deploy. When the probe fails the state-recorded instances take over.
|
|
106
|
+
* Name is the drift key; si-cron stays stored and is translated only here.
|
|
107
|
+
*/
|
|
108
|
+
const reconcileScfTimerTriggers = async (context, fn, previousInstances, client) => {
|
|
109
|
+
const desiredTimers = fn.triggers?.timer ?? [];
|
|
110
|
+
const previousTimers = previousInstances.filter((i) => i.type === TIMER_TRIGGER_INSTANCE_TYPE);
|
|
111
|
+
if (desiredTimers.length === 0 && previousTimers.length === 0) {
|
|
112
|
+
return [];
|
|
113
|
+
}
|
|
114
|
+
let liveTimers = [];
|
|
115
|
+
let liveAvailable = true;
|
|
116
|
+
try {
|
|
117
|
+
const probe = await client.scf.getFunction(fn.name);
|
|
118
|
+
liveTimers = (probe?.Triggers ?? [])
|
|
119
|
+
.filter((trigger) => trigger.Type === 'timer' && trigger.TriggerName)
|
|
120
|
+
.map((trigger) => ({
|
|
121
|
+
name: trigger.TriggerName,
|
|
122
|
+
config: normalizeScfLiveTimerConfig(trigger),
|
|
123
|
+
}));
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
liveAvailable = false;
|
|
127
|
+
logger_1.logger.warn(lang_1.lang.__('PLAN_TIMER_TRIGGER_PROBE_FAILED', { functionName: fn.name, error: String(error) }));
|
|
128
|
+
}
|
|
129
|
+
const baseline = liveAvailable
|
|
130
|
+
? liveTimers
|
|
131
|
+
: previousTimers.flatMap((instance) => {
|
|
132
|
+
const config = scfTimerConfigFromAttributes(instance);
|
|
133
|
+
return config ? [{ name: String(instance.id), config }] : [];
|
|
134
|
+
});
|
|
135
|
+
const resultingInstances = [];
|
|
136
|
+
for (const timer of desiredTimers) {
|
|
137
|
+
const desiredConfig = buildScfTimerTriggerConfig(timer);
|
|
138
|
+
const live = baseline.find((entry) => entry.name === timer.name);
|
|
139
|
+
if (!live) {
|
|
140
|
+
logger_1.logger.info(lang_1.lang.__('CREATING_TIMER_TRIGGER', { triggerName: timer.name, functionName: fn.name }));
|
|
141
|
+
}
|
|
142
|
+
else if (!(0, common_1.attributesEqual)(live.config, desiredConfig)) {
|
|
143
|
+
logger_1.logger.info(lang_1.lang.__('UPDATING_TIMER_TRIGGER', { triggerName: timer.name, functionName: fn.name }));
|
|
144
|
+
await deleteScfTimerTrigger(fn.name, timer.name, client);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
resultingInstances.push(buildScfTimerTriggerInstance(context, fn, timer));
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
try {
|
|
151
|
+
await client.scf.createTrigger({
|
|
152
|
+
FunctionName: fn.name,
|
|
153
|
+
TriggerName: timer.name,
|
|
154
|
+
Type: 'timer',
|
|
155
|
+
TriggerDesc: desiredConfig.cron,
|
|
156
|
+
...(desiredConfig.payload !== undefined ? { CustomArgument: desiredConfig.payload } : {}),
|
|
157
|
+
Qualifier: '$DEFAULT',
|
|
158
|
+
Enable: desiredConfig.enable ? 'OPEN' : 'CLOSE',
|
|
159
|
+
...(desiredConfig.description ? { Description: desiredConfig.description } : {}),
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
// a leftover trigger from an adopted function may already carry the name
|
|
164
|
+
if (!(0, alreadyExists_1.isResourceAlreadyExistsError)(error))
|
|
165
|
+
throw error;
|
|
166
|
+
logger_1.logger.warn(lang_1.lang.__('TIMER_TRIGGER_ALREADY_ATTACHED', {
|
|
167
|
+
triggerName: timer.name,
|
|
168
|
+
functionName: fn.name,
|
|
169
|
+
}));
|
|
170
|
+
}
|
|
171
|
+
logger_1.logger.info(lang_1.lang.__('TIMER_TRIGGER_CREATED', { triggerName: timer.name, functionName: fn.name }));
|
|
172
|
+
resultingInstances.push(buildScfTimerTriggerInstance(context, fn, timer));
|
|
173
|
+
}
|
|
174
|
+
const desiredNames = new Set(desiredTimers.map((timer) => timer.name));
|
|
175
|
+
for (const stale of baseline.filter((entry) => !desiredNames.has(entry.name))) {
|
|
176
|
+
logger_1.logger.info(lang_1.lang.__('DELETING_TIMER_TRIGGER', { triggerName: stale.name, functionName: fn.name }));
|
|
177
|
+
await deleteScfTimerTrigger(fn.name, stale.name, client);
|
|
178
|
+
}
|
|
179
|
+
return resultingInstances;
|
|
180
|
+
};
|
|
38
181
|
/**
|
|
39
182
|
* Best-effort extraction of a cloud-SDK error's useful details. Tencent SDK
|
|
40
183
|
* errors carry `code`/`message`/`requestId` (and may throw with an empty
|
|
@@ -519,12 +662,15 @@ const createResource = async (context, fn, state) => {
|
|
|
519
662
|
}
|
|
520
663
|
catch (error) {
|
|
521
664
|
if (isRecoverableCreateError(error)) {
|
|
522
|
-
logger_1.logger.warn(
|
|
665
|
+
logger_1.logger.warn(lang_1.lang.__('FC3_CREATE_RECOVERABLE_RECONCILE', {
|
|
666
|
+
functionName: fn.name,
|
|
667
|
+
error: String(error),
|
|
668
|
+
}));
|
|
523
669
|
await delay(RECOVERY_GET_FUNCTION_DELAY_MS);
|
|
524
670
|
const afterError = await client.scf.getFunction(fn.name);
|
|
525
671
|
if (afterError) {
|
|
526
672
|
adoptedInfo = afterError;
|
|
527
|
-
logger_1.logger.info(
|
|
673
|
+
logger_1.logger.info(lang_1.lang.__('FC3_FOUND_AFTER_CREATE_RECONCILE', { functionName: fn.name }));
|
|
528
674
|
}
|
|
529
675
|
else {
|
|
530
676
|
throw new types_1.PartialResourceError(stateAfterDependents, new Error(toErrorMessage(error)));
|
|
@@ -540,7 +686,11 @@ const createResource = async (context, fn, state) => {
|
|
|
540
686
|
const probe = await client.scf.getFunction(fn.name);
|
|
541
687
|
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.Tags)) {
|
|
542
688
|
adoptedInfo = probe;
|
|
543
|
-
logger_1.logger.info(
|
|
689
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
690
|
+
resourceType: 'Function',
|
|
691
|
+
name: fn.name,
|
|
692
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
693
|
+
}));
|
|
544
694
|
}
|
|
545
695
|
else {
|
|
546
696
|
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
@@ -574,7 +724,7 @@ const createResource = async (context, fn, state) => {
|
|
|
574
724
|
}
|
|
575
725
|
const triggerAlreadyAttached = providerTriggers.some(isFunctionUrlTrigger);
|
|
576
726
|
if (triggerAlreadyAttached) {
|
|
577
|
-
logger_1.logger.info(
|
|
727
|
+
logger_1.logger.info(lang_1.lang.__('SCF_HTTP_TRIGGER_ALREADY_ATTACHED', { triggerName, functionName: fn.name }));
|
|
578
728
|
}
|
|
579
729
|
else {
|
|
580
730
|
logger_1.logger.info(lang_1.lang.__('CREATING_HTTP_TRIGGER', { triggerName, functionName: fn.name }));
|
|
@@ -591,7 +741,11 @@ const createResource = async (context, fn, state) => {
|
|
|
591
741
|
}
|
|
592
742
|
catch (error) {
|
|
593
743
|
if ((0, alreadyExists_1.isResourceAlreadyExistsError)(error)) {
|
|
594
|
-
logger_1.logger.warn(
|
|
744
|
+
logger_1.logger.warn(lang_1.lang.__('SCF_HTTP_TRIGGER_ALREADY_EXISTS', {
|
|
745
|
+
triggerName,
|
|
746
|
+
functionName: fn.name,
|
|
747
|
+
error: String(error),
|
|
748
|
+
}));
|
|
595
749
|
}
|
|
596
750
|
else {
|
|
597
751
|
// The function exists in the cloud but the trigger failed to attach —
|
|
@@ -601,6 +755,18 @@ const createResource = async (context, fn, state) => {
|
|
|
601
755
|
}
|
|
602
756
|
}
|
|
603
757
|
}
|
|
758
|
+
// Create timer triggers if configured — a failure mid-way persists the
|
|
759
|
+
// tainted state so a re-run reconciles instead of duplicating triggers.
|
|
760
|
+
if (fn.triggers?.timer) {
|
|
761
|
+
try {
|
|
762
|
+
dependentInstances.push(...(await reconcileScfTimerTriggers(context, fn, [], client)));
|
|
763
|
+
}
|
|
764
|
+
catch (error) {
|
|
765
|
+
if (error instanceof types_1.PartialResourceError)
|
|
766
|
+
throw error;
|
|
767
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(toErrorMessage(error)));
|
|
768
|
+
}
|
|
769
|
+
}
|
|
604
770
|
// Create custom domain if configured
|
|
605
771
|
if (fn.domain) {
|
|
606
772
|
logger_1.logger.info(lang_1.lang.__('CREATING_CUSTOM_DOMAIN', { domainName: fn.domain.domain_name }));
|
|
@@ -642,7 +808,7 @@ const createResource = async (context, fn, state) => {
|
|
|
642
808
|
throw new types_1.PartialResourceError(stateAfterDependents, new Error(toErrorMessage(error)));
|
|
643
809
|
}
|
|
644
810
|
if (!functionInfo) {
|
|
645
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
811
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('REFRESH_STATE_FUNCTION', { name: fn.name })));
|
|
646
812
|
}
|
|
647
813
|
const sid = (0, common_1.buildSid)('tencent', 'scf', context.stage, fn.name);
|
|
648
814
|
const resourceState = {
|
|
@@ -834,12 +1000,18 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
834
1000
|
if (desiredDefinition.handler &&
|
|
835
1001
|
existingDefinition.handler &&
|
|
836
1002
|
desiredDefinition.handler !== existingDefinition.handler) {
|
|
837
|
-
throw new Error(
|
|
1003
|
+
throw new Error(lang_1.lang.__('SCF_HANDLER_IMMUTABLE', {
|
|
1004
|
+
oldHandler: String(existingDefinition.handler),
|
|
1005
|
+
newHandler: String(desiredDefinition.handler),
|
|
1006
|
+
}));
|
|
838
1007
|
}
|
|
839
1008
|
if (desiredDefinition.runtime &&
|
|
840
1009
|
existingDefinition.runtime &&
|
|
841
1010
|
desiredDefinition.runtime !== existingDefinition.runtime) {
|
|
842
|
-
throw new Error(
|
|
1011
|
+
throw new Error(lang_1.lang.__('SCF_RUNTIME_IMMUTABLE', {
|
|
1012
|
+
oldRuntime: String(existingDefinition.runtime),
|
|
1013
|
+
newRuntime: String(desiredDefinition.runtime),
|
|
1014
|
+
}));
|
|
843
1015
|
}
|
|
844
1016
|
const configChanged = mutableKeys.some((k) => desiredDefinition[k] !== existingDefinition[k]) ||
|
|
845
1017
|
isLogConfigChanged(desiredDefinition, existingDefinition) ||
|
|
@@ -914,7 +1086,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
914
1086
|
const probe = await client.scf.getFunction(fn.name);
|
|
915
1087
|
const providerTriggerAttached = (probe?.Triggers ?? []).some(isFunctionUrlTrigger);
|
|
916
1088
|
if (providerTriggerAttached) {
|
|
917
|
-
logger_1.logger.info(
|
|
1089
|
+
logger_1.logger.info(lang_1.lang.__('SCF_HTTP_TRIGGER_ALREADY_ATTACHED', { triggerName, functionName: fn.name }));
|
|
918
1090
|
}
|
|
919
1091
|
else {
|
|
920
1092
|
logger_1.logger.info(lang_1.lang.__('CREATING_HTTP_TRIGGER', { triggerName, functionName: fn.name }));
|
|
@@ -931,7 +1103,11 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
931
1103
|
}
|
|
932
1104
|
catch (error) {
|
|
933
1105
|
if ((0, alreadyExists_1.isResourceAlreadyExistsError)(error)) {
|
|
934
|
-
logger_1.logger.warn(
|
|
1106
|
+
logger_1.logger.warn(lang_1.lang.__('SCF_HTTP_TRIGGER_ALREADY_EXISTS', {
|
|
1107
|
+
triggerName,
|
|
1108
|
+
functionName: fn.name,
|
|
1109
|
+
error: String(error),
|
|
1110
|
+
}));
|
|
935
1111
|
}
|
|
936
1112
|
else {
|
|
937
1113
|
throw error;
|
|
@@ -961,6 +1137,9 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
961
1137
|
}
|
|
962
1138
|
}
|
|
963
1139
|
}
|
|
1140
|
+
// Reconcile timer triggers against the provider (issue #258) — the live
|
|
1141
|
+
// GetFunction trigger list is the baseline so console edits converge.
|
|
1142
|
+
const timerInstances = await reconcileScfTimerTriggers(context, fn, existingInstances, client);
|
|
964
1143
|
// Reconcile custom domain
|
|
965
1144
|
const existingCustomDomain = existingInstances.find((i) => i.type === 'TENCENT_SCF_CUSTOM_DOMAIN');
|
|
966
1145
|
if (fn.domain && !existingCustomDomain) {
|
|
@@ -1029,13 +1208,15 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1029
1208
|
// Refresh state from provider to get all attributes (including triggers)
|
|
1030
1209
|
const functionInfo = await client.scf.getFunction(fn.name);
|
|
1031
1210
|
if (!functionInfo) {
|
|
1032
|
-
throw new Error(
|
|
1211
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_FUNCTION', { name: fn.name }));
|
|
1033
1212
|
}
|
|
1034
1213
|
const definition = (0, scfTypes_1.extractScfDefinition)(config, codeHash, fn.iam);
|
|
1035
1214
|
const sid = (0, common_1.buildSid)('tencent', 'scf', context.stage, fn.name);
|
|
1036
1215
|
const existingDependentInstances = existingInstances
|
|
1037
1216
|
.filter((i) => i.type !== undefined &&
|
|
1038
1217
|
i.type !== 'TENCENT_SCF_CUSTOM_DOMAIN' &&
|
|
1218
|
+
// timers are fully rebuilt from the reconcile result below
|
|
1219
|
+
i.type !== TIMER_TRIGGER_INSTANCE_TYPE &&
|
|
1039
1220
|
!((clsTopicInstance || disableLog) &&
|
|
1040
1221
|
(i.type === types_1.ResourceTypeEnum.TENCENT_CLS_TOPIC ||
|
|
1041
1222
|
i.type === types_1.ResourceTypeEnum.TENCENT_CLS_LOGSET)))
|
|
@@ -1079,6 +1260,7 @@ const updateResource = async (context, fn, state, options) => {
|
|
|
1079
1260
|
buildScfInstanceFromProvider(functionInfo, sid),
|
|
1080
1261
|
...existingDependentInstances,
|
|
1081
1262
|
...newDependentInstances,
|
|
1263
|
+
...timerInstances,
|
|
1082
1264
|
],
|
|
1083
1265
|
lastUpdated: new Date().toISOString(),
|
|
1084
1266
|
};
|
|
@@ -1120,6 +1302,12 @@ const deleteResource = async (context, functionName, logicalId, state) => {
|
|
|
1120
1302
|
}
|
|
1121
1303
|
}
|
|
1122
1304
|
}
|
|
1305
|
+
// Delete timer triggers before deleting function
|
|
1306
|
+
const timerTriggerInstances = existingInstances.filter((i) => i.type === TIMER_TRIGGER_INSTANCE_TYPE);
|
|
1307
|
+
for (const timerInstance of timerTriggerInstances) {
|
|
1308
|
+
logger_1.logger.info(lang_1.lang.__('DELETING_TIMER_TRIGGER', { triggerName: timerInstance.id, functionName }));
|
|
1309
|
+
await deleteScfTimerTrigger(functionName, timerInstance.id, client);
|
|
1310
|
+
}
|
|
1123
1311
|
// Delete custom domain before deleting function
|
|
1124
1312
|
const existingCustomDomain = existingInstances.find((i) => i.type === 'TENCENT_SCF_CUSTOM_DOMAIN');
|
|
1125
1313
|
if (existingCustomDomain) {
|
|
@@ -1157,7 +1345,9 @@ const deleteResource = async (context, functionName, logicalId, state) => {
|
|
|
1157
1345
|
}
|
|
1158
1346
|
}
|
|
1159
1347
|
const dependentInstances = existingInstances.filter((i) => i.type !== undefined &&
|
|
1160
|
-
i.type !== 'TENCENT_SCF_CUSTOM_DOMAIN'
|
|
1348
|
+
i.type !== 'TENCENT_SCF_CUSTOM_DOMAIN' &&
|
|
1349
|
+
// timers were deleted explicitly above
|
|
1350
|
+
i.type !== TIMER_TRIGGER_INSTANCE_TYPE);
|
|
1161
1351
|
if (dependentInstances.length > 0) {
|
|
1162
1352
|
await deleteDependentResources(context, dependentInstances);
|
|
1163
1353
|
}
|
|
@@ -36,22 +36,22 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
36
36
|
case 'create': {
|
|
37
37
|
const database = databasesMap.get(item.logicalId);
|
|
38
38
|
if (!database) {
|
|
39
|
-
throw new Error(
|
|
39
|
+
throw new Error(lang_1.lang.__('RESOURCE_DATABASE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
40
40
|
}
|
|
41
41
|
return executeCreateAction(context, database, currentState);
|
|
42
42
|
}
|
|
43
43
|
case 'update': {
|
|
44
44
|
const database = databasesMap.get(item.logicalId);
|
|
45
45
|
if (!database) {
|
|
46
|
-
throw new Error(
|
|
46
|
+
throw new Error(lang_1.lang.__('RESOURCE_DATABASE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
47
47
|
}
|
|
48
48
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|
|
49
49
|
if (!state) {
|
|
50
|
-
throw new Error(
|
|
50
|
+
throw new Error(lang_1.lang.__('EXECUTOR_STATE_NOT_FOUND', { logicalId: item.logicalId }));
|
|
51
51
|
}
|
|
52
52
|
const clusterId = state.metadata?.clusterId || state.instances?.[0]?.id;
|
|
53
53
|
if (!clusterId) {
|
|
54
|
-
throw new Error(
|
|
54
|
+
throw new Error(lang_1.lang.__('RESOURCE_CLUSTER_ID_NOT_FOUND', { logicalId: item.logicalId }));
|
|
55
55
|
}
|
|
56
56
|
return executeUpdateAction(context, database, clusterId, currentState);
|
|
57
57
|
}
|
|
@@ -63,7 +63,7 @@ const executeSingleItem = async (context, item, databasesMap, currentState) => {
|
|
|
63
63
|
}
|
|
64
64
|
const clusterId = state.metadata?.clusterId || state.instances?.[0]?.id;
|
|
65
65
|
if (!clusterId) {
|
|
66
|
-
throw new Error(
|
|
66
|
+
throw new Error(lang_1.lang.__('RESOURCE_CLUSTER_ID_NOT_FOUND', { logicalId: item.logicalId }));
|
|
67
67
|
}
|
|
68
68
|
return executeDeleteAction(context, clusterId, item.logicalId, currentState);
|
|
69
69
|
}
|
|
@@ -146,7 +146,11 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
146
146
|
const probe = await client.tdsqlc.getClusterByName(database.name);
|
|
147
147
|
if (probe &&
|
|
148
148
|
(0, ownershipTag_1.isOwnedByStack)(context, logicalId, (0, tdsqlcTypes_1.tdsqlcTagsToOwnershipTags)(probe.ResourceTags))) {
|
|
149
|
-
logger_1.logger.info(
|
|
149
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
150
|
+
resourceType: 'Cluster',
|
|
151
|
+
name: database.name,
|
|
152
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
153
|
+
}));
|
|
150
154
|
clusterId = probe.ClusterId;
|
|
151
155
|
clusterInfo = probe;
|
|
152
156
|
}
|
|
@@ -166,7 +170,7 @@ const createDatabaseResource = async (context, database, state) => {
|
|
|
166
170
|
if (!clusterInfo) {
|
|
167
171
|
clusterInfo = await client.tdsqlc.getCluster(clusterId);
|
|
168
172
|
if (!clusterInfo) {
|
|
169
|
-
throw new Error(
|
|
173
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_CLUSTER', { clusterId }));
|
|
170
174
|
}
|
|
171
175
|
}
|
|
172
176
|
const sid = (0, common_1.buildSid)('tencent', 'cynosdb', context.stage, clusterId);
|
|
@@ -204,7 +208,7 @@ const updateDatabaseResource = async (context, database, clusterId, state) => {
|
|
|
204
208
|
// Refresh state from provider to get all attributes
|
|
205
209
|
const clusterInfo = await client.tdsqlc.getCluster(clusterId);
|
|
206
210
|
if (!clusterInfo) {
|
|
207
|
-
throw new Error(
|
|
211
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_CLUSTER', { clusterId }));
|
|
208
212
|
}
|
|
209
213
|
const definition = (0, tdsqlcTypes_1.extractTdsqlcDefinition)(config);
|
|
210
214
|
const sid = (0, common_1.buildSid)('tencent', 'cynosdb', context.stage, clusterId);
|
|
@@ -15,7 +15,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, currentS
|
|
|
15
15
|
case 'create': {
|
|
16
16
|
const event = eventsMap.get(item.logicalId);
|
|
17
17
|
if (!event) {
|
|
18
|
-
throw new Error(
|
|
18
|
+
throw new Error(lang_1.lang.__('RESOURCE_EVENT_NOT_FOUND', { logicalId: item.logicalId }));
|
|
19
19
|
}
|
|
20
20
|
common_1.logger.info(lang_1.lang.__('CREATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
21
21
|
const newState = await (0, apigwResource_1.createApigwResource)(context, event, serviceName, currentState);
|
|
@@ -25,7 +25,7 @@ const executeSingleItem = async (context, item, eventsMap, serviceName, currentS
|
|
|
25
25
|
case 'update': {
|
|
26
26
|
const event = eventsMap.get(item.logicalId);
|
|
27
27
|
if (!event) {
|
|
28
|
-
throw new Error(
|
|
28
|
+
throw new Error(lang_1.lang.__('RESOURCE_EVENT_NOT_FOUND', { logicalId: item.logicalId }));
|
|
29
29
|
}
|
|
30
30
|
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'API Gateway resources', name: event.name }));
|
|
31
31
|
const newState = await (0, apigwResource_1.updateApigwResource)(context, event, serviceName, currentState);
|
|
@@ -150,7 +150,7 @@ const resolveFunctionIdFromState = async (state, backendRef, client) => {
|
|
|
150
150
|
if (templateKey) {
|
|
151
151
|
// Template function with no state Id: deploy failed or state is stale —
|
|
152
152
|
// do not mask it by adopting a same-named foreign function.
|
|
153
|
-
throw new Error(
|
|
153
|
+
throw new Error(lang_1.lang.__('VOLC_BACKEND_FUNCTION_ID_UNRESOLVED', { backend: backendRef, functionKey: fnKey }));
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
const external = await client.vefaas.getFunction(String(backendRef ?? ''));
|
|
@@ -177,7 +177,7 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
177
177
|
// NetworkSpec (vpc_id + subnet_ids) is required by CreateGateway for all
|
|
178
178
|
// types — verified live: omitting it returns "missing NetworkSpec".
|
|
179
179
|
if (!gatewayConfig.network) {
|
|
180
|
-
throw new Error(
|
|
180
|
+
throw new Error(lang_1.lang.__('VOLC_APIGW_NETWORK_REQUIRED', { eventKey: event.key }));
|
|
181
181
|
}
|
|
182
182
|
try {
|
|
183
183
|
gatewayInfo = await client.apigw.createGateway(gatewayConfig);
|
|
@@ -190,7 +190,10 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
190
190
|
gatewayInfo = probe;
|
|
191
191
|
}
|
|
192
192
|
else {
|
|
193
|
-
throw new types_1.PartialResourceError(state, new Error(
|
|
193
|
+
throw new types_1.PartialResourceError(state, new Error(lang_1.lang.__('VOLC_APIGW_ADOPT_REFUSED', {
|
|
194
|
+
gatewayName: gatewayConfig.gatewayName,
|
|
195
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
196
|
+
})));
|
|
194
197
|
}
|
|
195
198
|
}
|
|
196
199
|
else {
|
|
@@ -199,7 +202,7 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
199
202
|
}
|
|
200
203
|
}
|
|
201
204
|
if (!gatewayInfo?.gatewayId) {
|
|
202
|
-
throw new Error('
|
|
205
|
+
throw new Error(lang_1.lang.__('VOLC_APIGW_CREATE_OR_REUSE_FAILED'));
|
|
203
206
|
}
|
|
204
207
|
const gatewayId = gatewayInfo.gatewayId;
|
|
205
208
|
// Gateway creation is async — service/upstream/route calls are rejected
|
|
@@ -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
|
}
|
|
@@ -113,7 +113,7 @@ const createResource = async (context, bucket, state) => {
|
|
|
113
113
|
// fail loudly rather than be silently taken over.
|
|
114
114
|
const probe = await client.tos.getBucket(bucket.name);
|
|
115
115
|
if (!probe) {
|
|
116
|
-
throw new Error(
|
|
116
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_BUCKET', { name: bucket.name }));
|
|
117
117
|
}
|
|
118
118
|
if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.Tags)) {
|
|
119
119
|
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
@@ -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
|
}
|
|
@@ -7,6 +7,7 @@ const volcengineClient_1 = require("../../common/volcengineClient");
|
|
|
7
7
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
8
8
|
const planCompare_1 = require("../../common/planCompare");
|
|
9
9
|
const concurrency_1 = require("../../common/concurrency");
|
|
10
|
+
const siCron_1 = require("../../common/siCron");
|
|
10
11
|
const vefaasTypes_1 = require("./vefaasTypes");
|
|
11
12
|
const vefaasResource_1 = require("./vefaasResource");
|
|
12
13
|
const tlsOperations_1 = require("../../common/volcengineClient/tlsOperations");
|
|
@@ -270,6 +271,54 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
270
271
|
}
|
|
271
272
|
}
|
|
272
273
|
}
|
|
274
|
+
// Issue #258: timer trigger drift — the live trigger list is compared
|
|
275
|
+
// against the desired timers (name-keyed). A trigger missing from the
|
|
276
|
+
// cloud (manual delete), an edited source config, or an extra
|
|
277
|
+
// undeclared timer all count as drift.
|
|
278
|
+
const timerStateInstances = currentState.instances.filter((i) => i.type === 'VOLCENGINE_VEFAAS_TIMER_TRIGGER');
|
|
279
|
+
const desiredTimers = fn.triggers?.timer ?? [];
|
|
280
|
+
if ((desiredTimers.length > 0 || timerStateInstances.length > 0) &&
|
|
281
|
+
remoteFunction.functionId) {
|
|
282
|
+
try {
|
|
283
|
+
const liveTriggers = await (0, refreshCache_1.cachedRefreshRead)(context, `vefaas.listTriggers:${remoteFunction.functionId}`, () => client.vefaas.listTriggers(remoteFunction.functionId));
|
|
284
|
+
const liveTimers = liveTriggers.filter((trigger) => trigger.sourceType?.toLowerCase() === 'timer');
|
|
285
|
+
const desiredNames = new Set(desiredTimers.map((timer) => timer.name));
|
|
286
|
+
const extraTimer = liveTimers.some((trigger) => !trigger.name || !desiredNames.has(trigger.name));
|
|
287
|
+
const desiredChanged = desiredTimers.some((timer) => {
|
|
288
|
+
const live = liveTimers.find((trigger) => trigger.name === timer.name);
|
|
289
|
+
if (!live) {
|
|
290
|
+
return true;
|
|
291
|
+
}
|
|
292
|
+
let source;
|
|
293
|
+
try {
|
|
294
|
+
source = JSON.parse(live.source ?? '{}');
|
|
295
|
+
}
|
|
296
|
+
catch {
|
|
297
|
+
return true;
|
|
298
|
+
}
|
|
299
|
+
return (source.cron !== (0, siCron_1.translateSiCron)(timer.cron, 'volcengine') ||
|
|
300
|
+
source.enable !== timer.enable ||
|
|
301
|
+
(source.payload ?? undefined) !== timer.payload ||
|
|
302
|
+
(source.description ?? undefined) !== timer.description);
|
|
303
|
+
});
|
|
304
|
+
if (extraTimer || desiredChanged) {
|
|
305
|
+
return {
|
|
306
|
+
logicalId,
|
|
307
|
+
action: 'update',
|
|
308
|
+
resourceType: 'VOLCENGINE_VEFAAS',
|
|
309
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
310
|
+
drifted: true,
|
|
311
|
+
driftReasons: ['PLAN_DRIFT_TIMER_TRIGGER'],
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
catch (error) {
|
|
316
|
+
common_1.logger.warn(lang_1.lang.__('PLAN_TIMER_TRIGGER_PROBE_FAILED', {
|
|
317
|
+
functionName: fn.name,
|
|
318
|
+
error: String(error),
|
|
319
|
+
}));
|
|
320
|
+
}
|
|
321
|
+
}
|
|
273
322
|
return { logicalId, action: 'noop', resourceType: 'VOLCENGINE_VEFAAS' };
|
|
274
323
|
}
|
|
275
324
|
catch (error) {
|