@geek-fun/serverlessinsight 0.9.4 → 0.9.6

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.
Files changed (79) hide show
  1. package/AGENTS.md +5 -2
  2. package/CHANGELOG.md +44 -0
  3. package/README.md +26 -6
  4. package/README.zh-CN.md +26 -6
  5. package/codecov +0 -0
  6. package/codecov.SHA256SUM +1 -1
  7. package/codecov.SHA256SUM.sig +13 -13
  8. package/dist/package.json +1 -1
  9. package/dist/src/commands/deploy.js +7 -2
  10. package/dist/src/commands/destroy.js +6 -3
  11. package/dist/src/commands/forceUnlock.js +16 -21
  12. package/dist/src/commands/index.js +14 -4
  13. package/dist/src/commands/migrate.js +105 -132
  14. package/dist/src/commands/plan.js +2 -2
  15. package/dist/src/commands/show.js +17 -6
  16. package/dist/src/common/aggregateState.js +185 -0
  17. package/dist/src/common/aggregateStore.js +247 -0
  18. package/dist/src/common/apiClient.js +35 -12
  19. package/dist/src/common/constants.js +2 -1
  20. package/dist/src/common/context.js +22 -15
  21. package/dist/src/common/effectiveConfig.js +48 -0
  22. package/dist/src/common/iacHelper.js +2 -2
  23. package/dist/src/common/index.js +5 -0
  24. package/dist/src/common/jsonOutput.js +2 -13
  25. package/dist/src/common/migrationMarker.js +0 -7
  26. package/dist/src/common/nameBuilder.js +2 -3
  27. package/dist/src/common/regionalMigration.js +261 -0
  28. package/dist/src/common/saasProtocol.js +41 -0
  29. package/dist/src/common/stateBackend/cosStateBackend.js +88 -8
  30. package/dist/src/common/stateBackend/index.js +42 -18
  31. package/dist/src/common/stateBackend/localStateBackend.js +61 -26
  32. package/dist/src/common/stateBackend/ossStateBackend.js +62 -9
  33. package/dist/src/common/stateBackend/remoteStateBackend.js +94 -94
  34. package/dist/src/common/stateBackend/saasStateBackend.js +327 -92
  35. package/dist/src/common/stateBackend/types.js +9 -0
  36. package/dist/src/common/stateManager.js +38 -11
  37. package/dist/src/common/stateScope.js +34 -0
  38. package/dist/src/common/stateStorageIO.js +31 -0
  39. package/dist/src/lang/en.js +43 -2
  40. package/dist/src/lang/zh-CN.js +43 -2
  41. package/dist/src/parser/index.js +33 -8
  42. package/dist/src/parser/templateValues.js +31 -0
  43. package/dist/src/stack/aliyunStack/deployer.js +5 -5
  44. package/dist/src/stack/aliyunStack/destroyer.js +5 -5
  45. package/dist/src/stack/aliyunStack/fc3Planner.js +1 -1
  46. package/dist/src/stack/aliyunStack/fc3Resource.js +2 -2
  47. package/dist/src/stack/aliyunStack/planner.js +1 -1
  48. package/dist/src/stack/aliyunStack/sharedLogProject.js +2 -2
  49. package/dist/src/stack/ownershipTag.js +34 -26
  50. package/dist/src/stack/scfStack/deployer.js +5 -5
  51. package/dist/src/stack/scfStack/destroyer.js +5 -6
  52. package/dist/src/stack/scfStack/planner.js +1 -1
  53. package/dist/src/stack/scfStack/scfResource.js +1 -1
  54. package/dist/src/stack/scfStack/sharedLogset.js +5 -2
  55. package/dist/src/stack/volcengineStack/deployer.js +3 -3
  56. package/dist/src/stack/volcengineStack/destroyer.js +2 -3
  57. package/dist/src/stack/volcengineStack/planner.js +1 -1
  58. package/dist/src/stack/volcengineStack/sharedLogProject.js +4 -4
  59. package/dist/src/stack/volcengineStack/vefaasResource.js +1 -1
  60. package/dist/src/types/domains/state.js +28 -2
  61. package/dist/src/validator/index.js +3 -1
  62. package/dist/src/validator/rootSchema.js +8 -0
  63. package/dist/tsconfig.tsbuildinfo +1 -1
  64. package/package.json +1 -1
  65. package/release-notes.md +8 -36
  66. package/samples/README_TENCENT_COS.md +65 -23
  67. package/samples/README_TENCENT_SCF.md +44 -26
  68. package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +0 -14
  69. package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +0 -32
  70. package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +0 -90
  71. package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +0 -118
  72. package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +0 -215
  73. package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +0 -14
  74. package/.serverlessinsight/state-insight-poc-timer-app-insight-poc-timer.json.backup +0 -132
  75. package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +0 -55
  76. package/.serverlessinsight/state-insight-volc-destroy-app-insight-volc-destroy.json.backup +0 -1
  77. package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +0 -93
  78. package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +0 -163
  79. package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +0 -148
