@geek-fun/serverlessinsight 0.8.9 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +1 -1
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +123 -0
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +4 -4
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +93 -0
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +148 -0
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/CHANGELOG.md +29 -0
- package/README.md +2 -2
- package/README.zh-CN.md +2 -2
- package/dist/package.json +2 -2
- package/dist/src/commands/deploy.js +12 -4
- package/dist/src/commands/destroy.js +8 -2
- package/dist/src/commands/forceUnlock.js +5 -5
- package/dist/src/commands/index.js +114 -53
- package/dist/src/commands/login.js +12 -1
- package/dist/src/commands/migrate.js +287 -0
- package/dist/src/commands/plan.js +7 -1
- package/dist/src/commands/show.js +37 -25
- package/dist/src/common/aliyunClient/apigwOperations.js +4 -4
- package/dist/src/common/aliyunClient/ecsOperations.js +22 -13
- package/dist/src/common/aliyunClient/fc3Operations.js +12 -3
- package/dist/src/common/aliyunClient/nasOperations.js +4 -3
- package/dist/src/common/aliyunClient/ossOperations.js +52 -8
- package/dist/src/common/aliyunClient/slsOperations.js +3 -2
- package/dist/src/common/aliyunClient/tablestoreOperations.js +22 -11
- package/dist/src/common/apiClient.js +22 -5
- package/dist/src/common/context.js +5 -4
- package/dist/src/common/lockManager.js +1 -1
- package/dist/src/common/migrationMarker.js +34 -0
- package/dist/src/common/nameBuilder.js +13 -1
- package/dist/src/common/planCompare.js +31 -1
- package/dist/src/common/planFormatter.js +69 -54
- package/dist/src/common/refreshPlanner.js +31 -8
- package/dist/src/common/runtimeMapper.js +7 -3
- package/dist/src/common/stateBackend/cosStateBackend.js +1 -1
- package/dist/src/common/stateBackend/index.js +5 -2
- package/dist/src/common/stateBackend/localStateBackend.js +8 -2
- package/dist/src/common/stateBackend/ossStateBackend.js +1 -1
- package/dist/src/common/stateBackend/remoteStateBackend.js +19 -2
- package/dist/src/common/stateBackend/saasStateBackend.js +83 -5
- package/dist/src/common/stateManager.js +56 -5
- package/dist/src/common/tencentClient/cosOperations.js +1 -1
- package/dist/src/common/tencentClient/scfOperations.js +2 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +2 -2
- package/dist/src/common/volcengineClient/index.js +6 -2
- package/dist/src/common/volcengineClient/vefaasOperations.js +3 -3
- package/dist/src/lang/en.js +231 -7
- package/dist/src/lang/zh-CN.js +230 -7
- package/dist/src/parser/index.js +1 -1
- package/dist/src/stack/aliyunStack/apigwExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/apigwPlanner.js +26 -5
- package/dist/src/stack/aliyunStack/apigwResource.js +22 -10
- package/dist/src/stack/aliyunStack/databaseExecutor.js +5 -5
- package/dist/src/stack/aliyunStack/databasePlanner.js +8 -3
- package/dist/src/stack/aliyunStack/databaseResource.js +28 -12
- package/dist/src/stack/aliyunStack/deployer.js +30 -13
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/aliyunStack/fc3Executor.js +2 -2
- package/dist/src/stack/aliyunStack/fc3Planner.js +46 -25
- package/dist/src/stack/aliyunStack/fc3Resource.js +80 -31
- package/dist/src/stack/aliyunStack/ossExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/ossPlanner.js +6 -1
- package/dist/src/stack/aliyunStack/ossResource.js +14 -3
- package/dist/src/stack/aliyunStack/rdsTypes.js +5 -1
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +2 -2
- package/dist/src/stack/aliyunStack/tablestorePlanner.js +2 -1
- package/dist/src/stack/aliyunStack/tablestoreResource.js +5 -4
- package/dist/src/stack/aliyunStack/tablestoreTypes.js +3 -2
- package/dist/src/stack/deploy.js +12 -7
- package/dist/src/stack/localStack/functionRunner.js +5 -4
- package/dist/src/stack/scfStack/cosExecutor.js +2 -2
- package/dist/src/stack/scfStack/cosPlanner.js +6 -1
- package/dist/src/stack/scfStack/cosResource.js +8 -4
- package/dist/src/stack/scfStack/deployer.js +21 -6
- package/dist/src/stack/scfStack/esServerlessExecutor.js +5 -5
- package/dist/src/stack/scfStack/esServerlessPlanner.js +6 -1
- package/dist/src/stack/scfStack/esServerlessResource.js +12 -4
- package/dist/src/stack/scfStack/esServerlessTypes.js +2 -1
- package/dist/src/stack/scfStack/scfExecutor.js +2 -2
- package/dist/src/stack/scfStack/scfPlanner.js +26 -27
- package/dist/src/stack/scfStack/scfResource.js +38 -13
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +5 -5
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +6 -1
- package/dist/src/stack/scfStack/tdsqlcResource.js +12 -4
- package/dist/src/stack/volcengineStack/apigwExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/apigwPlanner.js +5 -1
- package/dist/src/stack/volcengineStack/apigwResource.js +7 -4
- package/dist/src/stack/volcengineStack/deployer.js +15 -4
- package/dist/src/stack/volcengineStack/tosExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/tosPlanner.js +6 -1
- package/dist/src/stack/volcengineStack/tosResource.js +11 -4
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +2 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +39 -11
- package/dist/src/stack/volcengineStack/vefaasResource.js +11 -3
- package/dist/src/validator/rootSchema.js +29 -2
- package/dist/src/validator/semanticValidation.js +24 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.generateBucketPlan = void 0;
|
|
7
7
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
+
const lang_1 = require("../../lang");
|
|
8
9
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
9
10
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
10
11
|
const concurrency_1 = require("../../common/concurrency");
|
|
@@ -52,7 +53,11 @@ const generateBucketPlan = async (context, state, buckets) => {
|
|
|
52
53
|
desiredDefinition,
|
|
53
54
|
read: () => (0, refreshCache_1.cachedRefreshRead)(context, `tos.getBucket:${bucket.name}`, () => client.tos.getBucket(bucket.name)),
|
|
54
55
|
isOwned: (remote) => (0, ownershipTag_1.isOwnedByStack)(context, logicalId, remote.Tags),
|
|
55
|
-
foreignError: () => new Error(
|
|
56
|
+
foreignError: () => new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED', {
|
|
57
|
+
resourceType: 'Bucket',
|
|
58
|
+
resourceName: bucket.name,
|
|
59
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
60
|
+
})),
|
|
56
61
|
cloudToDefinition: tosTypes_1.cloudTosToDefinition,
|
|
57
62
|
extraUpdate: async () => {
|
|
58
63
|
// Policy needs a canonical compare: the cloud returns a parsed
|
|
@@ -64,7 +64,10 @@ const createResource = async (context, bucket, state) => {
|
|
|
64
64
|
const isTainted = existingResourceState?.status === 'tainted';
|
|
65
65
|
const existingBucketOnRetry = isTainted ? await client.tos.getBucket(bucket.name) : null;
|
|
66
66
|
if (existingBucketOnRetry) {
|
|
67
|
-
logger_1.logger.info(
|
|
67
|
+
logger_1.logger.info(lang_1.lang.__('TAINTED_RECOVERY_SKIP_CREATE', {
|
|
68
|
+
resourceType: 'Bucket',
|
|
69
|
+
resourceName: bucket.name,
|
|
70
|
+
}));
|
|
68
71
|
}
|
|
69
72
|
const taintedResourceState = {
|
|
70
73
|
mode: 'managed',
|
|
@@ -102,7 +105,7 @@ const createResource = async (context, bucket, state) => {
|
|
|
102
105
|
if (!(0, alreadyExists_1.isResourceAlreadyExistsError)(error, ['BucketAlreadyExists'])) {
|
|
103
106
|
throw error;
|
|
104
107
|
}
|
|
105
|
-
logger_1.logger.info(
|
|
108
|
+
logger_1.logger.info(lang_1.lang.__('OWNERSHIP_VERIFYING', { resourceType: 'Bucket', resourceName: bucket.name }));
|
|
106
109
|
}
|
|
107
110
|
// CreateBucket succeeding does NOT prove the bucket is ours: a pre-existing
|
|
108
111
|
// bucket is returned idempotently. Only a bucket carrying our ownership tag
|
|
@@ -110,10 +113,14 @@ const createResource = async (context, bucket, state) => {
|
|
|
110
113
|
// fail loudly rather than be silently taken over.
|
|
111
114
|
const probe = await client.tos.getBucket(bucket.name);
|
|
112
115
|
if (!probe) {
|
|
113
|
-
throw new Error(
|
|
116
|
+
throw new Error(lang_1.lang.__('REFRESH_STATE_BUCKET', { name: bucket.name }));
|
|
114
117
|
}
|
|
115
118
|
if (!(0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.Tags)) {
|
|
116
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
119
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
120
|
+
resourceType: 'Bucket',
|
|
121
|
+
resourceName: bucket.name,
|
|
122
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
123
|
+
})));
|
|
117
124
|
}
|
|
118
125
|
bucketInfo = probe;
|
|
119
126
|
}
|
|
@@ -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
|
}
|
|
@@ -5,6 +5,7 @@ const common_1 = require("../../common");
|
|
|
5
5
|
const stateManager_1 = require("../../common/stateManager");
|
|
6
6
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
7
7
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
8
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
8
9
|
const concurrency_1 = require("../../common/concurrency");
|
|
9
10
|
const vefaasTypes_1 = require("./vefaasTypes");
|
|
10
11
|
const vefaasResource_1 = require("./vefaasResource");
|
|
@@ -89,7 +90,11 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
89
90
|
const client = (0, volcengineClient_1.createVolcengineClient)(context);
|
|
90
91
|
const remoteFunction = await (0, refreshCache_1.cachedRefreshRead)(context, `vefaas.getFunction:${fn.name}`, () => client.vefaas.getFunction(fn.name));
|
|
91
92
|
if (remoteFunction && !(0, ownershipTag_1.isOwnedByStack)(context, logicalId, remoteFunction.Tags)) {
|
|
92
|
-
throw new Error(
|
|
93
|
+
throw new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED', {
|
|
94
|
+
resourceType: 'Function',
|
|
95
|
+
resourceName: fn.name,
|
|
96
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
97
|
+
}));
|
|
93
98
|
}
|
|
94
99
|
return {
|
|
95
100
|
logicalId,
|
|
@@ -131,6 +136,11 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
131
136
|
// function's actual attributes (runtime/handler/memory/timeout/env)
|
|
132
137
|
// against the desired definition. Console edits would otherwise go
|
|
133
138
|
// undetected — definitionChanged only sees local-vs-desired.
|
|
139
|
+
// One-directional desired-declared contract (issue #246 fix: this
|
|
140
|
+
// planner previously used a full two-directional equality, so
|
|
141
|
+
// cloud-only values within mapped keys phantom-drifted every plan).
|
|
142
|
+
// Mapper-emitted shapes are subset-normalized to the definition the
|
|
143
|
+
// config writes, so nested comparisons stay apples-to-apples.
|
|
134
144
|
// Not refreshable (issue #234 phase 2): the IAM custom policy document
|
|
135
145
|
// (volcengine IAM has no GetPolicy read) and dependent TLS topics
|
|
136
146
|
// (existence-only by design decision 5) stay covered by the executor's
|
|
@@ -140,25 +150,34 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
140
150
|
handler: remoteFunction.handler,
|
|
141
151
|
memorySize: remoteFunction.memoryMb,
|
|
142
152
|
timeout: remoteFunction.requestTimeout,
|
|
143
|
-
environment: remoteFunction.environmentVariables,
|
|
153
|
+
environment: remoteFunction.environmentVariables ?? {},
|
|
144
154
|
// Provider responses carry `null` for unset fields while the desired
|
|
145
155
|
// definition carries `undefined` — normalize null → undefined so the
|
|
146
156
|
// comparison ignores the representation difference.
|
|
147
157
|
description: remoteFunction.description ?? undefined,
|
|
148
158
|
role: remoteFunction.role ?? undefined,
|
|
149
|
-
vpcConfig: remoteFunction.vpcConfig
|
|
159
|
+
vpcConfig: remoteFunction.vpcConfig
|
|
160
|
+
? {
|
|
161
|
+
vpcId: remoteFunction.vpcConfig.vpcId ?? undefined,
|
|
162
|
+
subnetIds: remoteFunction.vpcConfig.subnetIds ?? [],
|
|
163
|
+
securityGroupIds: remoteFunction.vpcConfig.securityGroupIds ?? [],
|
|
164
|
+
}
|
|
165
|
+
: undefined,
|
|
150
166
|
logConfig: remoteFunction.logConfig
|
|
151
167
|
? { project: remoteFunction.logConfig.project, topic: remoteFunction.logConfig.topic }
|
|
152
168
|
: undefined,
|
|
153
169
|
};
|
|
154
|
-
const
|
|
155
|
-
|
|
170
|
+
const remoteDiffers = (0, planCompare_1.remoteDiffersFromDesired)(remoteAttributes, desiredDefinition);
|
|
171
|
+
const liveBefore = (0, planCompare_1.mergeLiveBefore)(currentDefinition, remoteAttributes);
|
|
172
|
+
const revertKeys = (0, planCompare_1.computeRevertKeys)(currentDefinition, remoteAttributes, desiredDefinition);
|
|
173
|
+
if (definitionChanged || remoteDiffers) {
|
|
156
174
|
return {
|
|
157
175
|
logicalId,
|
|
158
176
|
action: 'update',
|
|
159
177
|
resourceType: 'VOLCENGINE_VEFAAS',
|
|
160
|
-
changes: { before:
|
|
178
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
161
179
|
drifted: true,
|
|
180
|
+
...(revertKeys.length ? { revertKeys } : {}),
|
|
162
181
|
};
|
|
163
182
|
}
|
|
164
183
|
// Issue #234 phase 3: live role drift — trust policy and attached
|
|
@@ -175,8 +194,9 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
175
194
|
logicalId,
|
|
176
195
|
action: 'update',
|
|
177
196
|
resourceType: 'VOLCENGINE_VEFAAS',
|
|
178
|
-
changes: { before:
|
|
197
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
179
198
|
drifted: true,
|
|
199
|
+
driftReasons: ['PLAN_DRIFT_ROLE_MISSING'],
|
|
180
200
|
};
|
|
181
201
|
}
|
|
182
202
|
let cloudTrust;
|
|
@@ -192,8 +212,9 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
192
212
|
logicalId,
|
|
193
213
|
action: 'update',
|
|
194
214
|
resourceType: 'VOLCENGINE_VEFAAS',
|
|
195
|
-
changes: { before:
|
|
215
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
196
216
|
drifted: true,
|
|
217
|
+
driftReasons: ['PLAN_DRIFT_ROLE_POLICY'],
|
|
197
218
|
};
|
|
198
219
|
}
|
|
199
220
|
const desiredManaged = (fn.iam?.role?.managed_policies ?? []).map((arn) => arn.split('/').pop() ?? '');
|
|
@@ -205,8 +226,9 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
205
226
|
logicalId,
|
|
206
227
|
action: 'update',
|
|
207
228
|
resourceType: 'VOLCENGINE_VEFAAS',
|
|
208
|
-
changes: { before:
|
|
229
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
209
230
|
drifted: true,
|
|
231
|
+
driftReasons: ['PLAN_DRIFT_ROLE_POLICY'],
|
|
210
232
|
};
|
|
211
233
|
}
|
|
212
234
|
}
|
|
@@ -233,8 +255,9 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
233
255
|
logicalId,
|
|
234
256
|
action: 'update',
|
|
235
257
|
resourceType: 'VOLCENGINE_VEFAAS',
|
|
236
|
-
changes: { before:
|
|
258
|
+
changes: { before: liveBefore, after: desiredDefinition },
|
|
237
259
|
drifted: true,
|
|
260
|
+
driftReasons: ['PLAN_DRIFT_TLS_TOPIC'],
|
|
238
261
|
};
|
|
239
262
|
}
|
|
240
263
|
}
|
|
@@ -249,7 +272,11 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
249
272
|
}
|
|
250
273
|
return { logicalId, action: 'noop', resourceType: 'VOLCENGINE_VEFAAS' };
|
|
251
274
|
}
|
|
252
|
-
catch {
|
|
275
|
+
catch (error) {
|
|
276
|
+
common_1.logger.warn(lang_1.lang.__('PLAN_LIVE_READ_FAILED', {
|
|
277
|
+
logicalId,
|
|
278
|
+
error: error instanceof Error ? error.message : String(error),
|
|
279
|
+
}));
|
|
253
280
|
return {
|
|
254
281
|
logicalId,
|
|
255
282
|
action: 'create',
|
|
@@ -258,6 +285,7 @@ const generateFunctionPlan = async (context, state, functions) => {
|
|
|
258
285
|
before: currentState.definition,
|
|
259
286
|
after: desiredDefinition,
|
|
260
287
|
},
|
|
288
|
+
drifted: true,
|
|
261
289
|
};
|
|
262
290
|
}
|
|
263
291
|
});
|
|
@@ -271,7 +271,7 @@ const deleteDependentResources = async (context, instances) => {
|
|
|
271
271
|
case 'VOLCENGINE_IAM_ROLE': {
|
|
272
272
|
const attrs = instance.attributes;
|
|
273
273
|
if (attrs?.external === true) {
|
|
274
|
-
logger_1.logger.info(
|
|
274
|
+
logger_1.logger.info(lang_1.lang.__('VOLC_EXTERNAL_ROLE_SKIP_DELETE', { roleName: instance.id }));
|
|
275
275
|
break;
|
|
276
276
|
}
|
|
277
277
|
logger_1.logger.info(lang_1.lang.__('DELETING_IAM_ROLE', { id: instance.id }));
|
|
@@ -374,10 +374,18 @@ const createResource = async (context, fn, state) => {
|
|
|
374
374
|
// a resource that was never ours).
|
|
375
375
|
const probe = await client.vefaas.getFunction(fn.name);
|
|
376
376
|
if (probe && (0, ownershipTag_1.isOwnedByStack)(context, logicalId, probe.Tags)) {
|
|
377
|
-
logger_1.logger.info(
|
|
377
|
+
logger_1.logger.info(lang_1.lang.__('RESOURCE_OWNERSHIP_TAG_ADOPT', {
|
|
378
|
+
resourceType: 'Function',
|
|
379
|
+
name: fn.name,
|
|
380
|
+
tag: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
381
|
+
}));
|
|
378
382
|
}
|
|
379
383
|
else {
|
|
380
|
-
throw new types_1.PartialResourceError(stateAfterDependents, new Error(
|
|
384
|
+
throw new types_1.PartialResourceError(stateAfterDependents, new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED_ADOPT', {
|
|
385
|
+
resourceType: 'Function',
|
|
386
|
+
resourceName: fn.name,
|
|
387
|
+
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
388
|
+
})));
|
|
381
389
|
}
|
|
382
390
|
}
|
|
383
391
|
else {
|
|
@@ -87,6 +87,10 @@ exports.rootSchema = {
|
|
|
87
87
|
],
|
|
88
88
|
},
|
|
89
89
|
service: { type: 'string', pattern: '^[a-z][a-z0-9-]*$' },
|
|
90
|
+
// Target Console org (organizations.slug). Optional — required only when an
|
|
91
|
+
// explicit SaaS state backend is declared (allOf branch below); with
|
|
92
|
+
// LOCAL/BUCKET_STORE backends it is allowed but inert (decision D-6).
|
|
93
|
+
org: { type: 'string', pattern: '^[a-z0-9][a-z0-9-]*$' },
|
|
90
94
|
vars: {
|
|
91
95
|
type: 'object',
|
|
92
96
|
additionalProperties: {
|
|
@@ -131,7 +135,7 @@ exports.rootSchema = {
|
|
|
131
135
|
state_manager: {
|
|
132
136
|
type: 'object',
|
|
133
137
|
properties: {
|
|
134
|
-
type: { type: 'string', enum: ['LOCAL', 'BUCKET_STORE'] },
|
|
138
|
+
type: { type: 'string', enum: ['LOCAL', 'BUCKET_STORE', 'SAAS'] },
|
|
135
139
|
bucket: { type: 'string' },
|
|
136
140
|
key: { type: 'string' },
|
|
137
141
|
},
|
|
@@ -144,5 +148,28 @@ exports.rootSchema = {
|
|
|
144
148
|
},
|
|
145
149
|
required: ['version', 'provider', 'app', 'service'],
|
|
146
150
|
additionalProperties: false,
|
|
147
|
-
allOf:
|
|
151
|
+
allOf: [
|
|
152
|
+
// Explicit SaaS state backend must declare the target org at top level.
|
|
153
|
+
// A missing backend block stays org-free (zero-config quick start — the
|
|
154
|
+
// API key decides the org there); every nested level needs its own
|
|
155
|
+
// `required` so the `if` can't match vacuously.
|
|
156
|
+
{
|
|
157
|
+
if: {
|
|
158
|
+
properties: {
|
|
159
|
+
backend: {
|
|
160
|
+
properties: {
|
|
161
|
+
state_manager: {
|
|
162
|
+
properties: { type: { const: 'SAAS' } },
|
|
163
|
+
required: ['type'],
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
required: ['state_manager'],
|
|
167
|
+
},
|
|
168
|
+
},
|
|
169
|
+
required: ['backend'],
|
|
170
|
+
},
|
|
171
|
+
then: { required: ['org'] },
|
|
172
|
+
},
|
|
173
|
+
...Object.entries(FUNCTION_NAME_MAX_LENGTH).map(([provider, maxLength]) => functionNameLimitBranch(provider, maxLength)),
|
|
174
|
+
],
|
|
148
175
|
};
|
|
@@ -29,6 +29,30 @@ const validateSemantics = (iacJson) => {
|
|
|
29
29
|
? fn.name
|
|
30
30
|
: undefined)
|
|
31
31
|
.filter((name) => name !== undefined));
|
|
32
|
+
Object.entries(functionDefinitions).forEach(([fnKey, rawFn]) => {
|
|
33
|
+
if (!rawFn || typeof rawFn !== 'object')
|
|
34
|
+
return;
|
|
35
|
+
const fn = rawFn;
|
|
36
|
+
const instancePath = `/functions/${fnKey}`;
|
|
37
|
+
if (fn.container && fn.code) {
|
|
38
|
+
errors.push({
|
|
39
|
+
instancePath,
|
|
40
|
+
schemaPath: '#/semantic/containerCodeConflict',
|
|
41
|
+
keyword: 'containerCodeConflict',
|
|
42
|
+
params: {},
|
|
43
|
+
message: lang_1.lang.__('SEMANTIC_CONTAINER_CODE_CONFLICT', { fnKey }),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
else if (!fn.container && !fn.code) {
|
|
47
|
+
errors.push({
|
|
48
|
+
instancePath,
|
|
49
|
+
schemaPath: '#/semantic/functionSourceRequired',
|
|
50
|
+
keyword: 'functionSourceRequired',
|
|
51
|
+
params: {},
|
|
52
|
+
message: lang_1.lang.__('SEMANTIC_FUNCTION_SOURCE_REQUIRED', { fnKey }),
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
});
|
|
32
56
|
Object.entries(events).forEach(([eventKey, rawEvent]) => {
|
|
33
57
|
const triggers = Array.isArray(rawEvent.triggers)
|
|
34
58
|
? rawEvent.triggers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/forceUnlock.ts","../src/commands/index.ts","../src/commands/local.ts","../src/commands/login.ts","../src/commands/logout.ts","../src/commands/plan.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/commands/whoami.ts","../src/common/apiClient.ts","../src/common/base64.ts","../src/common/certUtils.ts","../src/common/concurrency.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/credentialStore.ts","../src/common/credentials.ts","../src/common/domainUtils.ts","../src/common/eventQueue.ts","../src/common/fileUtils.ts","../src/common/getVersion.ts","../src/common/hashUtils.ts","../src/common/iacHelper.ts","../src/common/iamStatements.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/nameBuilder.ts","../src/common/planCompare.ts","../src/common/planFormatter.ts","../src/common/polling.ts","../src/common/providerEnum.ts","../src/common/providerNames.ts","../src/common/refreshCache.ts","../src/common/refreshPlanner.ts","../src/common/reportResourceEvent.ts","../src/common/requestHelper.ts","../src/common/retryUtils.ts","../src/common/runtimeMapper.ts","../src/common/scfClient.ts","../src/common/sidUtils.ts","../src/common/stateManager.ts","../src/common/throttleRetry.ts","../src/common/triggerMapper.ts","../src/common/aliyunClient/apigwOperations.ts","../src/common/aliyunClient/casOperations.ts","../src/common/aliyunClient/cdnOperations.ts","../src/common/aliyunClient/dnsOperations.ts","../src/common/aliyunClient/ecsOperations.ts","../src/common/aliyunClient/esOperations.ts","../src/common/aliyunClient/fc3Operations.ts","../src/common/aliyunClient/index.ts","../src/common/aliyunClient/nasOperations.ts","../src/common/aliyunClient/ossOperations.ts","../src/common/aliyunClient/ramOperations.ts","../src/common/aliyunClient/rdsOperations.ts","../src/common/aliyunClient/slsOperations.ts","../src/common/aliyunClient/tablestoreOperations.ts","../src/common/aliyunClient/types.ts","../src/common/dependencyGraph/graph.ts","../src/common/dependencyGraph/index.ts","../src/common/dependencyGraph/types.ts","../src/common/stateBackend/cosStateBackend.ts","../src/common/stateBackend/index.ts","../src/common/stateBackend/localStateBackend.ts","../src/common/stateBackend/lockUtils.ts","../src/common/stateBackend/ossStateBackend.ts","../src/common/stateBackend/remoteStateBackend.ts","../src/common/stateBackend/saasStateBackend.ts","../src/common/stateBackend/types.ts","../src/common/tencentClient/camOperations.ts","../src/common/tencentClient/clsOperations.ts","../src/common/tencentClient/cosOperations.ts","../src/common/tencentClient/dnspodOperations.ts","../src/common/tencentClient/esOperations.ts","../src/common/tencentClient/index.ts","../src/common/tencentClient/scfOperations.ts","../src/common/tencentClient/sslOperations.ts","../src/common/tencentClient/tdsqlcClusterMapper.ts","../src/common/tencentClient/tdsqlcOperations.ts","../src/common/tencentClient/types.ts","../src/common/volcengineClient/apigwOperations.ts","../src/common/volcengineClient/iamOperations.ts","../src/common/volcengineClient/index.ts","../src/common/volcengineClient/stsOperations.ts","../src/common/volcengineClient/tlsOperations.ts","../src/common/volcengineClient/tosOperations.ts","../src/common/volcengineClient/types.ts","../src/common/volcengineClient/vefaasOperations.ts","../src/lang/en.ts","../src/lang/index.ts","../src/lang/zh-CN.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/parseUtils.ts","../src/parser/tableParser.ts","../src/parser/tagParser.ts","../src/stack/alreadyExists.ts","../src/stack/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/ownershipTag.ts","../src/stack/aliyunStack/apigwExecutor.ts","../src/stack/aliyunStack/apigwPlanner.ts","../src/stack/aliyunStack/apigwResource.ts","../src/stack/aliyunStack/apigwTypes.ts","../src/stack/aliyunStack/databaseExecutor.ts","../src/stack/aliyunStack/databasePlanner.ts","../src/stack/aliyunStack/databaseResource.ts","../src/stack/aliyunStack/deployer.ts","../src/stack/aliyunStack/destroyer.ts","../src/stack/aliyunStack/esServerlessTypes.ts","../src/stack/aliyunStack/fc3Executor.ts","../src/stack/aliyunStack/fc3Planner.ts","../src/stack/aliyunStack/fc3Resource.ts","../src/stack/aliyunStack/fc3Types.ts","../src/stack/aliyunStack/index.ts","../src/stack/aliyunStack/ossExecutor.ts","../src/stack/aliyunStack/ossPlanner.ts","../src/stack/aliyunStack/ossResource.ts","../src/stack/aliyunStack/ossTypes.ts","../src/stack/aliyunStack/planner.ts","../src/stack/aliyunStack/rdsTypes.ts","../src/stack/aliyunStack/sharedLogProject.ts","../src/stack/aliyunStack/tablestoreExecutor.ts","../src/stack/aliyunStack/tablestorePlanner.ts","../src/stack/aliyunStack/tablestoreResource.ts","../src/stack/aliyunStack/tablestoreTypes.ts","../src/stack/localStack/aliyunFc.ts","../src/stack/localStack/bucket.ts","../src/stack/localStack/event.ts","../src/stack/localStack/function.ts","../src/stack/localStack/functionRunner.ts","../src/stack/localStack/index.ts","../src/stack/localStack/localServer.ts","../src/stack/localStack/utils.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/scfStack/cosExecutor.ts","../src/stack/scfStack/cosPlanner.ts","../src/stack/scfStack/cosResource.ts","../src/stack/scfStack/cosTypes.ts","../src/stack/scfStack/deployer.ts","../src/stack/scfStack/destroyer.ts","../src/stack/scfStack/esServerlessExecutor.ts","../src/stack/scfStack/esServerlessPlanner.ts","../src/stack/scfStack/esServerlessResource.ts","../src/stack/scfStack/esServerlessTypes.ts","../src/stack/scfStack/index.ts","../src/stack/scfStack/planner.ts","../src/stack/scfStack/scfExecutor.ts","../src/stack/scfStack/scfPlanner.ts","../src/stack/scfStack/scfResource.ts","../src/stack/scfStack/scfTypes.ts","../src/stack/scfStack/sharedLogset.ts","../src/stack/scfStack/tdsqlcExecutor.ts","../src/stack/scfStack/tdsqlcPlanner.ts","../src/stack/scfStack/tdsqlcResource.ts","../src/stack/scfStack/tdsqlcTypes.ts","../src/stack/volcengineStack/apigwExecutor.ts","../src/stack/volcengineStack/apigwPlanner.ts","../src/stack/volcengineStack/apigwResource.ts","../src/stack/volcengineStack/apigwTypes.ts","../src/stack/volcengineStack/deployer.ts","../src/stack/volcengineStack/destroyer.ts","../src/stack/volcengineStack/index.ts","../src/stack/volcengineStack/planner.ts","../src/stack/volcengineStack/sharedLogProject.ts","../src/stack/volcengineStack/tosExecutor.ts","../src/stack/volcengineStack/tosPlanner.ts","../src/stack/volcengineStack/tosResource.ts","../src/stack/volcengineStack/tosTypes.ts","../src/stack/volcengineStack/vefaasExecutor.ts","../src/stack/volcengineStack/vefaasPlanner.ts","../src/stack/volcengineStack/vefaasResource.ts","../src/stack/volcengineStack/vefaasTypes.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/tablestore.d.ts","../src/types/domains/backend.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/lock.ts","../src/types/domains/provider.ts","../src/types/domains/resolvable.ts","../src/types/domains/state.ts","../src/types/domains/table.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/types/localStack/index.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts","../src/validator/semanticValidation.ts","../src/validator/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"6.0.3"}
|
|
1
|
+
{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/forceUnlock.ts","../src/commands/index.ts","../src/commands/local.ts","../src/commands/login.ts","../src/commands/logout.ts","../src/commands/migrate.ts","../src/commands/plan.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/commands/whoami.ts","../src/common/apiClient.ts","../src/common/base64.ts","../src/common/certUtils.ts","../src/common/concurrency.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/credentialStore.ts","../src/common/credentials.ts","../src/common/domainUtils.ts","../src/common/eventQueue.ts","../src/common/fileUtils.ts","../src/common/getVersion.ts","../src/common/hashUtils.ts","../src/common/iacHelper.ts","../src/common/iamStatements.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/migrationMarker.ts","../src/common/nameBuilder.ts","../src/common/planCompare.ts","../src/common/planFormatter.ts","../src/common/polling.ts","../src/common/providerEnum.ts","../src/common/providerNames.ts","../src/common/refreshCache.ts","../src/common/refreshPlanner.ts","../src/common/reportResourceEvent.ts","../src/common/requestHelper.ts","../src/common/retryUtils.ts","../src/common/runtimeMapper.ts","../src/common/scfClient.ts","../src/common/sidUtils.ts","../src/common/stateManager.ts","../src/common/throttleRetry.ts","../src/common/triggerMapper.ts","../src/common/aliyunClient/apigwOperations.ts","../src/common/aliyunClient/casOperations.ts","../src/common/aliyunClient/cdnOperations.ts","../src/common/aliyunClient/dnsOperations.ts","../src/common/aliyunClient/ecsOperations.ts","../src/common/aliyunClient/esOperations.ts","../src/common/aliyunClient/fc3Operations.ts","../src/common/aliyunClient/index.ts","../src/common/aliyunClient/nasOperations.ts","../src/common/aliyunClient/ossOperations.ts","../src/common/aliyunClient/ramOperations.ts","../src/common/aliyunClient/rdsOperations.ts","../src/common/aliyunClient/slsOperations.ts","../src/common/aliyunClient/tablestoreOperations.ts","../src/common/aliyunClient/types.ts","../src/common/dependencyGraph/graph.ts","../src/common/dependencyGraph/index.ts","../src/common/dependencyGraph/types.ts","../src/common/stateBackend/cosStateBackend.ts","../src/common/stateBackend/index.ts","../src/common/stateBackend/localStateBackend.ts","../src/common/stateBackend/lockUtils.ts","../src/common/stateBackend/ossStateBackend.ts","../src/common/stateBackend/remoteStateBackend.ts","../src/common/stateBackend/saasStateBackend.ts","../src/common/stateBackend/types.ts","../src/common/tencentClient/camOperations.ts","../src/common/tencentClient/clsOperations.ts","../src/common/tencentClient/cosOperations.ts","../src/common/tencentClient/dnspodOperations.ts","../src/common/tencentClient/esOperations.ts","../src/common/tencentClient/index.ts","../src/common/tencentClient/scfOperations.ts","../src/common/tencentClient/sslOperations.ts","../src/common/tencentClient/tdsqlcClusterMapper.ts","../src/common/tencentClient/tdsqlcOperations.ts","../src/common/tencentClient/types.ts","../src/common/volcengineClient/apigwOperations.ts","../src/common/volcengineClient/iamOperations.ts","../src/common/volcengineClient/index.ts","../src/common/volcengineClient/stsOperations.ts","../src/common/volcengineClient/tlsOperations.ts","../src/common/volcengineClient/tosOperations.ts","../src/common/volcengineClient/types.ts","../src/common/volcengineClient/vefaasOperations.ts","../src/lang/en.ts","../src/lang/index.ts","../src/lang/zh-CN.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/parseUtils.ts","../src/parser/tableParser.ts","../src/parser/tagParser.ts","../src/stack/alreadyExists.ts","../src/stack/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/ownershipTag.ts","../src/stack/aliyunStack/apigwExecutor.ts","../src/stack/aliyunStack/apigwPlanner.ts","../src/stack/aliyunStack/apigwResource.ts","../src/stack/aliyunStack/apigwTypes.ts","../src/stack/aliyunStack/databaseExecutor.ts","../src/stack/aliyunStack/databasePlanner.ts","../src/stack/aliyunStack/databaseResource.ts","../src/stack/aliyunStack/deployer.ts","../src/stack/aliyunStack/destroyer.ts","../src/stack/aliyunStack/esServerlessTypes.ts","../src/stack/aliyunStack/fc3Executor.ts","../src/stack/aliyunStack/fc3Planner.ts","../src/stack/aliyunStack/fc3Resource.ts","../src/stack/aliyunStack/fc3Types.ts","../src/stack/aliyunStack/index.ts","../src/stack/aliyunStack/ossExecutor.ts","../src/stack/aliyunStack/ossPlanner.ts","../src/stack/aliyunStack/ossResource.ts","../src/stack/aliyunStack/ossTypes.ts","../src/stack/aliyunStack/planner.ts","../src/stack/aliyunStack/rdsTypes.ts","../src/stack/aliyunStack/sharedLogProject.ts","../src/stack/aliyunStack/tablestoreExecutor.ts","../src/stack/aliyunStack/tablestorePlanner.ts","../src/stack/aliyunStack/tablestoreResource.ts","../src/stack/aliyunStack/tablestoreTypes.ts","../src/stack/localStack/aliyunFc.ts","../src/stack/localStack/bucket.ts","../src/stack/localStack/event.ts","../src/stack/localStack/function.ts","../src/stack/localStack/functionRunner.ts","../src/stack/localStack/index.ts","../src/stack/localStack/localServer.ts","../src/stack/localStack/utils.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/scfStack/cosExecutor.ts","../src/stack/scfStack/cosPlanner.ts","../src/stack/scfStack/cosResource.ts","../src/stack/scfStack/cosTypes.ts","../src/stack/scfStack/deployer.ts","../src/stack/scfStack/destroyer.ts","../src/stack/scfStack/esServerlessExecutor.ts","../src/stack/scfStack/esServerlessPlanner.ts","../src/stack/scfStack/esServerlessResource.ts","../src/stack/scfStack/esServerlessTypes.ts","../src/stack/scfStack/index.ts","../src/stack/scfStack/planner.ts","../src/stack/scfStack/scfExecutor.ts","../src/stack/scfStack/scfPlanner.ts","../src/stack/scfStack/scfResource.ts","../src/stack/scfStack/scfTypes.ts","../src/stack/scfStack/sharedLogset.ts","../src/stack/scfStack/tdsqlcExecutor.ts","../src/stack/scfStack/tdsqlcPlanner.ts","../src/stack/scfStack/tdsqlcResource.ts","../src/stack/scfStack/tdsqlcTypes.ts","../src/stack/volcengineStack/apigwExecutor.ts","../src/stack/volcengineStack/apigwPlanner.ts","../src/stack/volcengineStack/apigwResource.ts","../src/stack/volcengineStack/apigwTypes.ts","../src/stack/volcengineStack/deployer.ts","../src/stack/volcengineStack/destroyer.ts","../src/stack/volcengineStack/index.ts","../src/stack/volcengineStack/planner.ts","../src/stack/volcengineStack/sharedLogProject.ts","../src/stack/volcengineStack/tosExecutor.ts","../src/stack/volcengineStack/tosPlanner.ts","../src/stack/volcengineStack/tosResource.ts","../src/stack/volcengineStack/tosTypes.ts","../src/stack/volcengineStack/vefaasExecutor.ts","../src/stack/volcengineStack/vefaasPlanner.ts","../src/stack/volcengineStack/vefaasResource.ts","../src/stack/volcengineStack/vefaasTypes.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/tablestore.d.ts","../src/types/domains/backend.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/lock.ts","../src/types/domains/provider.ts","../src/types/domains/resolvable.ts","../src/types/domains/state.ts","../src/types/domains/table.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/types/localStack/index.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts","../src/validator/semanticValidation.ts","../src/validator/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"6.0.3"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@geek-fun/serverlessinsight",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "Full
|
|
3
|
+
"version": "0.9.1",
|
|
4
|
+
"description": "Full-lifecycle serverless IaC — one open-source platform to develop, deploy and operate serverless across clouds.",
|
|
5
5
|
"homepage": "https://serverlessinsight.com",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
7
7
|
"types": "dist/src/index.d.ts",
|