@geek-fun/serverlessinsight 0.9.1 → 0.9.3
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 +4 -8
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +3 -8
- 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 +132 -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 +20 -5
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/AGENTS.md +10 -0
- package/CHANGELOG.md +51 -0
- package/README.md +103 -13
- package/README.zh-CN.md +73 -13
- package/codecov +0 -0
- package/codecov.SHA256SUM +1 -0
- package/codecov.SHA256SUM.sig +16 -0
- package/dist/package.json +1 -1
- package/dist/src/commands/index.js +92 -24
- package/dist/src/commands/local.js +16 -3
- package/dist/src/commands/plan.js +31 -4
- package/dist/src/commands/schema.js +24 -0
- package/dist/src/commands/show.js +64 -10
- package/dist/src/commands/validate.js +34 -2
- package/dist/src/common/aliyunClient/apigwOperations.js +17 -1
- package/dist/src/common/aliyunClient/fc3Operations.js +39 -2
- package/dist/src/common/aliyunClient/ossOperations.js +214 -221
- package/dist/src/common/bucketPolicy.js +63 -0
- package/dist/src/common/constants.js +7 -1
- package/dist/src/common/domainUtils.js +4 -1
- package/dist/src/common/functionDefinition.js +25 -0
- package/dist/src/common/index.js +4 -0
- package/dist/src/common/jsonOutput.js +82 -0
- package/dist/src/common/logger.js +6 -3
- package/dist/src/common/nameBuilder.js +3 -1
- package/dist/src/common/noColor.js +9 -0
- package/dist/src/common/planCapabilities.js +119 -0
- package/dist/src/common/planCompare.js +119 -66
- package/dist/src/common/planFormatter.js +34 -20
- package/dist/src/common/planRedaction.js +26 -0
- package/dist/src/common/refreshPlanner.js +66 -21
- package/dist/src/common/siCron.js +415 -0
- package/dist/src/common/stateBackend/saasStateBackend.js +5 -4
- package/dist/src/common/tencentClient/cosOperations.js +326 -322
- package/dist/src/common/tencentClient/scfOperations.js +11 -2
- package/dist/src/common/tencentClient/tdsqlcOperations.js +6 -11
- package/dist/src/common/triggerMapper.js +16 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +82 -0
- package/dist/src/common/volcengineClient/iamOperations.js +27 -3
- package/dist/src/common/volcengineClient/tosOperations.js +62 -56
- package/dist/src/common/volcengineClient/vefaasOperations.js +45 -0
- package/dist/src/lang/en.js +70 -3
- package/dist/src/lang/index.js +36 -1
- package/dist/src/lang/zh-CN.js +70 -3
- package/dist/src/parser/eventParser.js +1 -0
- package/dist/src/parser/functionParser.js +48 -2
- package/dist/src/stack/aliyunStack/apigwExecutor.js +1 -1
- package/dist/src/stack/aliyunStack/apigwPlanner.js +103 -23
- package/dist/src/stack/aliyunStack/apigwResource.js +4 -3
- package/dist/src/stack/aliyunStack/apigwTypes.js +3 -7
- package/dist/src/stack/aliyunStack/deployer.js +2 -0
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +8 -4
- package/dist/src/stack/aliyunStack/fc3Executor.js +7 -3
- package/dist/src/stack/aliyunStack/fc3Planner.js +148 -153
- package/dist/src/stack/aliyunStack/fc3Resource.js +206 -53
- package/dist/src/stack/aliyunStack/fc3Types.js +30 -16
- package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
- package/dist/src/stack/aliyunStack/ossResource.js +113 -102
- package/dist/src/stack/aliyunStack/ossTypes.js +20 -20
- package/dist/src/stack/localStack/aliyunFc.js +1 -6
- package/dist/src/stack/localStack/event.js +31 -71
- package/dist/src/stack/localStack/function.js +25 -77
- package/dist/src/stack/localStack/functionRunner.js +10 -2
- package/dist/src/stack/localStack/httpAdapter.js +54 -0
- package/dist/src/stack/localStack/httpError.js +5 -0
- package/dist/src/stack/localStack/index.js +8 -1
- package/dist/src/stack/localStack/legacyLambda.js +26 -0
- package/dist/src/stack/localStack/localContext.js +29 -0
- package/dist/src/stack/localStack/localRoute.js +12 -0
- package/dist/src/stack/localStack/localRuntimes.js +22 -0
- package/dist/src/stack/localStack/localServer.js +8 -3
- package/dist/src/stack/localStack/requestBody.js +24 -0
- package/dist/src/stack/localStack/requestId.js +18 -0
- package/dist/src/stack/localStack/tencent.js +147 -0
- package/dist/src/stack/localStack/timer.js +183 -0
- package/dist/src/stack/localStack/utils.js +19 -1
- package/dist/src/stack/localStack/volcengine.js +68 -0
- package/dist/src/stack/scfStack/cosPlanner.js +9 -14
- package/dist/src/stack/scfStack/cosResource.js +42 -50
- package/dist/src/stack/scfStack/cosTypes.js +19 -14
- package/dist/src/stack/scfStack/deployer.js +2 -0
- package/dist/src/stack/scfStack/scfExecutor.js +7 -3
- package/dist/src/stack/scfStack/scfHttpTrigger.js +106 -0
- package/dist/src/stack/scfStack/scfPlanner.js +114 -29
- package/dist/src/stack/scfStack/scfResource.js +329 -311
- package/dist/src/stack/scfStack/scfTypes.js +4 -3
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +10 -13
- package/dist/src/stack/volcengineStack/apigwDomains.js +64 -0
- package/dist/src/stack/volcengineStack/apigwPlanner.js +71 -15
- package/dist/src/stack/volcengineStack/apigwResource.js +60 -24
- package/dist/src/stack/volcengineStack/apigwTypes.js +5 -1
- package/dist/src/stack/volcengineStack/deployer.js +6 -0
- package/dist/src/stack/volcengineStack/tosPlanner.js +8 -13
- package/dist/src/stack/volcengineStack/tosResource.js +22 -35
- package/dist/src/stack/volcengineStack/tosTypes.js +5 -8
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +186 -44
- package/dist/src/stack/volcengineStack/vefaasResource.js +232 -14
- package/dist/src/stack/volcengineStack/vefaasTypes.js +6 -3
- 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 +49 -18
- 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 +1 -1
- package/release-notes.md +79 -0
- package/samples/aliyun-poc-timer.yml +39 -0
- package/samples/tencent-local/index.js +13 -0
- package/samples/tencent-local/serverlessinsight.yml +23 -0
- package/samples/volcengine-local/index.js +13 -0
- package/samples/volcengine-local/serverlessinsight.yml +28 -0
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.stopLocalTimers = exports.startLocalTimers = exports.matchesNow = void 0;
|
|
7
|
+
const siCron_1 = require("../../common/siCron");
|
|
8
|
+
const requestId_1 = require("./requestId");
|
|
9
|
+
const localContext_1 = require("./localContext");
|
|
10
|
+
const utils_1 = require("./utils");
|
|
11
|
+
const functionRunner_1 = require("./functionRunner");
|
|
12
|
+
const common_1 = require("../../common");
|
|
13
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
14
|
+
const lang_1 = require("../../lang");
|
|
15
|
+
const timers = [];
|
|
16
|
+
const toSchedule = (cron) => {
|
|
17
|
+
try {
|
|
18
|
+
const parsed = (0, siCron_1.parseSiCron)(cron);
|
|
19
|
+
return parsed.kind === 'every'
|
|
20
|
+
? { kind: 'every', intervalMs: parsed.totalSeconds * 1000 }
|
|
21
|
+
: { kind: 'cron', fields: parsed.fields, hasSeconds: parsed.hasSeconds };
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const matchesField = (field, value) => field.wildcard || field.values.includes(value);
|
|
28
|
+
/** Pure UTC wall-clock match of a cron schedule against a point in time. */
|
|
29
|
+
const matchesNow = (schedule, now) => {
|
|
30
|
+
if (schedule.kind !== 'cron') {
|
|
31
|
+
return false; // @every is interval-driven, not wall-clock driven
|
|
32
|
+
}
|
|
33
|
+
const fields = schedule.fields;
|
|
34
|
+
if (!matchesField(fields.minute, now.getUTCMinutes())) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
if (!matchesField(fields.hour, now.getUTCHours())) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
if (!matchesField(fields.month, now.getUTCMonth() + 1)) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
// standard cron day semantics: both day fields restricted → OR (either may
|
|
44
|
+
// fire); at least one wildcard → the restricted side must match
|
|
45
|
+
const domRestricted = !fields.dayOfMonth.wildcard;
|
|
46
|
+
const dowRestricted = !fields.dayOfWeek.wildcard;
|
|
47
|
+
if (domRestricted && dowRestricted) {
|
|
48
|
+
const domHit = fields.dayOfMonth.values.includes(now.getUTCDate());
|
|
49
|
+
const dowHit = fields.dayOfWeek.values.includes(now.getUTCDay());
|
|
50
|
+
if (!domHit && !dowHit) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
if (domRestricted && !fields.dayOfMonth.values.includes(now.getUTCDate())) {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
if (dowRestricted && !fields.dayOfWeek.values.includes(now.getUTCDay())) {
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (schedule.hasSeconds && !matchesField(fields.second, now.getUTCSeconds())) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
return true;
|
|
66
|
+
};
|
|
67
|
+
exports.matchesNow = matchesNow;
|
|
68
|
+
const buildTimerEvent = (provider, triggerName, payload) => {
|
|
69
|
+
const triggerTime = new Date().toISOString();
|
|
70
|
+
if (provider === common_1.ProviderEnum.ALIYUN) {
|
|
71
|
+
// Aliyun FC timer event — the handler receives a Buffer of this JSON
|
|
72
|
+
return Buffer.from(JSON.stringify({ triggerName, triggerTime, payload }));
|
|
73
|
+
}
|
|
74
|
+
if (provider === common_1.ProviderEnum.VOLCENGINE) {
|
|
75
|
+
// veFaaS timer event — CloudEvents envelope per the provider's trigger
|
|
76
|
+
// event documentation (issue #261). The local trigger name substitutes
|
|
77
|
+
// for the cloud timer id in `source`; the platform id does not exist
|
|
78
|
+
// locally. `datacontenttype` is always `application/octet-stream`.
|
|
79
|
+
return {
|
|
80
|
+
id: (0, requestId_1.generateRequestId)(true),
|
|
81
|
+
source: `/faas/event/timer/${triggerName}`,
|
|
82
|
+
specversion: '1.0',
|
|
83
|
+
time: triggerTime,
|
|
84
|
+
type: 'faas.timer.event',
|
|
85
|
+
datacontenttype: 'application/octet-stream',
|
|
86
|
+
data: payload,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
// Tencent SCF timer event shape (default for other providers)
|
|
90
|
+
return { Type: 'Timer', TriggerName: triggerName, Time: triggerTime, Message: payload };
|
|
91
|
+
};
|
|
92
|
+
const fireTimer = async (iac, fn, triggerName, payload) => {
|
|
93
|
+
if (!fn.code) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
let tempDir = null;
|
|
97
|
+
try {
|
|
98
|
+
const resolved = await (0, utils_1.resolveCodeDir)(fn.code.path);
|
|
99
|
+
tempDir = resolved.tempDir;
|
|
100
|
+
const funOptions = {
|
|
101
|
+
codeDir: resolved.codeDir,
|
|
102
|
+
functionKey: fn.key,
|
|
103
|
+
handler: fn.code.handler,
|
|
104
|
+
servicePath: '',
|
|
105
|
+
timeout: (fn.timeout ?? 3) * 1000,
|
|
106
|
+
};
|
|
107
|
+
const event = buildTimerEvent(iac.provider.name, triggerName, payload);
|
|
108
|
+
// Provider-native context (issues #261, #267): veFaaS handlers get the
|
|
109
|
+
// minimal `{ requestId }` context and SCF handlers the SCF context, rather
|
|
110
|
+
// than the Aliyun serializable context, whose `service`/`tracing`/
|
|
111
|
+
// `credentials` fields mislead provider detection.
|
|
112
|
+
const requestId = (0, requestId_1.generateProviderRequestId)(iac.provider.name);
|
|
113
|
+
const context = (0, localContext_1.buildLocalContext)(iac.provider.name, iac, fn, requestId);
|
|
114
|
+
common_1.logger.info(lang_1.lang.__('LOCAL_TIMER_FIRED', { triggerName, functionName: fn.name }));
|
|
115
|
+
const result = await (0, functionRunner_1.invokeFunction)(funOptions, { ...fn.environment }, event, context);
|
|
116
|
+
common_1.logger.info(lang_1.lang.__('FUNCTION_EXECUTION_RESULT', { result: JSON.stringify(result) }));
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
common_1.logger.error(lang_1.lang.__('FUNCTION_EXECUTION_ERROR', { error: String(error) }));
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
if (tempDir && node_fs_1.default.existsSync(tempDir)) {
|
|
123
|
+
node_fs_1.default.rmSync(tempDir, { recursive: true, force: true });
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
const evaluateTimer = (iac, fn, triggerName, payload, schedule, state) => {
|
|
128
|
+
const now = new Date();
|
|
129
|
+
if (schedule.kind === 'every') {
|
|
130
|
+
if (Date.now() - state.lastFiredAt < schedule.intervalMs) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
state.lastFiredAt = Date.now();
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
// dedup to once per matching second (minute precision without seconds)
|
|
137
|
+
const tickKey = now.toISOString().slice(0, schedule.hasSeconds ? 19 : 16);
|
|
138
|
+
if (tickKey === state.lastTickKey || !(0, exports.matchesNow)(schedule, now)) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
state.lastTickKey = tickKey;
|
|
142
|
+
}
|
|
143
|
+
if (state.running) {
|
|
144
|
+
return; // previous invocation still running — skip this tick
|
|
145
|
+
}
|
|
146
|
+
state.running = true;
|
|
147
|
+
void fireTimer(iac, fn, triggerName, payload).finally(() => {
|
|
148
|
+
state.running = false;
|
|
149
|
+
});
|
|
150
|
+
};
|
|
151
|
+
const startLocalTimers = (iac) => {
|
|
152
|
+
(0, exports.stopLocalTimers)();
|
|
153
|
+
iac.functions?.forEach((fn) => {
|
|
154
|
+
fn.triggers?.timer?.forEach((timer) => {
|
|
155
|
+
if (timer.enable === false) {
|
|
156
|
+
common_1.logger.info(lang_1.lang.__('LOCAL_TIMER_DISABLED', { triggerName: timer.name, functionName: fn.name }));
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
const schedule = toSchedule(timer.cron);
|
|
160
|
+
if (!schedule) {
|
|
161
|
+
// unreachable for validated configs — the parser rejects bad si-cron
|
|
162
|
+
common_1.logger.warn(lang_1.lang.__('LOCAL_TIMER_INVALID_CRON', { triggerName: timer.name, cron: timer.cron }));
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
common_1.logger.info(lang_1.lang.__('LOCAL_TIMER_SCHEDULED', {
|
|
166
|
+
triggerName: timer.name,
|
|
167
|
+
cron: timer.cron,
|
|
168
|
+
functionName: fn.name,
|
|
169
|
+
}));
|
|
170
|
+
const state = { lastTickKey: '', lastFiredAt: Date.now(), running: false };
|
|
171
|
+
const tick = setInterval(() => {
|
|
172
|
+
evaluateTimer(iac, fn, timer.name, timer.payload ?? '', schedule, state);
|
|
173
|
+
}, 1000);
|
|
174
|
+
timers.push(tick);
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
};
|
|
178
|
+
exports.startLocalTimers = startLocalTimers;
|
|
179
|
+
const stopLocalTimers = () => {
|
|
180
|
+
timers.forEach((tick) => clearInterval(tick));
|
|
181
|
+
timers.length = 0;
|
|
182
|
+
};
|
|
183
|
+
exports.stopLocalTimers = stopLocalTimers;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.extractZipFile = void 0;
|
|
6
|
+
exports.resolveCodeDir = exports.extractZipFile = void 0;
|
|
7
7
|
const jszip_1 = __importDefault(require("jszip"));
|
|
8
8
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -34,3 +34,21 @@ const extractZipFile = async (zipPath) => {
|
|
|
34
34
|
return tempDir;
|
|
35
35
|
};
|
|
36
36
|
exports.extractZipFile = extractZipFile;
|
|
37
|
+
/**
|
|
38
|
+
* Resolve the handler directory from a function's configured code path:
|
|
39
|
+
* a zip artifact is extracted to a temp dir, a directory is used as-is,
|
|
40
|
+
* anything else falls back to its parent directory. Returns the temp dir
|
|
41
|
+
* so callers can clean it up after execution.
|
|
42
|
+
*/
|
|
43
|
+
const resolveCodeDir = async (codePath) => {
|
|
44
|
+
const resolved = node_path_1.default.resolve(process.cwd(), codePath);
|
|
45
|
+
if (resolved.endsWith('.zip') && node_fs_1.default.existsSync(resolved)) {
|
|
46
|
+
const tempDir = await (0, exports.extractZipFile)(resolved);
|
|
47
|
+
return { codeDir: tempDir, tempDir };
|
|
48
|
+
}
|
|
49
|
+
if (node_fs_1.default.existsSync(resolved) && node_fs_1.default.statSync(resolved).isDirectory()) {
|
|
50
|
+
return { codeDir: resolved, tempDir: null };
|
|
51
|
+
}
|
|
52
|
+
return { codeDir: node_path_1.default.dirname(resolved), tempDir: null };
|
|
53
|
+
};
|
|
54
|
+
exports.resolveCodeDir = resolveCodeDir;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.volcengineHttpAdapter = exports.createVolcengineContext = void 0;
|
|
4
|
+
const node_http_1 = require("node:http");
|
|
5
|
+
const common_1 = require("../../common");
|
|
6
|
+
const lang_1 = require("../../lang");
|
|
7
|
+
const httpError_1 = require("./httpError");
|
|
8
|
+
const localRuntimes_1 = require("./localRuntimes");
|
|
9
|
+
const requestBody_1 = require("./requestBody");
|
|
10
|
+
const createVolcengineContext = (requestId) => ({ requestId });
|
|
11
|
+
exports.createVolcengineContext = createVolcengineContext;
|
|
12
|
+
const invalidResponse = () => {
|
|
13
|
+
throw (0, httpError_1.createLocalHttpError)(502, lang_1.lang.__('LOCAL_VOLCENGINE_INVALID_RESPONSE'));
|
|
14
|
+
};
|
|
15
|
+
exports.volcengineHttpAdapter = {
|
|
16
|
+
validate: (fn) => {
|
|
17
|
+
if (fn.container || !fn.code || !(0, localRuntimes_1.isLocalNodeRuntime)(common_1.ProviderEnum.VOLCENGINE, fn.code.runtime)) {
|
|
18
|
+
throw (0, httpError_1.createLocalHttpError)(501, lang_1.lang.__('LOCAL_VOLCENGINE_MODE_UNSUPPORTED', { functionName: fn.name }));
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
buildInvocation: async (req, parsed, _iac, fn, requestId) => ({
|
|
22
|
+
event: {
|
|
23
|
+
httpMethod: parsed.method,
|
|
24
|
+
path: parsed.url,
|
|
25
|
+
pathParameters: {},
|
|
26
|
+
queryStringParameters: parsed.query,
|
|
27
|
+
headers: { ...req.headers, 'x-faas-request-id': requestId },
|
|
28
|
+
body: await (0, requestBody_1.readUtf8Body)(req, 'LOCAL_VOLCENGINE_BINARY_UNSUPPORTED'),
|
|
29
|
+
},
|
|
30
|
+
context: (0, exports.createVolcengineContext)(requestId),
|
|
31
|
+
env: { ...fn.environment },
|
|
32
|
+
}),
|
|
33
|
+
transformResponse: (result) => {
|
|
34
|
+
if (result == null) {
|
|
35
|
+
return { statusCode: 200, headers: { 'content-type': 'application/json' }, body: '' };
|
|
36
|
+
}
|
|
37
|
+
if (typeof result !== 'object' || Array.isArray(result))
|
|
38
|
+
return invalidResponse();
|
|
39
|
+
const { statusCode = 200, headers = {}, body = '' } = result;
|
|
40
|
+
if (typeof statusCode !== 'number' ||
|
|
41
|
+
!Number.isInteger(statusCode) ||
|
|
42
|
+
statusCode < 200 ||
|
|
43
|
+
statusCode > 599 ||
|
|
44
|
+
typeof body !== 'string' ||
|
|
45
|
+
!headers ||
|
|
46
|
+
typeof headers !== 'object' ||
|
|
47
|
+
Array.isArray(headers)) {
|
|
48
|
+
return invalidResponse();
|
|
49
|
+
}
|
|
50
|
+
const responseHeaders = Object.fromEntries(Object.entries(headers).map(([key, value]) => {
|
|
51
|
+
if (typeof value !== 'string')
|
|
52
|
+
return invalidResponse();
|
|
53
|
+
try {
|
|
54
|
+
(0, node_http_1.validateHeaderName)(key);
|
|
55
|
+
(0, node_http_1.validateHeaderValue)(key, value);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
return invalidResponse();
|
|
59
|
+
}
|
|
60
|
+
return [key.toLowerCase(), value];
|
|
61
|
+
}));
|
|
62
|
+
return {
|
|
63
|
+
statusCode,
|
|
64
|
+
headers: { 'content-type': 'application/json', ...responseHeaders },
|
|
65
|
+
body,
|
|
66
|
+
};
|
|
67
|
+
},
|
|
68
|
+
};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateBucketPlan = void 0;
|
|
4
|
+
const bucketPolicy_1 = require("../../common/bucketPolicy");
|
|
5
|
+
const types_1 = require("../../types");
|
|
4
6
|
const lang_1 = require("../../lang");
|
|
5
7
|
const tencentClient_1 = require("../../common/tencentClient");
|
|
6
8
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
@@ -8,7 +10,6 @@ const concurrency_1 = require("../../common/concurrency");
|
|
|
8
10
|
const cosTypes_1 = require("./cosTypes");
|
|
9
11
|
const stateManager_1 = require("../../common/stateManager");
|
|
10
12
|
const refreshPlanner_1 = require("../../common/refreshPlanner");
|
|
11
|
-
const planCompare_1 = require("../../common/planCompare");
|
|
12
13
|
const ownershipTag_1 = require("../ownershipTag");
|
|
13
14
|
const planBucketDeletion = (logicalId, definition) => ({
|
|
14
15
|
logicalId,
|
|
@@ -44,20 +45,14 @@ const generateBucketPlan = async (context, state, buckets) => {
|
|
|
44
45
|
resourceName: bucket.name,
|
|
45
46
|
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
46
47
|
})),
|
|
48
|
+
normalizeForDisplay: (definition) => (0, bucketPolicy_1.normalizeBucketPolicyDefinition)(definition, 'tencent'),
|
|
47
49
|
cloudToDefinition: cosTypes_1.cloudCosToDefinition,
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
55
|
-
const remote = await readBucket();
|
|
56
|
-
const cloudPolicy = remote?.Policy;
|
|
57
|
-
return {
|
|
58
|
-
update: (0, planCompare_1.jsonDocumentDiffers)(desiredPolicy, cloudPolicy),
|
|
59
|
-
drifted: true,
|
|
60
|
-
};
|
|
50
|
+
removedDependents: {
|
|
51
|
+
...(0, bucketPolicy_1.removedBucketPolicy)(cosTypes_1.COS_BUCKET_POLICY_INSTANCE_TYPE, currentState, desiredDefinition),
|
|
52
|
+
...(!config.Domain &&
|
|
53
|
+
(currentState?.instances ?? []).some((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME)
|
|
54
|
+
? { domain: currentState?.definition.domain ?? null }
|
|
55
|
+
: {}),
|
|
61
56
|
},
|
|
62
57
|
refresh: context.refresh,
|
|
63
58
|
});
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteBucketResource = exports.updateBucketResource = exports.readBucketResource = exports.createBucketResource = void 0;
|
|
4
|
+
const domainUtils_1 = require("../../common/domainUtils");
|
|
5
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
6
|
+
const bucketPolicy_1 = require("../../common/bucketPolicy");
|
|
7
|
+
const functionDefinition_1 = require("../../common/functionDefinition");
|
|
4
8
|
const types_1 = require("../../types");
|
|
5
9
|
const tencentClient_1 = require("../../common/tencentClient");
|
|
6
10
|
const cosTypes_1 = require("./cosTypes");
|
|
@@ -8,36 +12,21 @@ const common_1 = require("../../common");
|
|
|
8
12
|
const certUtils_1 = require("../../common/certUtils");
|
|
9
13
|
const logger_1 = require("../../common/logger");
|
|
10
14
|
const lang_1 = require("../../lang");
|
|
11
|
-
const
|
|
15
|
+
const domainUtils_2 = require("../../common/domainUtils");
|
|
12
16
|
const ownershipTag_1 = require("../ownershipTag");
|
|
13
17
|
const alreadyExists_1 = require("../alreadyExists");
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (stmt.condition) {
|
|
22
|
-
s.condition = stmt.condition;
|
|
23
|
-
}
|
|
24
|
-
return s;
|
|
25
|
-
};
|
|
26
|
-
const buildCosBucketPolicyJson = (iam) => {
|
|
27
|
-
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
28
|
-
return null;
|
|
29
|
-
return {
|
|
30
|
-
version: '2.0',
|
|
31
|
-
statement: iam.resource.statements.map(toCosStatement),
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
const applyBucketPolicy = async (client, bucket, region) => {
|
|
35
|
-
if (!bucket.iam)
|
|
36
|
-
return;
|
|
18
|
+
const buildCosBucketPolicyJson = (iam) => (0, bucketPolicy_1.buildBucketPolicy)(iam, 'tencent');
|
|
19
|
+
const buildCosPolicyInstance = (context, bucketName) => ({
|
|
20
|
+
sid: (0, common_1.buildSid)('tencent', 'cos-policy', context.stage, bucketName),
|
|
21
|
+
type: cosTypes_1.COS_BUCKET_POLICY_INSTANCE_TYPE,
|
|
22
|
+
id: bucketName,
|
|
23
|
+
});
|
|
24
|
+
const applyBucketPolicy = async (client, bucket, region, owned = false) => {
|
|
37
25
|
const policy = buildCosBucketPolicyJson(bucket.iam);
|
|
38
26
|
if (!policy) {
|
|
39
|
-
|
|
40
|
-
|
|
27
|
+
if (owned || bucket.iam?.resource?.statements !== undefined) {
|
|
28
|
+
await deleteBucketPolicy(client, bucket.name, region);
|
|
29
|
+
}
|
|
41
30
|
return;
|
|
42
31
|
}
|
|
43
32
|
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLYING', { bucketName: bucket.name }));
|
|
@@ -60,7 +49,14 @@ const deleteBucketPolicy = async (client, bucketName, region) => {
|
|
|
60
49
|
}
|
|
61
50
|
};
|
|
62
51
|
const resolveBucketDomainCertificate = (bucket) => {
|
|
63
|
-
const website = bucket.
|
|
52
|
+
const website = bucket.domain
|
|
53
|
+
? {
|
|
54
|
+
domain: bucket.domain.domain_name,
|
|
55
|
+
domain_certificate_id: bucket.domain.certificate_id,
|
|
56
|
+
domain_certificate_body: bucket.domain.certificate_body,
|
|
57
|
+
domain_certificate_private_key: bucket.domain.certificate_private_key,
|
|
58
|
+
}
|
|
59
|
+
: bucket.website;
|
|
64
60
|
if (!website)
|
|
65
61
|
return undefined;
|
|
66
62
|
if (website.domain_certificate_id) {
|
|
@@ -277,10 +273,10 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
277
273
|
buildCosInstanceFromProvider(bucketInfo, sid),
|
|
278
274
|
];
|
|
279
275
|
let cnameInfo;
|
|
280
|
-
if (
|
|
276
|
+
if (config.Domain) {
|
|
281
277
|
const resolved = resolveBucketDomainCertificate(bucket);
|
|
282
|
-
const primaryDomain =
|
|
283
|
-
const wwwBindApex =
|
|
278
|
+
const primaryDomain = config.Domain;
|
|
279
|
+
const wwwBindApex = config.WwwBindApex ?? false;
|
|
284
280
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
285
281
|
domain: primaryDomain,
|
|
286
282
|
bucketName: bucket.name,
|
|
@@ -301,7 +297,7 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
301
297
|
await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
|
|
302
298
|
}
|
|
303
299
|
}
|
|
304
|
-
const wwwDomain = wwwBindApex ? (0,
|
|
300
|
+
const wwwDomain = wwwBindApex ? (0, domainUtils_2.deriveWwwDomain)(primaryDomain) : null;
|
|
305
301
|
if (wwwDomain) {
|
|
306
302
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
307
303
|
domain: wwwDomain,
|
|
@@ -332,6 +328,9 @@ const createBucketResource = async (context, bucket, state) => {
|
|
|
332
328
|
}
|
|
333
329
|
// Apply IAM bucket policy if configured
|
|
334
330
|
await applyBucketPolicy(client, bucket, context.region);
|
|
331
|
+
if (buildCosBucketPolicyJson(bucket.iam)) {
|
|
332
|
+
instances.push(buildCosPolicyInstance(context, bucket.name));
|
|
333
|
+
}
|
|
335
334
|
const resourceState = {
|
|
336
335
|
mode: 'managed',
|
|
337
336
|
region: context.region,
|
|
@@ -374,10 +373,10 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
374
373
|
const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
|
|
375
374
|
const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
|
|
376
375
|
const existingWwwDnsInstance = existingDnsInstances?.find((i) => i.isWwwVariant);
|
|
377
|
-
if (
|
|
378
|
-
const primaryDomain =
|
|
379
|
-
const wwwBindApex = bucket.website.www_bind_apex ?? false;
|
|
376
|
+
if (config.Domain) {
|
|
377
|
+
const primaryDomain = config.Domain;
|
|
380
378
|
const domainChanged = existingPrimaryDnsInstance?.domain !== primaryDomain;
|
|
379
|
+
const wwwAction = (0, domainUtils_1.resolveWwwBindingAction)(config.WwwBindApex);
|
|
381
380
|
if (domainChanged && existingDnsInstances) {
|
|
382
381
|
for (const instance of existingDnsInstances) {
|
|
383
382
|
await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
|
|
@@ -404,7 +403,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
404
403
|
await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
|
|
405
404
|
}
|
|
406
405
|
}
|
|
407
|
-
const wwwDomain =
|
|
406
|
+
const wwwDomain = wwwAction === 'ensure' ? (0, domainUtils_2.deriveWwwDomain)(primaryDomain) : null;
|
|
408
407
|
if (wwwDomain) {
|
|
409
408
|
logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
|
|
410
409
|
domain: wwwDomain,
|
|
@@ -428,7 +427,7 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
428
427
|
}
|
|
429
428
|
}
|
|
430
429
|
}
|
|
431
|
-
else if (existingWwwDnsInstance && !
|
|
430
|
+
else if (existingWwwDnsInstance && !domainChanged && wwwAction === 'remove') {
|
|
432
431
|
await client.cos.unbindCustomDomain(bucket.name, existingWwwDnsInstance.domain, existingWwwDnsInstance.dnsRecordId);
|
|
433
432
|
}
|
|
434
433
|
const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
|
|
@@ -436,27 +435,20 @@ const updateBucketResource = async (context, bucket, state) => {
|
|
|
436
435
|
instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
|
|
437
436
|
}
|
|
438
437
|
}
|
|
439
|
-
else
|
|
440
|
-
for (const instance of existingDnsInstances) {
|
|
438
|
+
else {
|
|
439
|
+
for (const instance of existingDnsInstances ?? []) {
|
|
441
440
|
await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
|
|
442
441
|
}
|
|
443
442
|
}
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
if (newPolicyJson !== (oldPolicyJson ?? null)) {
|
|
449
|
-
if (newPolicyJson) {
|
|
450
|
-
await applyBucketPolicy(client, bucket, context.region);
|
|
451
|
-
}
|
|
452
|
-
else {
|
|
453
|
-
await deleteBucketPolicy(client, config.Bucket, context.region);
|
|
454
|
-
}
|
|
443
|
+
const policyOwned = (0, bucketPolicy_1.isOwnedBucketPolicy)(cosTypes_1.COS_BUCKET_POLICY_INSTANCE_TYPE, existingState?.instances, existingState?.definition);
|
|
444
|
+
await applyBucketPolicy(client, bucket, context.region, policyOwned);
|
|
445
|
+
if (buildCosBucketPolicyJson(bucket.iam)) {
|
|
446
|
+
instances.push(buildCosPolicyInstance(context, bucket.name));
|
|
455
447
|
}
|
|
456
448
|
const resourceState = {
|
|
457
449
|
mode: 'managed',
|
|
458
450
|
region: context.region,
|
|
459
|
-
definition,
|
|
451
|
+
definition: (0, functionDefinition_1.withLifecycleIntent)((0, planCompare_1.mergeManagedIntent)(existingState?.definition ?? {}, definition), definition, ['policy']),
|
|
460
452
|
instances,
|
|
461
453
|
lastUpdated: new Date().toISOString(),
|
|
462
454
|
};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cloudCosToDefinition = exports.extractCosBucketDefinition = exports.bucketToCosBucketConfig = void 0;
|
|
3
|
+
exports.cloudCosToDefinition = exports.extractCosBucketDefinition = exports.bucketToCosBucketConfig = exports.COS_BUCKET_POLICY_INSTANCE_TYPE = void 0;
|
|
4
|
+
const bucketPolicy_1 = require("../../common/bucketPolicy");
|
|
5
|
+
exports.COS_BUCKET_POLICY_INSTANCE_TYPE = 'TENCENT_COS_BUCKET_POLICY';
|
|
4
6
|
const bucketToCosBucketConfig = (bucket, region) => {
|
|
5
7
|
const config = {
|
|
6
8
|
Bucket: bucket.name,
|
|
@@ -45,6 +47,14 @@ const bucketToCosBucketConfig = (bucket, region) => {
|
|
|
45
47
|
config.DomainProtocol = bucket.website.domain_protocol;
|
|
46
48
|
}
|
|
47
49
|
}
|
|
50
|
+
if (bucket.domain) {
|
|
51
|
+
config.Domain = bucket.domain.domain_name;
|
|
52
|
+
config.WwwBindApex = bucket.domain.www_bind_apex ?? false;
|
|
53
|
+
config.DomainCertificateId = bucket.domain.certificate_id;
|
|
54
|
+
config.DomainCertificateBody = bucket.domain.certificate_body;
|
|
55
|
+
config.DomainCertificatePrivateKey = bucket.domain.certificate_private_key;
|
|
56
|
+
config.DomainProtocol = bucket.domain.protocol;
|
|
57
|
+
}
|
|
48
58
|
if (bucket.versioning?.status) {
|
|
49
59
|
config.VersioningStatus = bucket.versioning.status;
|
|
50
60
|
}
|
|
@@ -57,11 +67,6 @@ const bucketToCosBucketConfig = (bucket, region) => {
|
|
|
57
67
|
return config;
|
|
58
68
|
};
|
|
59
69
|
exports.bucketToCosBucketConfig = bucketToCosBucketConfig;
|
|
60
|
-
const serializeBucketPolicy = (iam) => {
|
|
61
|
-
if (!iam?.resource?.statements || iam.resource.statements.length === 0)
|
|
62
|
-
return null;
|
|
63
|
-
return JSON.stringify(iam);
|
|
64
|
-
};
|
|
65
70
|
const extractCosBucketDefinition = (config) => {
|
|
66
71
|
return {
|
|
67
72
|
bucket: config.Bucket,
|
|
@@ -74,7 +79,7 @@ const extractCosBucketDefinition = (config) => {
|
|
|
74
79
|
}
|
|
75
80
|
: {},
|
|
76
81
|
domain: config.Domain ?? null,
|
|
77
|
-
wwwBindApex: config.WwwBindApex ?? false,
|
|
82
|
+
wwwBindApex: config.Domain ? (config.WwwBindApex ?? false) : null,
|
|
78
83
|
domainCertificateId: config.DomainCertificateId ?? null,
|
|
79
84
|
domainCertificateBody: config.DomainCertificateBody ?? null,
|
|
80
85
|
domainCertificatePrivateKey: config.DomainCertificatePrivateKey ? '(managed)' : null,
|
|
@@ -82,7 +87,7 @@ const extractCosBucketDefinition = (config) => {
|
|
|
82
87
|
versioningStatus: config.VersioningStatus ?? null,
|
|
83
88
|
sseAlgorithm: config.SseAlgorithm ?? null,
|
|
84
89
|
sseKmsMasterKeyId: config.SseKmsMasterKeyId ?? null,
|
|
85
|
-
policy: serializeBucketPolicy(config.IamPolicy),
|
|
90
|
+
policy: (0, bucketPolicy_1.serializeBucketPolicy)(config.IamPolicy, 'tencent'),
|
|
86
91
|
};
|
|
87
92
|
};
|
|
88
93
|
exports.extractCosBucketDefinition = extractCosBucketDefinition;
|
|
@@ -90,10 +95,10 @@ exports.extractCosBucketDefinition = extractCosBucketDefinition;
|
|
|
90
95
|
// Mirrors the executor write shape key-for-key. Not refreshable (omitted so
|
|
91
96
|
// they can never phantom-drift): region (cloud Location uses a different
|
|
92
97
|
// format), domain/wwwBindApex/domainCertificate*/domainProtocol (GetBucket
|
|
93
|
-
// returns none of these)
|
|
94
|
-
// comparison against the serialized desired document would false-drift).
|
|
98
|
+
// returns none of these). Policies use the shared canonical provider-document comparison.
|
|
95
99
|
const cloudCosToDefinition = (info) => ({
|
|
96
100
|
bucket: info.Name,
|
|
101
|
+
policy: info.Policy,
|
|
97
102
|
...(info.ACL !== undefined ? { acl: info.ACL } : {}),
|
|
98
103
|
...(info.WebsiteConfiguration
|
|
99
104
|
? {
|
|
@@ -102,15 +107,15 @@ const cloudCosToDefinition = (info) => ({
|
|
|
102
107
|
errorDocument: info.WebsiteConfiguration.ErrorDocument?.Key ?? null,
|
|
103
108
|
},
|
|
104
109
|
}
|
|
105
|
-
: {}),
|
|
110
|
+
: { websiteConfiguration: info.WebsiteConfiguration }),
|
|
106
111
|
...(info.VersioningConfiguration?.status !== undefined
|
|
107
112
|
? { versioningStatus: info.VersioningConfiguration.status }
|
|
108
|
-
: {}),
|
|
113
|
+
: { versioningStatus: info.VersioningConfiguration === undefined ? undefined : null }),
|
|
109
114
|
...(info.SseConfiguration?.sseAlgorithm !== undefined
|
|
110
115
|
? { sseAlgorithm: info.SseConfiguration.sseAlgorithm }
|
|
111
|
-
: {}),
|
|
116
|
+
: { sseAlgorithm: info.SseConfiguration === undefined ? undefined : null }),
|
|
112
117
|
...(info.SseConfiguration?.sseKmsMasterKeyId !== undefined
|
|
113
118
|
? { sseKmsMasterKeyId: info.SseConfiguration.sseKmsMasterKeyId }
|
|
114
|
-
: {}),
|
|
119
|
+
: { sseKmsMasterKeyId: info.SseConfiguration === undefined ? undefined : null }),
|
|
115
120
|
});
|
|
116
121
|
exports.cloudCosToDefinition = cloudCosToDefinition;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deployTencentStack = void 0;
|
|
4
|
+
const refreshPlanner_1 = require("../../common/refreshPlanner");
|
|
4
5
|
const common_1 = require("../../common");
|
|
5
6
|
const lang_1 = require("../../lang");
|
|
6
7
|
const scfPlanner_1 = require("./scfPlanner");
|
|
@@ -56,6 +57,7 @@ const deployTencentStack = async (iac, backend, approvedPlan) => {
|
|
|
56
57
|
? [...approvedPlan.items]
|
|
57
58
|
: [...functionPlan.items, ...bucketPlan.items, ...databasePlan.items, ...esPlan.items],
|
|
58
59
|
};
|
|
60
|
+
state = (0, refreshPlanner_1.applyPlanStateUpdates)(state, combinedPlan.items);
|
|
59
61
|
common_1.logger.info(`${lang_1.lang.__('PLAN_GENERATED')}: ${combinedPlan.items.length} ${lang_1.lang.__('ACTIONS')}`);
|
|
60
62
|
combinedPlan.items.forEach((item) => {
|
|
61
63
|
common_1.logger.info(lang_1.lang.__('EXECUTION_PLAN_ITEM', {
|
|
@@ -13,11 +13,15 @@ const executeCreateAction = async (context, fn, currentState) => {
|
|
|
13
13
|
common_1.logger.info(lang_1.lang.__('RESOURCE_CREATED', { resourceType: 'function', name: fn.name }));
|
|
14
14
|
return newState;
|
|
15
15
|
};
|
|
16
|
-
const executeUpdateAction = async (context, fn, currentState, drifted) => {
|
|
16
|
+
const executeUpdateAction = async (context, fn, currentState, drifted, driftReasons) => {
|
|
17
17
|
common_1.logger.info(lang_1.lang.__('UPDATING_RESOURCE', { resourceType: 'function', name: fn.name }));
|
|
18
18
|
// A drifted plan item means the cloud left the config: force the config
|
|
19
19
|
// re-push even when state-vs-desired sees no change.
|
|
20
|
-
const newState = await (0, scfResource_1.updateResource)(context, fn, currentState, {
|
|
20
|
+
const newState = await (0, scfResource_1.updateResource)(context, fn, currentState, {
|
|
21
|
+
force: drifted === true,
|
|
22
|
+
...(driftReasons?.includes('PLAN_DRIFT_HTTP_TRIGGER') ? { repairHttp: true } : {}),
|
|
23
|
+
...(driftReasons?.includes('PLAN_DRIFT_FUNCTION_DOMAIN') ? { repairDomain: true } : {}),
|
|
24
|
+
});
|
|
21
25
|
common_1.logger.info(lang_1.lang.__('RESOURCE_UPDATED', { resourceType: 'function', name: fn.name }));
|
|
22
26
|
return newState;
|
|
23
27
|
};
|
|
@@ -44,7 +48,7 @@ const executeSingleItem = async (context, item, functionsMap, currentState) => {
|
|
|
44
48
|
if (!fn) {
|
|
45
49
|
throw new Error(lang_1.lang.__('RESOURCE_FUNCTION_NOT_FOUND', { logicalId: item.logicalId }));
|
|
46
50
|
}
|
|
47
|
-
return executeUpdateAction(context, fn, currentState, item.drifted);
|
|
51
|
+
return executeUpdateAction(context, fn, currentState, item.drifted, item.driftReasons);
|
|
48
52
|
}
|
|
49
53
|
case 'delete': {
|
|
50
54
|
const state = (0, stateManager_1.getResource)(currentState, item.logicalId);
|