@geek-fun/serverlessinsight 0.5.1 → 0.5.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/dist/package.json +1 -1
- package/dist/src/commands/deploy.js +12 -6
- package/dist/src/commands/destroy.js +13 -8
- package/dist/src/commands/forceUnlock.js +60 -4
- package/dist/src/commands/index.js +40 -21
- package/dist/src/commands/local.js +5 -27
- package/dist/src/commands/plan.js +12 -4
- package/dist/src/commands/template.js +3 -3
- package/dist/src/commands/validate.js +4 -2
- package/dist/src/common/context.js +2 -1
- package/dist/src/common/lockManager.js +5 -3
- package/dist/src/common/stateBackend/cosStateBackend.js +215 -0
- package/dist/src/common/stateBackend/index.js +55 -0
- package/dist/src/common/stateBackend/localStateBackend.js +33 -0
- package/dist/src/common/stateBackend/ossStateBackend.js +196 -0
- package/dist/src/common/stateBackend/types.js +2 -0
- package/dist/src/common/stateManager.js +45 -18
- package/dist/src/lang/en.js +2 -2
- package/dist/src/lang/zh-CN.js +2 -2
- package/dist/src/parser/index.js +35 -5
- package/dist/src/parser/tagParser.js +4 -1
- package/dist/src/stack/aliyunStack/deployer.js +6 -7
- package/dist/src/stack/aliyunStack/destroyer.js +12 -8
- package/dist/src/stack/aliyunStack/fc3Resource.js +2 -2
- package/dist/src/stack/aliyunStack/planner.js +2 -2
- package/dist/src/stack/deploy.js +9 -9
- package/dist/src/stack/localStack/aliyunFc.js +2 -2
- package/dist/src/stack/rfsStack/index.js +1 -1
- package/dist/src/stack/scfStack/deployer.js +6 -7
- package/dist/src/stack/scfStack/destroyer.js +6 -7
- package/dist/src/stack/scfStack/planner.js +2 -2
- package/dist/src/types/domains/backend.js +8 -0
- package/dist/src/types/domains/state.js +1 -1
- package/dist/src/types/index.js +1 -0
- package/dist/src/validator/rootSchema.js +4 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/samples/aliyun-poc-api.yml +2 -1
- package/samples/aliyun-poc-bucket.yml +2 -1
- package/samples/aliyun-poc-domain.yml +2 -1
- package/samples/aliyun-poc-es.yml +2 -1
- package/samples/aliyun-poc-fc-gpu.yml +2 -1
- package/samples/aliyun-poc-rds.yml +2 -1
- package/samples/aliyun-poc-table.yml +2 -1
- package/samples/huawei-poc-fc.yml +3 -1
- package/samples/tencent-poc-cos.yml +2 -1
- package/samples/tencent-poc-scf.yml +2 -1
package/dist/src/parser/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.revalYaml = exports.parseYaml = void 0;
|
|
4
4
|
const node_fs_1 = require("node:fs");
|
|
5
|
+
const types_1 = require("../types");
|
|
5
6
|
const functionParser_1 = require("./functionParser");
|
|
6
7
|
const eventParser_1 = require("./eventParser");
|
|
7
8
|
const databaseParser_1 = require("./databaseParser");
|
|
@@ -16,18 +17,40 @@ const validateExistence = (path) => {
|
|
|
16
17
|
throw new Error(`File does not exist at path: ${path}`);
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
|
-
const
|
|
20
|
+
const parseBackend = (raw) => {
|
|
21
|
+
if (!raw)
|
|
22
|
+
return undefined;
|
|
23
|
+
const type = raw.type?.toUpperCase();
|
|
24
|
+
if (type === types_1.StateBackendType.BUCKET_STORE) {
|
|
25
|
+
if (!raw.bucket || !raw.key) {
|
|
26
|
+
throw new Error('Backend type BUCKET_STORE requires both "bucket" and "key" fields');
|
|
27
|
+
}
|
|
28
|
+
return {
|
|
29
|
+
type: types_1.StateBackendType.BUCKET_STORE,
|
|
30
|
+
bucket: raw.bucket,
|
|
31
|
+
key: raw.key,
|
|
32
|
+
region: raw.region,
|
|
33
|
+
accessKeyId: raw.accessKeyId,
|
|
34
|
+
accessKeySecret: raw.accessKeySecret,
|
|
35
|
+
securityToken: raw.securityToken,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return { type: types_1.StateBackendType.LOCAL };
|
|
39
|
+
};
|
|
40
|
+
const transformYaml = (iacJson, stage) => {
|
|
20
41
|
return {
|
|
42
|
+
app: iacJson.app,
|
|
21
43
|
service: iacJson.service,
|
|
22
44
|
version: iacJson.version,
|
|
23
45
|
provider: iacJson.provider,
|
|
24
46
|
vars: iacJson.vars,
|
|
25
47
|
stages: iacJson.stages,
|
|
48
|
+
backend: parseBackend(iacJson.backend),
|
|
26
49
|
functions: (0, functionParser_1.parseFunction)(iacJson.functions),
|
|
27
50
|
events: (0, eventParser_1.parseEvent)(iacJson.events),
|
|
28
51
|
databases: (0, databaseParser_1.parseDatabase)(iacJson.databases),
|
|
29
52
|
tables: (0, tableParser_1.parseTable)(iacJson.tables),
|
|
30
|
-
tags: (0, tagParser_1.parseTag)(iacJson.tags),
|
|
53
|
+
tags: (0, tagParser_1.parseTag)(iacJson.tags, iacJson.app, iacJson.service, stage),
|
|
31
54
|
buckets: (0, bucketParser_1.parseBucket)(iacJson.buckets),
|
|
32
55
|
};
|
|
33
56
|
};
|
|
@@ -56,9 +79,16 @@ const revalYaml = (iacLocation, ctx) => {
|
|
|
56
79
|
const yamlContent = (0, node_fs_1.readFileSync)(iacLocation, 'utf8');
|
|
57
80
|
const iacJson = (0, yaml_1.parse)(yamlContent);
|
|
58
81
|
(0, validator_1.validateYaml)(iacJson);
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
82
|
+
const staticFields = {
|
|
83
|
+
app: iacJson.app,
|
|
84
|
+
service: iacJson.service,
|
|
85
|
+
version: iacJson.version,
|
|
86
|
+
provider: { ...iacJson.provider, name: iacJson.provider.name },
|
|
87
|
+
};
|
|
88
|
+
// staticFields are spread in before evaluation (identity fields are not template strings,
|
|
89
|
+
// so this is a no-op) and again after to ensure evaluateObject never mangles them.
|
|
90
|
+
const evaluatedIacJson = evaluateObject({ ...iacJson, ...staticFields }, ctx, iacJson.vars);
|
|
91
|
+
const iac = transformYaml({ ...evaluatedIacJson, ...staticFields }, ctx.stage);
|
|
62
92
|
if (iac.functions) {
|
|
63
93
|
iac.functions = iac.functions.map((fn) => ({
|
|
64
94
|
...fn,
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseTag = void 0;
|
|
4
|
-
const parseTag = (tags) => {
|
|
4
|
+
const parseTag = (tags, app = '', service = '', stage = '') => {
|
|
5
5
|
return [
|
|
6
6
|
{ key: 'iac-provider', value: 'ServerlessInsight' },
|
|
7
|
+
{ key: 'app', value: app },
|
|
8
|
+
{ key: 'service', value: service },
|
|
9
|
+
{ key: 'stage', value: stage },
|
|
7
10
|
...Object.entries(tags ?? {}).map(([key, value]) => ({ key, value })),
|
|
8
11
|
];
|
|
9
12
|
};
|
|
@@ -13,8 +13,8 @@ const tablestorePlanner_1 = require("./tablestorePlanner");
|
|
|
13
13
|
const tablestoreExecutor_1 = require("./tablestoreExecutor");
|
|
14
14
|
const apigwPlanner_1 = require("./apigwPlanner");
|
|
15
15
|
const apigwExecutor_1 = require("./apigwExecutor");
|
|
16
|
-
const createSaveStateFn = (
|
|
17
|
-
|
|
16
|
+
const createSaveStateFn = (backend, iac, stage) => (state) => {
|
|
17
|
+
backend.saveState(state, iac.app, iac.service, stage);
|
|
18
18
|
};
|
|
19
19
|
const handlePartialFailure = (failure) => {
|
|
20
20
|
const error = failure.error;
|
|
@@ -38,14 +38,13 @@ const logDependencyGraph = (orderedItems, dotGraph) => {
|
|
|
38
38
|
});
|
|
39
39
|
common_1.logger.debug(`${lang_1.lang.__('DOT_GRAPH_OUTPUT')}:\n${dotGraph}`);
|
|
40
40
|
};
|
|
41
|
-
const deployAliyunStack = async (iac) => {
|
|
41
|
+
const deployAliyunStack = async (iac, backend) => {
|
|
42
42
|
const context = (0, common_1.getContext)();
|
|
43
|
-
const baseDir = process.cwd();
|
|
44
43
|
// Cache IAC for access throughout the deployment
|
|
45
44
|
(0, common_1.setIac)(iac);
|
|
46
45
|
common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK_PUBLISHING_ASSETS'));
|
|
47
|
-
let state =
|
|
48
|
-
const onStateChange = createSaveStateFn(
|
|
46
|
+
let state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
|
|
47
|
+
const onStateChange = createSaveStateFn(backend, iac, context.stage);
|
|
49
48
|
common_1.logger.info(lang_1.lang.__('GENERATING_PLAN'));
|
|
50
49
|
const functionPlan = await (0, fc3Planner_1.generateFunctionPlan)(context, state, iac.functions);
|
|
51
50
|
const bucketPlan = await (0, ossPlanner_1.generateBucketPlan)(context, state, iac.buckets);
|
|
@@ -127,7 +126,7 @@ const deployAliyunStack = async (iac) => {
|
|
|
127
126
|
],
|
|
128
127
|
});
|
|
129
128
|
}
|
|
130
|
-
|
|
129
|
+
await backend.saveState(state, iac.app, iac.service, context.stage);
|
|
131
130
|
common_1.logger.info(lang_1.lang.__('STACK_DEPLOYED'));
|
|
132
131
|
};
|
|
133
132
|
exports.deployAliyunStack = deployAliyunStack;
|
|
@@ -13,8 +13,8 @@ const tablestorePlanner_1 = require("./tablestorePlanner");
|
|
|
13
13
|
const tablestoreExecutor_1 = require("./tablestoreExecutor");
|
|
14
14
|
const apigwPlanner_1 = require("./apigwPlanner");
|
|
15
15
|
const apigwExecutor_1 = require("./apigwExecutor");
|
|
16
|
-
const createSaveStateFn = (
|
|
17
|
-
|
|
16
|
+
const createSaveStateFn = (backend, app, service, stage) => (state) => {
|
|
17
|
+
backend.saveState(state, app, service, stage);
|
|
18
18
|
};
|
|
19
19
|
const handlePartialFailure = (failure) => {
|
|
20
20
|
const error = failure.error;
|
|
@@ -30,14 +30,18 @@ const handlePartialFailure = (failure) => {
|
|
|
30
30
|
throw error;
|
|
31
31
|
};
|
|
32
32
|
const collectSuccessfulItems = (results) => results.flatMap((result) => result.partialFailure?.successfulItems ?? []);
|
|
33
|
-
const destroyAliyunStack = async () => {
|
|
33
|
+
const destroyAliyunStack = async (backend) => {
|
|
34
34
|
const context = (0, common_1.getContext)();
|
|
35
|
-
const baseDir = process.cwd();
|
|
36
35
|
const providerName = common_1.ProviderEnum.ALIYUN;
|
|
37
|
-
let state =
|
|
38
|
-
const onStateChange = createSaveStateFn(
|
|
36
|
+
let state = await backend.loadState(providerName, context.app, context.service, context.stage);
|
|
37
|
+
const onStateChange = createSaveStateFn(backend, context.app, context.service, context.stage);
|
|
39
38
|
// Set minimal IAC for destruction (function resolution not needed)
|
|
40
|
-
(0, common_1.setIac)({
|
|
39
|
+
(0, common_1.setIac)({
|
|
40
|
+
version: '1.0',
|
|
41
|
+
app: '',
|
|
42
|
+
service: '',
|
|
43
|
+
provider: { name: providerName, region: context.region },
|
|
44
|
+
});
|
|
41
45
|
const functionPlan = await (0, fc3Planner_1.generateFunctionPlan)(context, state, undefined);
|
|
42
46
|
const bucketPlan = await (0, ossPlanner_1.generateBucketPlan)(context, state, undefined);
|
|
43
47
|
const databasePlan = await (0, databasePlanner_1.generateDatabasePlan)(context, state, undefined);
|
|
@@ -109,6 +113,6 @@ const destroyAliyunStack = async () => {
|
|
|
109
113
|
],
|
|
110
114
|
});
|
|
111
115
|
}
|
|
112
|
-
|
|
116
|
+
await backend.saveState(state, context.app, context.service, context.stage);
|
|
113
117
|
};
|
|
114
118
|
exports.destroyAliyunStack = destroyAliyunStack;
|
|
@@ -240,7 +240,7 @@ const deleteDependentResources = async (context, instances) => {
|
|
|
240
240
|
};
|
|
241
241
|
const createResource = async (context, fn, state) => {
|
|
242
242
|
const ctx = (0, common_1.getContext)();
|
|
243
|
-
const serviceName = ctx.
|
|
243
|
+
const serviceName = `${ctx.app}-${ctx.service}`;
|
|
244
244
|
// Create dependent resources (SLS, RAM, ECS SecurityGroup, NAS)
|
|
245
245
|
const dependentResources = await createDependentResources(context, fn, serviceName);
|
|
246
246
|
// Build FC3 config with dependent resources
|
|
@@ -343,7 +343,7 @@ const readResource = async (context, functionName) => {
|
|
|
343
343
|
exports.readResource = readResource;
|
|
344
344
|
const updateResource = async (context, fn, state) => {
|
|
345
345
|
const ctx = (0, common_1.getContext)();
|
|
346
|
-
const serviceName = ctx.
|
|
346
|
+
const serviceName = `${ctx.app}-${ctx.service}`;
|
|
347
347
|
const logicalId = `functions.${fn.key}`;
|
|
348
348
|
// Get existing resource state to check if dependent resources exist
|
|
349
349
|
const existingState = (0, common_1.getResource)(state, logicalId);
|
|
@@ -8,9 +8,9 @@ const ossPlanner_1 = require("./ossPlanner");
|
|
|
8
8
|
const databasePlanner_1 = require("./databasePlanner");
|
|
9
9
|
const tablestorePlanner_1 = require("./tablestorePlanner");
|
|
10
10
|
const apigwPlanner_1 = require("./apigwPlanner");
|
|
11
|
-
const generateAliyunPlan = async (iac) => {
|
|
11
|
+
const generateAliyunPlan = async (iac, backend) => {
|
|
12
12
|
const context = (0, common_1.getContext)();
|
|
13
|
-
const state =
|
|
13
|
+
const state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
|
|
14
14
|
const functionPlan = await (0, fc3Planner_1.generateFunctionPlan)(context, state, iac.functions);
|
|
15
15
|
const bucketPlan = await (0, ossPlanner_1.generateBucketPlan)(context, state, iac.buckets);
|
|
16
16
|
const databasePlan = await (0, databasePlanner_1.generateDatabasePlan)(context, state, iac.databases);
|
package/dist/src/stack/deploy.js
CHANGED
|
@@ -6,40 +6,40 @@ const rfsStack_1 = require("./rfsStack");
|
|
|
6
6
|
const scfStack_1 = require("./scfStack");
|
|
7
7
|
const aliyunStack_1 = require("./aliyunStack");
|
|
8
8
|
const lang_1 = require("../lang");
|
|
9
|
-
const generateRfsStackTemplate = (
|
|
9
|
+
const generateRfsStackTemplate = (iac) => {
|
|
10
10
|
const stack = new rfsStack_1.RfsStack(iac);
|
|
11
11
|
const hcl = stack.toHclTerraform();
|
|
12
12
|
console.log('HCL:', hcl);
|
|
13
13
|
return { template: hcl };
|
|
14
14
|
};
|
|
15
15
|
exports.generateRfsStackTemplate = generateRfsStackTemplate;
|
|
16
|
-
const deployHuawei = async (
|
|
16
|
+
const deployHuawei = async (iac) => {
|
|
17
17
|
// For now, Huawei uses the same approach as Aliyun but with different stack
|
|
18
|
-
const { template } = (0, exports.generateRfsStackTemplate)(
|
|
18
|
+
const { template } = (0, exports.generateRfsStackTemplate)(iac);
|
|
19
19
|
common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK_PUBLISHING_ASSETS'));
|
|
20
20
|
// TODO: Implement Huawei-specific deployment logic
|
|
21
21
|
console.log('HCL:', template);
|
|
22
22
|
common_1.logger.info(lang_1.lang.__('STACK_DEPLOYED'));
|
|
23
23
|
};
|
|
24
|
-
const deployStack = async (
|
|
24
|
+
const deployStack = async (iac, backend) => {
|
|
25
25
|
if (iac.provider.name === common_1.ProviderEnum.TENCENT) {
|
|
26
|
-
await (0, scfStack_1.deployTencentStack)(iac);
|
|
26
|
+
await (0, scfStack_1.deployTencentStack)(iac, backend);
|
|
27
27
|
}
|
|
28
28
|
else if (iac.provider.name === common_1.ProviderEnum.ALIYUN) {
|
|
29
|
-
await (0, aliyunStack_1.deployAliyunStack)(iac);
|
|
29
|
+
await (0, aliyunStack_1.deployAliyunStack)(iac, backend);
|
|
30
30
|
}
|
|
31
31
|
else if (iac.provider.name === common_1.ProviderEnum.HUAWEI) {
|
|
32
|
-
await deployHuawei(
|
|
32
|
+
await deployHuawei(iac);
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
exports.deployStack = deployStack;
|
|
36
|
-
const generateStackTemplate = (
|
|
36
|
+
const generateStackTemplate = (iac) => {
|
|
37
37
|
if (iac.provider.name === common_1.ProviderEnum.ALIYUN) {
|
|
38
38
|
// Aliyun now uses state-based deployment, no template generation needed
|
|
39
39
|
return { template: {} };
|
|
40
40
|
}
|
|
41
41
|
else if (iac.provider.name === common_1.ProviderEnum.HUAWEI) {
|
|
42
|
-
return (0, exports.generateRfsStackTemplate)(
|
|
42
|
+
return (0, exports.generateRfsStackTemplate)(iac);
|
|
43
43
|
}
|
|
44
44
|
else if (iac.provider.name === common_1.ProviderEnum.TENCENT) {
|
|
45
45
|
// Tencent uses state-based deployment, no template generation needed
|
|
@@ -51,8 +51,8 @@ const createAliyunContextSerializable = (iac, functionName, handler, memory, tim
|
|
|
51
51
|
},
|
|
52
52
|
service: {
|
|
53
53
|
name: iac.service || 'default-service',
|
|
54
|
-
logProject: `${iac.service}-log-project`,
|
|
55
|
-
logStore: `${iac.service}-log-store`,
|
|
54
|
+
logProject: `${iac.app}-${iac.service}-log-project`,
|
|
55
|
+
logStore: `${iac.app}-${iac.service}-log-store`,
|
|
56
56
|
qualifier: 'LATEST',
|
|
57
57
|
versionId: '1',
|
|
58
58
|
},
|
|
@@ -28,7 +28,7 @@ class RfsStack {
|
|
|
28
28
|
this.context = context;
|
|
29
29
|
this.hcl = '';
|
|
30
30
|
provider(this, context);
|
|
31
|
-
(0, function_1.resolveFunction)(this, iac.functions, context, iac.service);
|
|
31
|
+
(0, function_1.resolveFunction)(this, iac.functions, context, `${iac.app}-${iac.service}`);
|
|
32
32
|
}
|
|
33
33
|
toHclTerraform() {
|
|
34
34
|
return this.hcl;
|
|
@@ -11,8 +11,8 @@ const tdsqlcPlanner_1 = require("./tdsqlcPlanner");
|
|
|
11
11
|
const tdsqlcExecutor_1 = require("./tdsqlcExecutor");
|
|
12
12
|
const esServerlessPlanner_1 = require("./esServerlessPlanner");
|
|
13
13
|
const esServerlessExecutor_1 = require("./esServerlessExecutor");
|
|
14
|
-
const createSaveStateFn = (
|
|
15
|
-
|
|
14
|
+
const createSaveStateFn = (backend, iac, stage) => (state) => {
|
|
15
|
+
backend.saveState(state, iac.app, iac.service, stage);
|
|
16
16
|
};
|
|
17
17
|
const handlePartialFailure = (failure) => {
|
|
18
18
|
const error = failure.error;
|
|
@@ -28,12 +28,11 @@ const handlePartialFailure = (failure) => {
|
|
|
28
28
|
throw error;
|
|
29
29
|
};
|
|
30
30
|
const collectSuccessfulItems = (results) => results.flatMap((result) => result.partialFailure?.successfulItems ?? []);
|
|
31
|
-
const deployTencentStack = async (iac) => {
|
|
31
|
+
const deployTencentStack = async (iac, backend) => {
|
|
32
32
|
const context = (0, common_1.getContext)();
|
|
33
|
-
const baseDir = process.cwd();
|
|
34
33
|
common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK_PUBLISHING_ASSETS'));
|
|
35
|
-
let state =
|
|
36
|
-
const onStateChange = createSaveStateFn(
|
|
34
|
+
let state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
|
|
35
|
+
const onStateChange = createSaveStateFn(backend, iac, context.stage);
|
|
37
36
|
common_1.logger.info(lang_1.lang.__('GENERATING_PLAN'));
|
|
38
37
|
const functionPlan = await (0, scfPlanner_1.generateFunctionPlan)(context, state, iac.functions);
|
|
39
38
|
const bucketPlan = await (0, cosPlanner_1.generateBucketPlan)(context, state, iac.buckets);
|
|
@@ -85,7 +84,7 @@ const deployTencentStack = async (iac) => {
|
|
|
85
84
|
],
|
|
86
85
|
});
|
|
87
86
|
}
|
|
88
|
-
|
|
87
|
+
await backend.saveState(state, iac.app, iac.service, context.stage);
|
|
89
88
|
common_1.logger.info(lang_1.lang.__('STACK_DEPLOYED'));
|
|
90
89
|
};
|
|
91
90
|
exports.deployTencentStack = deployTencentStack;
|
|
@@ -11,8 +11,8 @@ const tdsqlcPlanner_1 = require("./tdsqlcPlanner");
|
|
|
11
11
|
const tdsqlcExecutor_1 = require("./tdsqlcExecutor");
|
|
12
12
|
const esServerlessPlanner_1 = require("./esServerlessPlanner");
|
|
13
13
|
const esServerlessExecutor_1 = require("./esServerlessExecutor");
|
|
14
|
-
const createSaveStateFn = (
|
|
15
|
-
|
|
14
|
+
const createSaveStateFn = (backend, app, service, stage) => (state) => {
|
|
15
|
+
backend.saveState(state, app, service, stage);
|
|
16
16
|
};
|
|
17
17
|
const handlePartialFailure = (failure) => {
|
|
18
18
|
const error = failure.error;
|
|
@@ -28,12 +28,11 @@ const handlePartialFailure = (failure) => {
|
|
|
28
28
|
throw failure.error;
|
|
29
29
|
};
|
|
30
30
|
const collectSuccessfulItems = (results) => results.flatMap((result) => result.partialFailure?.successfulItems ?? []);
|
|
31
|
-
const destroyTencentStack = async () => {
|
|
31
|
+
const destroyTencentStack = async (backend) => {
|
|
32
32
|
const context = (0, common_1.getContext)();
|
|
33
|
-
const baseDir = process.cwd();
|
|
34
33
|
const providerName = common_1.ProviderEnum.TENCENT;
|
|
35
|
-
let state =
|
|
36
|
-
const onStateChange = createSaveStateFn(
|
|
34
|
+
let state = await backend.loadState(providerName, context.app, context.service, context.stage);
|
|
35
|
+
const onStateChange = createSaveStateFn(backend, context.app, context.service, context.stage);
|
|
37
36
|
const functionPlan = await (0, scfPlanner_1.generateFunctionPlan)(context, state, undefined);
|
|
38
37
|
const bucketPlan = await (0, cosPlanner_1.generateBucketPlan)(context, state, undefined);
|
|
39
38
|
const databasePlan = await (0, tdsqlcPlanner_1.generateDatabasePlan)(context, state, undefined);
|
|
@@ -83,6 +82,6 @@ const destroyTencentStack = async () => {
|
|
|
83
82
|
],
|
|
84
83
|
});
|
|
85
84
|
}
|
|
86
|
-
|
|
85
|
+
await backend.saveState(state, context.app, context.service, context.stage);
|
|
87
86
|
};
|
|
88
87
|
exports.destroyTencentStack = destroyTencentStack;
|
|
@@ -7,9 +7,9 @@ const scfPlanner_1 = require("./scfPlanner");
|
|
|
7
7
|
const cosPlanner_1 = require("./cosPlanner");
|
|
8
8
|
const tdsqlcPlanner_1 = require("./tdsqlcPlanner");
|
|
9
9
|
const esServerlessPlanner_1 = require("./esServerlessPlanner");
|
|
10
|
-
const generateTencentPlan = async (iac) => {
|
|
10
|
+
const generateTencentPlan = async (iac, backend) => {
|
|
11
11
|
const context = (0, common_1.getContext)();
|
|
12
|
-
const state =
|
|
12
|
+
const state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
|
|
13
13
|
const functionPlan = await (0, scfPlanner_1.generateFunctionPlan)(context, state, iac.functions);
|
|
14
14
|
const bucketPlan = await (0, cosPlanner_1.generateBucketPlan)(context, state, iac.buckets);
|
|
15
15
|
const databasePlan = await (0, tdsqlcPlanner_1.generateDatabasePlan)(context, state, iac.databases);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StateBackendType = void 0;
|
|
4
|
+
var StateBackendType;
|
|
5
|
+
(function (StateBackendType) {
|
|
6
|
+
StateBackendType["LOCAL"] = "LOCAL";
|
|
7
|
+
StateBackendType["BUCKET_STORE"] = "BUCKET_STORE";
|
|
8
|
+
})(StateBackendType || (exports.StateBackendType = StateBackendType = {}));
|
|
@@ -16,4 +16,4 @@ var ResourceTypeEnum;
|
|
|
16
16
|
ResourceTypeEnum["ALIYUN_ES_SERVERLESS"] = "ALIYUN_ES_SERVERLESS";
|
|
17
17
|
ResourceTypeEnum["ALIYUN_TABLESTORE_TABLE"] = "ALIYUN_TABLESTORE_TABLE";
|
|
18
18
|
})(ResourceTypeEnum || (exports.ResourceTypeEnum = ResourceTypeEnum = {}));
|
|
19
|
-
exports.CURRENT_STATE_VERSION = '
|
|
19
|
+
exports.CURRENT_STATE_VERSION = '2.0';
|
package/dist/src/types/index.js
CHANGED
|
@@ -25,4 +25,5 @@ __exportStar(require("./domains/bucket"), exports);
|
|
|
25
25
|
__exportStar(require("./domains/table"), exports);
|
|
26
26
|
__exportStar(require("./domains/state"), exports);
|
|
27
27
|
__exportStar(require("./domains/lock"), exports);
|
|
28
|
+
__exportStar(require("./domains/backend"), exports);
|
|
28
29
|
__exportStar(require("./assets"), exports);
|
|
@@ -5,7 +5,8 @@ exports.rootSchema = {
|
|
|
5
5
|
$id: 'https://serverlessinsight.geekfun.club/schemas/schema.json',
|
|
6
6
|
type: 'object',
|
|
7
7
|
properties: {
|
|
8
|
-
version: { type: 'string', enum: ['0.0.0', '0.0.1'] },
|
|
8
|
+
version: { type: 'string', enum: ['0.0.0', '0.0.1', '0.1.0'] },
|
|
9
|
+
app: { type: 'string', pattern: '^[a-z][a-z0-9-]*$' },
|
|
9
10
|
provider: {
|
|
10
11
|
type: 'object',
|
|
11
12
|
properties: {
|
|
@@ -59,7 +60,7 @@ exports.rootSchema = {
|
|
|
59
60
|
},
|
|
60
61
|
],
|
|
61
62
|
},
|
|
62
|
-
service: { type: 'string' },
|
|
63
|
+
service: { type: 'string', pattern: '^[a-z][a-z0-9-]*$' },
|
|
63
64
|
vars: {
|
|
64
65
|
type: 'object',
|
|
65
66
|
additionalProperties: {
|
|
@@ -99,6 +100,6 @@ exports.rootSchema = {
|
|
|
99
100
|
$ref: 'https://serverlessinsight.geekfun.club/schemas/tableschema.json',
|
|
100
101
|
},
|
|
101
102
|
},
|
|
102
|
-
required: ['version', 'provider', 'service'],
|
|
103
|
+
required: ['version', 'provider', 'app', 'service'],
|
|
103
104
|
additionalProperties: false,
|
|
104
105
|
};
|
|
@@ -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/plan.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/credentials.ts","../src/common/fileUtils.ts","../src/common/getVersion.ts","../src/common/hashUtils.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/requestHelper.ts","../src/common/runtimeMapper.ts","../src/common/scfClient.ts","../src/common/stateManager.ts","../src/common/aliyunClient/apigwOperations.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/tencentClient/cosOperations.ts","../src/common/tencentClient/esOperations.ts","../src/common/tencentClient/index.ts","../src/common/tencentClient/scfOperations.ts","../src/common/tencentClient/tdsqlcOperations.ts","../src/common/tencentClient/types.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/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.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/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/tdsqlcExecutor.ts","../src/stack/scfStack/tdsqlcPlanner.ts","../src/stack/scfStack/tdsqlcResource.ts","../src/stack/scfStack/tdsqlcTypes.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/tablestore.d.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/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"5.9.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/plan.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/credentials.ts","../src/common/fileUtils.ts","../src/common/getVersion.ts","../src/common/hashUtils.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/requestHelper.ts","../src/common/runtimeMapper.ts","../src/common/scfClient.ts","../src/common/stateManager.ts","../src/common/aliyunClient/apigwOperations.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/ossStateBackend.ts","../src/common/stateBackend/types.ts","../src/common/tencentClient/cosOperations.ts","../src/common/tencentClient/esOperations.ts","../src/common/tencentClient/index.ts","../src/common/tencentClient/scfOperations.ts","../src/common/tencentClient/tdsqlcOperations.ts","../src/common/tencentClient/types.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/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.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/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/tdsqlcExecutor.ts","../src/stack/scfStack/tdsqlcPlanner.ts","../src/stack/scfStack/tdsqlcResource.ts","../src/stack/scfStack/tdsqlcTypes.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/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@geek-fun/serverlessinsight",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.2",
|
|
4
4
|
"description": "Full life cycle cross providers serverless application management for your fast-growing business.",
|
|
5
5
|
"homepage": "https://serverlessinsight.geekfun.club",
|
|
6
6
|
"main": "dist/src/index.js",
|