@@ -12,8 +12,8 @@ const tdsqlcPlanner_1 = require("./tdsqlcPlanner");
12
12
  const tdsqlcExecutor_1 = require("./tdsqlcExecutor");
13
13
  const esServerlessPlanner_1 = require("./esServerlessPlanner");
14
14
  const esServerlessExecutor_1 = require("./esServerlessExecutor");
15
- const createSaveStateFn = (backend, iac, stage) => async (state) => {
16
- await backend.saveState(state, iac.app, iac.service, stage);
15
+ const createSaveStateFn = (backend) => async (state) => {
16
+ await backend.saveState(state);
17
17
  };
18
18
  const handlePartialFailure = (failure) => {
19
19
  const error = failure.error;
@@ -37,8 +37,8 @@ const partitionPlan = (plan, types) => ({
37
37
  const deployTencentStack = async (iac, backend, approvedPlan) => {
38
38
  const context = (0, common_1.getContext)();
39
39
  common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK_PUBLISHING_ASSETS'));
40
- let state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
41
- const onStateChange = createSaveStateFn(backend, iac, context.stage);
40
+ let state = await backend.loadState();
41
+ const onStateChange = createSaveStateFn(backend);
42
42
  common_1.logger.info(lang_1.lang.__('GENERATING_PLAN'));
43
43
  const functionPlan = approvedPlan
44
44
  ? partitionPlan(approvedPlan, ['SCF'])
@@ -105,7 +105,7 @@ const deployTencentStack = async (iac, backend, approvedPlan) => {
105
105
  ],
106
106
  });
107
107
  }
108
- await backend.saveState(state, iac.app, iac.service, context.stage);
108
+ await backend.saveState(state);
109
109
  common_1.logger.info(lang_1.lang.__('STACK_DEPLOYED'));
110
110
  };
111
111
  exports.deployTencentStack = deployTencentStack;
@@ -14,8 +14,8 @@ const esServerlessExecutor_1 = require("./esServerlessExecutor");
14
14
  const tencentClient_1 = require("../../common/tencentClient");
15
15
  const stateManager_1 = require("../../common/stateManager");
16
16
  const sharedLogset_1 = require("./sharedLogset");
17
- const createSaveStateFn = (backend, app, service, stage) => async (state) => {
18
- await backend.saveState(state, app, service, stage);
17
+ const createSaveStateFn = (backend) => async (state) => {
18
+ await backend.saveState(state);
19
19
  };
20
20
  const handlePartialFailure = (failure) => {
21
21
  const error = failure.error;
@@ -33,9 +33,8 @@ const handlePartialFailure = (failure) => {
33
33
  const collectSuccessfulItems = (results) => results.flatMap((result) => result.partialFailure?.successfulItems ?? []);
34
34
  const destroyTencentStack = async (backend) => {
35
35
  const context = (0, common_1.getContext)();
36
- const providerName = common_1.ProviderEnum.TENCENT;
37
- let state = await backend.loadState(providerName, context.app, context.service, context.stage);
38
- const onStateChange = createSaveStateFn(backend, context.app, context.service, context.stage);
36
+ let state = await backend.loadState();
37
+ const onStateChange = createSaveStateFn(backend);
39
38
  const functionPlan = await (0, scfPlanner_1.generateFunctionPlan)(context, state, undefined);
40
39
  const bucketPlan = await (0, cosPlanner_1.generateBucketPlan)(context, state, undefined);
41
40
  const databasePlan = await (0, tdsqlcPlanner_1.generateDatabasePlan)(context, state, undefined);
@@ -99,6 +98,6 @@ const destroyTencentStack = async (backend) => {
99
98
  state = (0, stateManager_1.removeSharedResource)(state, context.stage, sharedLogset_1.SHARED_LOGSET_KEY);
100
99
  }
101
100
  }
102
- await backend.saveState(state, context.app, context.service, context.stage);
101
+ await backend.saveState(state);
103
102
  };
104
103
  exports.destroyTencentStack = destroyTencentStack;
@@ -10,7 +10,7 @@ const tdsqlcPlanner_1 = require("./tdsqlcPlanner");
10
10
  const esServerlessPlanner_1 = require("./esServerlessPlanner");
11
11
  const generateTencentPlan = async (iac, backend) => {
12
12
  const context = (0, common_1.getContext)();
13
- const state = await backend.loadState(iac.provider.name, iac.app, iac.service, context.stage);
13
+ const state = await backend.loadState();
14
14
  const functionPlan = await (0, scfPlanner_1.generateFunctionPlan)(context, state, iac.functions);
15
15
  const bucketPlan = await (0, cosPlanner_1.generateBucketPlan)(context, state, iac.buckets);
16
16
  const databasePlan = await (0, tdsqlcPlanner_1.generateDatabasePlan)(context, state, iac.databases);
@@ -510,7 +510,7 @@ const createDependentResources = async (context, fn, existingInstances = [], sta
510
510
  }
511
511
  const hasCamRole = existingInstances.some((i) => i.type === 'TENCENT_SCF_ROLE');
512
512
  const serviceName = `${context.app}-${context.service}`;
513
- const defaultRoleName = (0, common_1.buildFunctionRoleName)(serviceName, context.stage, fn.key);
513
+ const defaultRoleName = (0, common_1.buildFunctionRoleName)(serviceName, context.stage, context.region, fn.key);
514
514
  const roleName = customRoleName ?? defaultRoleName;
515
515
  const executionStatements = (0, exports.deriveScfExecutionStatements)(fn, context, await client.cam.getOwnerUin(), clsConfig?.topicId);
516
516
  if (hasCamRole) {
@@ -50,14 +50,17 @@ const ensureSharedLogset = async (context, client, state) => {
50
50
  // untagged logset is refused rather than silently taken over or retagged.
51
51
  const existing = await client.cls.getLogsetByName(logsetName);
52
52
  if (existing?.LogsetId) {
53
- if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOGSET_KEY, existing.Tags)) {
53
+ if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOGSET_KEY, existing.Tags, context.region)) {
54
54
  throw new Error(lang_1.lang.__('CLS_LOGSET_FOREIGN_OWNED', { logsetName }));
55
55
  }
56
56
  return { logsetName, logsetId: existing.LogsetId };
57
57
  }
58
58
  logger_1.logger.info(lang_1.lang.__('CREATING_CLS_LOGSET', { logsetName }));
59
59
  const created = await client.cls.createLogset(logsetName, [
60
- { key: ownershipTag_1.OWNERSHIP_TAG_KEY, value: (0, ownershipTag_1.buildSharedOwnershipTagValue)(context.app, exports.SHARED_LOGSET_KEY) },
60
+ {
61
+ key: ownershipTag_1.OWNERSHIP_TAG_KEY,
62
+ value: (0, ownershipTag_1.buildSharedOwnershipTagValue)(context.app, exports.SHARED_LOGSET_KEY, context.region),
63
+ },
61
64
  ]);
62
65
  return { logsetName, logsetId: created.logsetId };
63
66
  };
@@ -41,10 +41,10 @@ const partitionPlan = (plan, types) => ({
41
41
  const deployVolcengineStack = async (iac, backend, approvedPlan) => {
42
42
  const context = (0, common_1.getContext)();
43
43
  common_1.logger.info(lang_1.lang.__('DEPLOYING_STACK'));
44
- let state = await backend.loadState('volcengine', iac.app, iac.service, context.stage);
44
+ let state = await backend.loadState();
45
45
  const onStateChange = async (newState) => {
46
46
  state = newState;
47
- await backend.saveState(state, iac.app, iac.service, context.stage);
47
+ await backend.saveState(state);
48
48
  };
49
49
  common_1.logger.info(lang_1.lang.__('GENERATING_PLAN'));
50
50
  const functionPlan = approvedPlan
@@ -105,7 +105,7 @@ const deployVolcengineStack = async (iac, backend, approvedPlan) => {
105
105
  })}`);
106
106
  throw error;
107
107
  }
108
- await backend.saveState(apigwResult.state, iac.app, iac.service, context.stage);
108
+ await backend.saveState(apigwResult.state);
109
109
  common_1.logger.info(lang_1.lang.__('STACK_DEPLOYED'));
110
110
  };
111
111
  exports.deployVolcengineStack = deployVolcengineStack;
@@ -11,12 +11,11 @@ const apigwResource_1 = require("./apigwResource");
11
11
  const sharedLogProject_1 = require("./sharedLogProject");
12
12
  const destroyVolcengineStack = async (backend) => {
13
13
  const context = (0, common_1.getContext)();
14
- const providerName = common_1.ProviderEnum.VOLCENGINE;
15
14
  common_1.logger.info(lang_1.lang.__('DESTROYING_STACK', {
16
15
  provider: context.provider,
17
16
  region: context.region,
18
17
  }));
19
- let state = await backend.loadState(providerName, context.app, context.service, context.stage);
18
+ let state = await backend.loadState();
20
19
  const allResources = (0, stateManager_1.getAllResources)(state);
21
20
  const eventEntries = Object.entries(allResources).filter(([logicalId, resourceState]) => logicalId.startsWith('events.') &&
22
21
  resourceState.instances?.some((i) => typeof i.type === 'string' && i.type.startsWith('VOLCENGINE_APIGW_')));
@@ -79,6 +78,6 @@ const destroyVolcengineStack = async (backend) => {
79
78
  state = (0, stateManager_1.removeSharedResource)(state, context.stage, 'logs.project');
80
79
  }
81
80
  }
82
- await backend.saveState(state, context.app, context.service, context.stage);
81
+ await backend.saveState(state);
83
82
  };
84
83
  exports.destroyVolcengineStack = destroyVolcengineStack;
@@ -8,7 +8,7 @@ const tosPlanner_1 = require("./tosPlanner");
8
8
  const apigwPlanner_1 = require("./apigwPlanner");
9
9
  const generateVolcenginePlan = async (iac, backend) => {
10
10
  const context = (0, common_1.getContext)();
11
- const state = await backend.loadState('volcengine', context.app, context.service, context.stage);
11
+ const state = await backend.loadState();
12
12
  const functionPlan = await (0, vefaasPlanner_1.generateFunctionPlan)(context, state, iac.functions);
13
13
  const bucketPlan = await (0, tosPlanner_1.generateBucketPlan)(context, state, iac.buckets);
14
14
  const apigwPlan = await (0, apigwPlanner_1.generateApigwPlan)(context, state, iac.events, iac.service);
@@ -35,7 +35,7 @@ const ensureSharedLogProject = async (context, client, state) => {
35
35
  const existing = await client.tls.getProject(projectName);
36
36
  if (existing?.projectId) {
37
37
  const tags = await client.tls.getProjectTags(projectName);
38
- if ((0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags)) {
38
+ if ((0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags, context.region)) {
39
39
  return { projectName, projectId: existing.projectId };
40
40
  }
41
41
  throw new Error(lang_1.lang.__('TLS_SHARED_PROJECT_NOT_OWNED', { projectName }));
@@ -58,7 +58,7 @@ const ensureSharedLogProject = async (context, client, state) => {
58
58
  tags: [
59
59
  {
60
60
  key: ownershipTag_1.OWNERSHIP_TAG_KEY,
61
- value: (0, ownershipTag_1.buildSharedOwnershipTagValue)(context.app, exports.SHARED_LOG_PROJECT_KEY),
61
+ value: (0, ownershipTag_1.buildSharedOwnershipTagValue)(context.app, exports.SHARED_LOG_PROJECT_KEY, context.region),
62
62
  },
63
63
  ],
64
64
  });
@@ -68,7 +68,7 @@ const ensureSharedLogProject = async (context, client, state) => {
68
68
  // ownership before adopting — an untagged or foreign project must not be
69
69
  // silently taken over.
70
70
  const tags = await client.tls.getProjectTags(projectName);
71
- if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags)) {
71
+ if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags, context.region)) {
72
72
  throw new Error(lang_1.lang.__('TLS_SHARED_PROJECT_NOT_OWNED', { projectName }));
73
73
  }
74
74
  }
@@ -110,7 +110,7 @@ const releaseSharedLogProjectIfUnused = async (context, client, shared) => {
110
110
  // Never delete a project that is not provably this app's — the ownership tag
111
111
  // proves the shared container belongs to us before teardown.
112
112
  const tags = await client.tls.getProjectTags(projectName);
113
- if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags)) {
113
+ if (!(0, ownershipTag_1.isOwnedByApp)(context.app, exports.SHARED_LOG_PROJECT_KEY, tags, context.region)) {
114
114
  logger_1.logger.warn(lang_1.lang.__('TLS_SHARED_PROJECT_NOT_OWNED', { projectName }));
115
115
  return 'retained';
116
116
  }
@@ -364,7 +364,7 @@ const createDependentResources = async (context, fn, serviceName, existingInstan
364
364
  // sharedInstance so log resources are tracked and torn down correctly.
365
365
  return { logConfig, role, instances, sharedInstance };
366
366
  }
367
- const roleName = customRoleName ?? (0, common_1.buildFunctionRoleName)(serviceName, context.stage, fn.key);
367
+ const roleName = customRoleName ?? (0, common_1.buildFunctionRoleName)(serviceName, context.stage, context.region, fn.key);
368
368
  const trustedServices = (0, vefaasTypes_1.getTrustedServicesForFunction)(fn, context);
369
369
  const executionStatements = (0, vefaasTypes_1.deriveVefaasExecutionStatements)(fn, context);
370
370
  if (hasIamRole) {
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.StateVersionError = exports.StateCorruptError = exports.PartialResourceError = exports.CURRENT_STATE_VERSION = exports.ResourceTypeEnum = void 0;
3
+ exports.StateRegionRequiredError = exports.StateScopeMismatchError = exports.StateVersionError = exports.StateCorruptError = exports.PartialResourceError = exports.LEGACY_STATE_VERSION = exports.CURRENT_STATE_VERSION = exports.ResourceTypeEnum = void 0;
4
4
  var ResourceTypeEnum;
5
5
  (function (ResourceTypeEnum) {
6
6
  // Tencent Cloud
@@ -40,7 +40,8 @@ var ResourceTypeEnum;
40
40
  ResourceTypeEnum["VOLCENGINE_VEFAAS_FUNCTION"] = "VOLCENGINE_VEFAAS_FUNCTION";
41
41
  ResourceTypeEnum["VOLCENGINE_TOS_BUCKET"] = "VOLCENGINE_TOS_BUCKET";
42
42
  })(ResourceTypeEnum || (exports.ResourceTypeEnum = ResourceTypeEnum = {}));
43
- exports.CURRENT_STATE_VERSION = '3.0';
43
+ exports.CURRENT_STATE_VERSION = '4.0';
44
+ exports.LEGACY_STATE_VERSION = '3.0';
44
45
  class PartialResourceError extends Error {
45
46
  updatedState;
46
47
  cause;
@@ -78,3 +79,28 @@ class StateVersionError extends Error {
78
79
  }
79
80
  }
80
81
  exports.StateVersionError = StateVersionError;
82
+ class StateScopeMismatchError extends Error {
83
+ requested;
84
+ stored;
85
+ constructor(requested, stored) {
86
+ super(`State identity mismatch: the stored state belongs to ` +
87
+ `provider=${stored.provider ?? 'unknown'}, app=${stored.app ?? 'unknown'}, ` +
88
+ `service=${stored.service ?? 'unknown'}, stage=${stored.stage ?? 'unknown'}, ` +
89
+ `region=${stored.region ?? 'unknown'}, but the command requested ` +
90
+ `provider=${requested.provider}, app=${requested.app}, service=${requested.service}, ` +
91
+ `stage=${requested.stage}, region=${requested.region}. ` +
92
+ 'Refusing to mix deployment scopes; check --stage/--region/--provider.');
93
+ this.name = 'StateScopeMismatchError';
94
+ this.requested = requested;
95
+ this.stored = stored;
96
+ }
97
+ }
98
+ exports.StateScopeMismatchError = StateScopeMismatchError;
99
+ class StateRegionRequiredError extends Error {
100
+ constructor(stage) {
101
+ super(`A regional deployment state requires a canonical region, but none was resolved for stage "${stage}". ` +
102
+ 'Pass -r/--region explicitly or set provider.region in the YAML configuration.');
103
+ this.name = 'StateRegionRequiredError';
104
+ }
105
+ }
106
+ exports.StateRegionRequiredError = StateRegionRequiredError;
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.exportIacJsonSchema = exports.IacSchemaErrors = exports.validateYaml = void 0;
3
+ exports.templateRefSchema = exports.exportIacJsonSchema = exports.IacSchemaErrors = exports.validateYaml = void 0;
4
4
  var iacSchema_1 = require("./iacSchema");
5
5
  Object.defineProperty(exports, "validateYaml", { enumerable: true, get: function () { return iacSchema_1.validateYaml; } });
6
6
  Object.defineProperty(exports, "IacSchemaErrors", { enumerable: true, get: function () { return iacSchema_1.IacSchemaErrors; } });
7
7
  var schemaExport_1 = require("./schemaExport");
8
8
  Object.defineProperty(exports, "exportIacJsonSchema", { enumerable: true, get: function () { return schemaExport_1.exportIacJsonSchema; } });
9
+ var templateRefSchema_1 = require("./templateRefSchema");
10
+ Object.defineProperty(exports, "templateRefSchema", { enumerable: true, get: function () { return templateRefSchema_1.templateRefSchema; } });
@@ -167,6 +167,14 @@ exports.rootSchema = {
167
167
  type: { type: 'string', enum: ['LOCAL', 'BUCKET_STORE', 'SAAS'] },
168
168
  bucket: { type: 'string', description: 'State bucket name (BUCKET_STORE only).' },
169
169
  key: { type: 'string', description: 'State object key (BUCKET_STORE only).' },
170
+ storageRegion: {
171
+ type: 'string',
172
+ description: 'Pin where state is stored (BUCKET_STORE only); explicit settings never change when the workload -r changes.',
173
+ },
174
+ storageProvider: {
175
+ type: 'string',
176
+ description: 'Provider SDK used for state storage (BUCKET_STORE only); defaults to the workload provider.',
177
+ },
170
178
  },
171
179
  required: ['type'],
172
180
  additionalProperties: false,
@@ -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/migrate.ts","../src/commands/plan.ts","../src/commands/schema.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/commands/whoami.ts","../src/common/apiClient.ts","../src/common/base64.ts","../src/common/bucketPolicy.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/functionDefinition.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/jsonOutput.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/migrationMarker.ts","../src/common/nameBuilder.ts","../src/common/noColor.ts","../src/common/planCapabilities.ts","../src/common/planCompare.ts","../src/common/planFormatter.ts","../src/common/planRedaction.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/siCron.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/apigwDomainPlan.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/httpAdapter.ts","../src/stack/localStack/httpError.ts","../src/stack/localStack/index.ts","../src/stack/localStack/legacyLambda.ts","../src/stack/localStack/localContext.ts","../src/stack/localStack/localRoute.ts","../src/stack/localStack/localRuntimes.ts","../src/stack/localStack/localServer.ts","../src/stack/localStack/requestBody.ts","../src/stack/localStack/requestId.ts","../src/stack/localStack/tencent.ts","../src/stack/localStack/timer.ts","../src/stack/localStack/utils.ts","../src/stack/localStack/volcengine.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/scfHttpTrigger.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/apigwDomains.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/schemaExport.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/schema.ts","../src/commands/show.ts","../src/commands/validate.ts","../src/commands/whoami.ts","../src/common/aggregateState.ts","../src/common/aggregateStore.ts","../src/common/apiClient.ts","../src/common/base64.ts","../src/common/bucketPolicy.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/effectiveConfig.ts","../src/common/eventQueue.ts","../src/common/fileUtils.ts","../src/common/functionDefinition.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/jsonOutput.ts","../src/common/lockManager.ts","../src/common/logger.ts","../src/common/migrationMarker.ts","../src/common/nameBuilder.ts","../src/common/noColor.ts","../src/common/planCapabilities.ts","../src/common/planCompare.ts","../src/common/planFormatter.ts","../src/common/planRedaction.ts","../src/common/polling.ts","../src/common/providerEnum.ts","../src/common/providerNames.ts","../src/common/refreshCache.ts","../src/common/refreshPlanner.ts","../src/common/regionalMigration.ts","../src/common/reportResourceEvent.ts","../src/common/requestHelper.ts","../src/common/retryUtils.ts","../src/common/runtimeMapper.ts","../src/common/saasProtocol.ts","../src/common/scfClient.ts","../src/common/siCron.ts","../src/common/sidUtils.ts","../src/common/stateManager.ts","../src/common/stateScope.ts","../src/common/stateStorageIO.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/parser/templateValues.ts","../src/stack/alreadyExists.ts","../src/stack/bucketTypes.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/ownershipTag.ts","../src/stack/aliyunStack/apigwDomainPlan.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/httpAdapter.ts","../src/stack/localStack/httpError.ts","../src/stack/localStack/index.ts","../src/stack/localStack/legacyLambda.ts","../src/stack/localStack/localContext.ts","../src/stack/localStack/localRoute.ts","../src/stack/localStack/localRuntimes.ts","../src/stack/localStack/localServer.ts","../src/stack/localStack/requestBody.ts","../src/stack/localStack/requestId.ts","../src/stack/localStack/tencent.ts","../src/stack/localStack/timer.ts","../src/stack/localStack/utils.ts","../src/stack/localStack/volcengine.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/scfHttpTrigger.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/apigwDomains.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/schemaExport.ts","../src/validator/semanticValidation.ts","../src/validator/tableschema.ts","../src/validator/templateRefSchema.ts"],"version":"6.0.3"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geek-fun/serverlessinsight",
3
- "version": "0.9.4",
3
+ "version": "0.9.6",
4
4
  "description": "Full-lifecycle serverless IaC for Alibaba Cloud, Tencent Cloud and Volcengine — one YAML to define, deploy and operate functions, API gateways, storage and databases.",
5
5
  "homepage": "https://serverlessinsight.com",
6
6
  "main": "dist/src/index.js",
package/release-notes.md CHANGED
@@ -1,48 +1,20 @@
1
+ See the full commit history below for the changes in this release.
1
2
 
2
- ### 🔧 Changed
3
+ ## 👥 Contributors
3
4
 
4
- - CLI help, README examples, command references and sample guides now promote
5
- `si diff` as the only planning command.
5
+ - **blankll** (1 commit)
6
+ - **seven** (1 commit)
6
7
 
7
- ### 🗑 Removed
8
-
9
- - **Breaking:** `si plan` has been removed; `si diff` is now the sole CLI
10
- command for previewing deployment changes
11
- ([#271](https://github.com/geek-fun/serverlessinsight/issues/271)). Invoking
12
- `si plan` fails fast with a localized error directing to `si diff` before any
13
- cloud or state access. Migrate by replacing the command verb — `si diff`
14
- accepts the same options and arguments, exit codes (`0` no changes / `2`
15
- changes / `1` errors) and `--json` envelope (`planVersion: 1`) as the removed
16
- command.
17
-
18
- ### 🐛 Fixed
19
-
20
- - Aliyun API Gateway plans now report each custom domain's binding and
21
- certificate fingerprint, and rewrite only the dimensions that changed.
22
- - Certificate-only and redirect updates skip DNS verification, and removing a
23
- domain deletes only the bindings and DNS records si owns, leaving foreign
24
- records intact.
25
- - CLI language detection now honors `SI_LANG`, normalizes `LC_ALL`/`LANG`, and
26
- no longer prints `chcp` errors on Linux and macOS.
27
8
 
28
9
  ---
29
10
 
30
11
  <details>
31
12
  <summary>📋 Full commit history</summary>
32
13
 
33
- _Changes from v0.9.3 to v0.9.4_
14
+ _Changes from v0.9.5 to v0.9.6_
34
15
 
35
- - ed3964a release: v0.9.4 (blankll, 18 minutes ago)
36
- - b7c9062 chore(metadata): restore npm keyword aliases (blankll, 25 minutes ago)
37
- - 5236bfe docs: optimize READMEs and sync GitHub About metadata (blankll, 36 minutes ago)
38
- - 9103c99 fix(cli): preserve unknown-command suggestions after plan removal (#271) (blankll, 9 hours ago)
39
- - 6980d77 fix(lang): make PLAN_COMMAND_NOT_SUPPORTED wording command-neutral (#271) (blankll, 10 hours ago)
40
- - 73ebe6f feat(cli)!: remove si plan in favor of si diff (#271) (blankll, 10 hours ago)
41
- - 9ecdb8b feat(cli): deprecate si plan in favor of si diff (#271) (blankll, 11 hours ago)
42
- - ef0bcc4 test(aliyun): cover gateway diff and repair edge cases (blankll, 26 hours ago)
43
- - 5e69d08 fix(aliyun): reconcile gateway domain diffs and targeted repairs (blankll, 2 days ago)
44
- - 1a6aaa8 fix(lang): robust locale detection with SI_LANG override, locale normalization and win32-only chcp (blankll, 2 days ago)
45
- - 95de73e docs(brand): regenerate brand.jpg at 16:9 from source image (blankll, 2 days ago)
16
+ - 7fbb40a release: v0.9.6 (blankll, 12 minutes ago)
17
+ - 36ca3d6 fix(parser): preserve strings during template interpolation (#288) (seven, 29 minutes ago)
46
18
 
47
19
  </details>
48
20
 
@@ -50,4 +22,4 @@ _Changes from v0.9.3 to v0.9.4_
50
22
 
51
23
  ## 📦 Install
52
24
 
53
- `npm install -g @geek-fun/serverlessinsight@0.9.4`
25
+ `npm install -g @geek-fun/serverlessinsight@0.9.6`