takomo 10.0.8 → 10.1.0-alpha.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/bin/tkm.mjs +1 -1
- package/dist/command/stacks/deploy/plan.js +2 -2
- package/dist/command/stacks/deploy/plan.js.map +1 -1
- package/dist/command/stacks/drift/detect-drift.js +2 -2
- package/dist/command/stacks/drift/detect-drift.js.map +1 -1
- package/dist/command/stacks/inspect/configuration/command.js +1 -1
- package/dist/command/stacks/inspect/configuration/command.js.map +1 -1
- package/dist/command/stacks/list/list-stacks.js +2 -2
- package/dist/command/stacks/list/list-stacks.js.map +1 -1
- package/dist/command/stacks/undeploy/plan.js +2 -2
- package/dist/command/stacks/undeploy/plan.js.map +1 -1
- package/dist/schema/stacks-schema.js +2 -2
- package/dist/schema/stacks-schema.js.map +1 -1
- package/dist/takomo-stacks-context/config/build-stacks-context.js +3 -2
- package/dist/takomo-stacks-context/config/build-stacks-context.js.map +1 -1
- package/dist/takomo-stacks-context/config/process-config-tree.js +4 -4
- package/dist/takomo-stacks-context/config/process-config-tree.js.map +1 -1
- package/dist/takomo-stacks-context/dependencies.js +3 -2
- package/dist/takomo-stacks-context/dependencies.js.map +1 -1
- package/dist/takomo-stacks-model/util.d.ts +2 -1
- package/dist/takomo-stacks-model/util.js +8 -1
- package/dist/takomo-stacks-model/util.js.map +1 -1
- package/dist/utils/yaml.js +6 -3
- package/dist/utils/yaml.js.map +1 -1
- package/package.json +37 -37
package/bin/tkm.mjs
CHANGED
|
@@ -77,7 +77,7 @@ const convertToOperation = (pair) => {
|
|
|
77
77
|
export const buildStacksDeployPlan = async (stacks, commandPath, ignoreDependencies, logger, ctx) => {
|
|
78
78
|
const stacksByPath = arrayToMap(stacks, (s) => s.path);
|
|
79
79
|
const stacksToDeploy = stacks
|
|
80
|
-
.filter((s) => isWithinCommandPath(s.path
|
|
80
|
+
.filter((s) => isWithinCommandPath(commandPath, s.path))
|
|
81
81
|
.reduce((collected, stack) => R.uniq([
|
|
82
82
|
stack.path,
|
|
83
83
|
...collected,
|
|
@@ -90,7 +90,7 @@ export const buildStacksDeployPlan = async (stacks, commandPath, ignoreDependenc
|
|
|
90
90
|
const operations = stackPairs.map(convertToOperation);
|
|
91
91
|
return {
|
|
92
92
|
operations: ignoreDependencies
|
|
93
|
-
? operations.filter((o) => isWithinCommandPath(o.stack.path
|
|
93
|
+
? operations.filter((o) => isWithinCommandPath(commandPath, o.stack.path))
|
|
94
94
|
: operations,
|
|
95
95
|
};
|
|
96
96
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/command/stacks/deploy/plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAK1B,OAAO,EAEL,uBAAuB,GACxB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAA;AACpF,OAAO,EACL,aAAa,EACb,mBAAmB,GACpB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAG1D,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,GAElB,MAAM,qCAAqC,CAAA;AAE5C,OAAO,EAEL,qBAAqB,GACtB,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEpE;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,YAA2C,EAC3C,KAAoB,EACM,EAAE,CAC5B,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;IAClD,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACpD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,UAAU,YAAY,CAAC,CAAA;IACtE,CAAC;IAED,OAAO,CAAC,CAAC,IAAI,CAAC;QACZ,UAAU;QACV,GAAG,SAAS;QACZ,GAAG,wBAAwB,CAAC,YAAY,EAAE,eAAe,CAAC;KAC3D,CAAC,CAAA;AACJ,CAAC,EAAE,IAAI,KAAK,EAAa,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/command/stacks/deploy/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { isNotObsolete } from "../../../takomo-stacks-model/util.js";
|
|
1
|
+
import { isNotObsolete, isWithinCommandPath, } from "../../../takomo-stacks-model/util.js";
|
|
2
2
|
import { isCustomStackPair, isStandardStackPair, loadCurrentStacks, } from "../common/load-current-cf-stacks.js";
|
|
3
3
|
export const detectDrift = async (ctx, input, logger) => {
|
|
4
4
|
logger.info("Detecting drift, this might take a few minutes...");
|
|
5
5
|
const { timer } = input;
|
|
6
6
|
const stacksWithinCommandPath = ctx.stacks
|
|
7
|
-
.filter((stack) =>
|
|
7
|
+
.filter((stack) => isWithinCommandPath(input.commandPath, stack.path))
|
|
8
8
|
.filter(isNotObsolete);
|
|
9
9
|
const stackPairs = await loadCurrentStacks(logger, stacksWithinCommandPath, ctx);
|
|
10
10
|
const standardStacks = stackPairs.filter(isStandardStackPair);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect-drift.js","sourceRoot":"","sources":["../../../../src/command/stacks/drift/detect-drift.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"detect-drift.js","sourceRoot":"","sources":["../../../../src/command/stacks/drift/detect-drift.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,mBAAmB,GACpB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,qCAAqC,CAAA;AAG5C,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,GAA0B,EAC1B,KAAuB,EACvB,MAAiB,EACW,EAAE;IAC9B,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAA;IAChE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAA;IAEvB,MAAM,uBAAuB,GAAG,GAAG,CAAC,MAAM;SACvC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SACrE,MAAM,CAAC,aAAa,CAAC,CAAA;IAExB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,MAAM,EACN,uBAAuB,EACvB,GAAG,CACJ,CAAA;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;IAE7D,MAAM,MAAM,GAAkC,MAAM,OAAO,CAAC,GAAG,CAC7D,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QAC9C,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAE7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;QAC7C,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,uBAAuB,EAAE,CAAA;QACpD,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC/C,MAAM,oBAAoB,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAC1E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IACnE,CAAC,CAAC,CACH,CAAA;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,EAAE,gBAAgB,KAAK,SAAS,CAC9D,CAAA;IAED,OAAO;QACL,OAAO,EAAE,CAAC,UAAU;QACpB,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACzC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAC1C,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QACnB,MAAM;KACP,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -18,7 +18,7 @@ const modifyStacks = async (input, ctx, io) => {
|
|
|
18
18
|
}
|
|
19
19
|
const stacksByPath = arrayToMap(stacks, getStackPath);
|
|
20
20
|
const modifiedStacks = stacks
|
|
21
|
-
.filter((s) => isWithinCommandPath(s.path
|
|
21
|
+
.filter((s) => isWithinCommandPath(commandPath, s.path))
|
|
22
22
|
.reduce((collected, stack) => R.uniq([
|
|
23
23
|
stack.path,
|
|
24
24
|
...collected,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../../src/command/stacks/inspect/configuration/command.ts"],"names":[],"mappings":"AAAA,OAAO,GAAkB,MAAM,KAAK,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../../src/command/stacks/inspect/configuration/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { isNotObsolete } from "../../../takomo-stacks-model/util.js";
|
|
1
|
+
import { isNotObsolete, isWithinCommandPath, } from "../../../takomo-stacks-model/util.js";
|
|
2
2
|
import { isCustomStackPair, isStandardStackPair, loadCurrentStacks, } from "../common/load-current-cf-stacks.js";
|
|
3
3
|
import { exhaustiveCheck } from "../../../utils/exhaustive-check.js";
|
|
4
4
|
export const listStacks = async (ctx, input, logger) => {
|
|
5
5
|
const { timer, commandPath, outputFormat } = input;
|
|
6
6
|
const stacksWithinCommandPath = ctx.stacks
|
|
7
|
-
.filter((stack) => stack.path
|
|
7
|
+
.filter((stack) => isWithinCommandPath(commandPath, stack.path))
|
|
8
8
|
.filter(isNotObsolete);
|
|
9
9
|
const stackPairs = await loadCurrentStacks(logger, stacksWithinCommandPath, ctx);
|
|
10
10
|
const results = stackPairs.map((pair) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-stacks.js","sourceRoot":"","sources":["../../../../src/command/stacks/list/list-stacks.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"list-stacks.js","sourceRoot":"","sources":["../../../../src/command/stacks/list/list-stacks.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,mBAAmB,GACpB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,qCAAqC,CAAA;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEpE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,GAA0B,EAC1B,KAAsB,EACtB,MAAiB,EACU,EAAE;IAC7B,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,KAAK,CAAA;IAElD,MAAM,uBAAuB,GAAG,GAAG,CAAC,MAAM;SACvC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAC/D,MAAM,CAAC,aAAa,CAAC,CAAA;IAExB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,MAAM,EACN,uBAAuB,EACvB,GAAG,CACJ,CAAA;IAED,MAAM,OAAO,GAA6B,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAChE,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;gBAChC,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,YAAY;gBAC5C,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,eAAe;aAChD,CAAA;QACH,CAAC;QAED,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM;gBACjC,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,YAAY;gBAC5C,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,eAAe;aAChD,CAAA;QACH,CAAC;QAED,OAAO,eAAe,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;QAClB,YAAY;QACZ,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QACnB,OAAO;KACR,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -67,7 +67,7 @@ export const buildStacksUndeployPlan = async (ctx, stacks, commandPath, ignoreDe
|
|
|
67
67
|
const pruneFilter = prune ? isObsolete : isNotObsolete;
|
|
68
68
|
const stacksByPath = arrayToMap(stacks, getStackPath);
|
|
69
69
|
const stacksToUndeploy = stacks
|
|
70
|
-
.filter((s) => isWithinCommandPath(s.path
|
|
70
|
+
.filter((s) => isWithinCommandPath(commandPath, s.path))
|
|
71
71
|
.reduce((collected, stack) => R.uniq([
|
|
72
72
|
stack.path,
|
|
73
73
|
...collected,
|
|
@@ -77,7 +77,7 @@ export const buildStacksUndeployPlan = async (ctx, stacks, commandPath, ignoreDe
|
|
|
77
77
|
.filter(pruneFilter);
|
|
78
78
|
const sortedStacks = sortStacksForUndeploy(stacksToUndeploy);
|
|
79
79
|
const selectedStacks = ignoreDependencies
|
|
80
|
-
? sortedStacks.filter((stack) => isWithinCommandPath(stack.path
|
|
80
|
+
? sortedStacks.filter((stack) => isWithinCommandPath(commandPath, stack.path))
|
|
81
81
|
: sortedStacks;
|
|
82
82
|
const operations = await Promise.all(selectedStacks.map((stack) => convertToUndeployOperation(ctx, stacksByPath, stack, prune)));
|
|
83
83
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/command/stacks/undeploy/plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAE1B,OAAO,EAEL,uBAAuB,GACxB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACL,YAAY,EACZ,aAAa,EACb,UAAU,EACV,mBAAmB,GACpB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAA;AAEtF,OAAO,EAEL,qBAAqB,GACtB,MAAM,iCAAiC,CAAA;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAKzE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,YAAsB,EACM,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAEnE,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,YAA8B,EACF,EAAE;IAC9B,QAAQ,YAAY,CAAC,MAAM,EAAE,CAAC;QAC5B,KAAK,iBAAiB,CAAC;QACvB,KAAK,iBAAiB,CAAC;QACvB,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAA;QACjB,KAAK,SAAS;YACZ,OAAO,MAAM,CAAA;QACf;YACE,OAAO,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/command/stacks/undeploy/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,7 +115,7 @@ export const createStacksSchemas = (props) => {
|
|
|
115
115
|
const customStackType = Joi.string();
|
|
116
116
|
const stackPath = Joi.string()
|
|
117
117
|
.max(100)
|
|
118
|
-
.regex(/^(\/[a-zA-Z][a-zA-Z0-9-]*)+\.yml
|
|
118
|
+
.regex(/^(\/[a-zA-Z][a-zA-Z0-9-]*)+\.yml(\/[a-z0-9-]+)?$/)
|
|
119
119
|
.custom((value, helpers) => {
|
|
120
120
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
121
121
|
const [path, regionPart] = value.split(".yml", 2);
|
|
@@ -136,7 +136,7 @@ export const createStacksSchemas = (props) => {
|
|
|
136
136
|
});
|
|
137
137
|
const relativeStackPath = Joi.string()
|
|
138
138
|
.max(100)
|
|
139
|
-
.regex(/^(((\/|(\.\.\/)+)?)[a-zA-Z][a-zA-Z0-9-]*)+\.yml
|
|
139
|
+
.regex(/^(((\/|(\.\.\/)+)?)[a-zA-Z][a-zA-Z0-9-]*)+\.yml(\/[a-z0-9-]+)?$/)
|
|
140
140
|
.custom((value, helpers) => {
|
|
141
141
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
142
142
|
const [path, regionPart] = value.split(".yml", 2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stacks-schema.js","sourceRoot":"","sources":["../../src/schema/stacks-schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stacks-schema.js","sourceRoot":"","sources":["../../src/schema/stacks-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { coreResolverProviders, ResolverRegistry, } from "../../resolvers/resolv
|
|
|
3
3
|
import { normalizeStackPath } from "../../stacks/stack.js";
|
|
4
4
|
import { ROOT_STACK_GROUP_PATH } from "../../takomo-stacks-model/constants.js";
|
|
5
5
|
import { createSchemaRegistry } from "../../takomo-stacks-model/schemas.js";
|
|
6
|
+
import { isWithinCommandPath } from "../../takomo-stacks-model/util.js";
|
|
6
7
|
import { arrayToMap, collectFromHierarchy } from "../../utils/collections.js";
|
|
7
8
|
import { isStackGroupPath } from "../common.js";
|
|
8
9
|
import { CommandPathMatchesNoStacksError, } from "../model.js";
|
|
@@ -28,7 +29,7 @@ export const validateCommandPath = (configTree, commandPath) => {
|
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
else if (!stackGroupPaths.some((s) => s === commandPath)) {
|
|
31
|
-
if (!stackPaths.some((s) =>
|
|
32
|
+
if (!stackPaths.some((s) => isWithinCommandPath(s, commandPath))) {
|
|
32
33
|
throw new CommandPathMatchesNoStacksError(commandPath, stackPaths);
|
|
33
34
|
}
|
|
34
35
|
}
|
|
@@ -85,7 +86,7 @@ export const buildStacksContext = async ({ ctx, logger, credentialManager, comma
|
|
|
85
86
|
const normalizedPath = stackGroupPath
|
|
86
87
|
? normalizeStackPath(stackGroupPath, path)
|
|
87
88
|
: path;
|
|
88
|
-
return stacks.filter((s) => s.path
|
|
89
|
+
return stacks.filter((s) => isWithinCommandPath(normalizedPath, s.path));
|
|
89
90
|
},
|
|
90
91
|
};
|
|
91
92
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-stacks-context.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-stacks-context.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EACL,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,kBAAkB,EAAa,MAAM,uBAAuB,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAE7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EACL,+BAA+B,GAEhC,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EACL,+BAA+B,EAC/B,gCAAgC,GACjC,MAAM,sDAAsD,CAAA;AAY7D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,UAAsB,EACtB,WAAyB,EACnB,EAAE;IACR,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,qBAAqB,EAAE,CAAC;QAC1D,OAAM;IACR,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CACtC,UAAU,CAAC,cAAc,EACzB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CACxB,CAAA;IAED,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACtD,MAAM,UAAU,GAAG,WAAW;SAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpB,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAErB,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,+BAA+B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QACpE,CAAC;IACH,CAAC;SAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,EAAE,CAAC;QAC3D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"build-stacks-context.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-stacks-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import _ from "lodash";
|
|
|
2
2
|
import { createStackGroup, } from "../../stacks/stack-group.js";
|
|
3
3
|
import { normalizeStackPath, } from "../../stacks/stack.js";
|
|
4
4
|
import { ROOT_STACK_GROUP_PATH } from "../../takomo-stacks-model/constants.js";
|
|
5
|
-
import {
|
|
5
|
+
import { isRelatedToCommandPath } from "../../takomo-stacks-model/util.js";
|
|
6
6
|
import { arrayToMap } from "../../utils/collections.js";
|
|
7
7
|
import { checkCyclicDependencies, checkObsoleteDependencies, processStackDependencies, } from "../dependencies.js";
|
|
8
8
|
import { doCreateStackGroup } from "./create-stack-group.js";
|
|
@@ -48,7 +48,7 @@ const populateChildrenAndStacks = (stackGroup, allStacks, allStackGroups) => {
|
|
|
48
48
|
};
|
|
49
49
|
const processStackGroupConfigNode = async (ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, commandPath, status, node, configRepository, customStackHandlerRegistry) => {
|
|
50
50
|
logger.trace(`Process stack group config node with path '${node.path}'`);
|
|
51
|
-
if (!
|
|
51
|
+
if (!isRelatedToCommandPath(commandPath, node.path)) {
|
|
52
52
|
logger.trace(`Stack group config node with path '${node.path}' is not within command path '${commandPath}'`);
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
@@ -67,11 +67,11 @@ const processStackGroupConfigNode = async (ctx, logger, credentialManager, crede
|
|
|
67
67
|
const stacksToProcess = currentStackGroup.ignore
|
|
68
68
|
? []
|
|
69
69
|
: node.stacks
|
|
70
|
-
.filter((item) =>
|
|
70
|
+
.filter((item) => isRelatedToCommandPath(commandPath, item.path))
|
|
71
71
|
.filter((item) => !status.isStackProcessed(item.path));
|
|
72
72
|
const processedStacks = await Promise.all(stacksToProcess.map((stack) => buildStack(ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, stack, status.getStackGroup(node.path), commandPath, status, configRepository, customStackHandlerRegistry)));
|
|
73
73
|
processedStacks.flat().forEach(status.setStackProcessed);
|
|
74
|
-
const childrenToProcess = node.children.filter((child) =>
|
|
74
|
+
const childrenToProcess = node.children.filter((child) => isRelatedToCommandPath(commandPath, child.path));
|
|
75
75
|
await Promise.all(childrenToProcess.map((child) => processStackGroupConfigNode(ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, commandPath, status, child, configRepository, customStackHandlerRegistry)));
|
|
76
76
|
};
|
|
77
77
|
export const processConfigTree = async (ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, commandPath, configTree, configRepository, customStackHandlerRegistry) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-config-tree.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/process-config-tree.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAOtB,OAAO,EACL,gBAAgB,GAGjB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAEL,kBAAkB,GAEnB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAE9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"process-config-tree.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/process-config-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import _ from "lodash";
|
|
|
2
2
|
import { TakomoError } from "../utils/errors.js";
|
|
3
3
|
import { ObsoleteDependenciesError } from "./errors.js";
|
|
4
4
|
import { createInternalStack, normalizeStackPath, } from "../stacks/stack.js";
|
|
5
|
+
import { isWithinCommandPath } from "../takomo-stacks-model/util.js";
|
|
5
6
|
export const checkCyclicDependenciesForStack = (stack, stacks, collectedDependencies) => {
|
|
6
7
|
if (stack.dependencies.length === 0) {
|
|
7
8
|
return;
|
|
@@ -71,7 +72,7 @@ export const processStackDependencies = (stacks) => {
|
|
|
71
72
|
.map((stack) => {
|
|
72
73
|
const stackDependencies = stack.dependencies.map((dependency) => {
|
|
73
74
|
const matching = stacks
|
|
74
|
-
.filter((other) => other.path
|
|
75
|
+
.filter((other) => isWithinCommandPath(dependency, other.path))
|
|
75
76
|
.map((other) => other.path);
|
|
76
77
|
if (matching.length === 0) {
|
|
77
78
|
throw new TakomoError(`Dependency ${dependency} in stack ${stack.path} refers to a non-existing stack`);
|
|
@@ -84,7 +85,7 @@ export const processStackDependencies = (stacks) => {
|
|
|
84
85
|
.map((dependency) => {
|
|
85
86
|
const normalizedDependency = normalizeStackPath(stack.stackGroupPath, dependency);
|
|
86
87
|
const matching = stacks
|
|
87
|
-
.filter((other) => other.path
|
|
88
|
+
.filter((other) => isWithinCommandPath(normalizedDependency, other.path))
|
|
88
89
|
.map((other) => other.path);
|
|
89
90
|
if (matching.length === 0) {
|
|
90
91
|
throw new TakomoError(`Dependency ${dependency} in parameter ${parameterName} of stack ${stack.path} refers to a non-existing stack`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,GAGnB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,5 @@ import { InternalStack, Stack, StackPath } from "../stacks/stack.js";
|
|
|
3
3
|
export declare const getStackPath: ({ path }: Stack) => StackPath;
|
|
4
4
|
export declare const isObsolete: (stack: InternalStack) => boolean;
|
|
5
5
|
export declare const isNotObsolete: (stack: InternalStack) => boolean;
|
|
6
|
-
export declare const isWithinCommandPath: (commandPath: CommandPath,
|
|
6
|
+
export declare const isWithinCommandPath: (commandPath: CommandPath, path: CommandPath) => boolean;
|
|
7
|
+
export declare const isRelatedToCommandPath: (commandPath: CommandPath, path: CommandPath) => boolean;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
export const getStackPath = ({ path }) => path;
|
|
2
2
|
export const isObsolete = (stack) => stack.obsolete;
|
|
3
3
|
export const isNotObsolete = (stack) => !isObsolete(stack);
|
|
4
|
-
export const isWithinCommandPath = (commandPath,
|
|
4
|
+
export const isWithinCommandPath = (commandPath, path) => {
|
|
5
|
+
const pathSegments = path.split("/").filter(Boolean);
|
|
6
|
+
const commandPathSegments = commandPath.split("/").filter(Boolean);
|
|
7
|
+
return (commandPathSegments.length <= pathSegments.length &&
|
|
8
|
+
commandPathSegments.every((segment, index) => segment === pathSegments[index]));
|
|
9
|
+
};
|
|
10
|
+
export const isRelatedToCommandPath = (commandPath, path) => isWithinCommandPath(commandPath, path) ||
|
|
11
|
+
isWithinCommandPath(path, commandPath);
|
|
5
12
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/takomo-stacks-model/util.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAS,EAAa,EAAE,CAAC,IAAI,CAAA;AAEhE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAoB,EAAW,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAA;AAE3E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAoB,EAAW,EAAE,CAC7D,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AAEpB,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/takomo-stacks-model/util.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAS,EAAa,EAAE,CAAC,IAAI,CAAA;AAEhE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAoB,EAAW,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAA;AAE3E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAoB,EAAW,EAAE,CAC7D,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AAEpB,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAAwB,EACxB,IAAiB,EACR,EAAE;IACX,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACpD,MAAM,mBAAmB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAElE,OAAO,CACL,mBAAmB,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM;QACjD,mBAAmB,CAAC,KAAK,CACvB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CACpD,CACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,WAAwB,EACxB,IAAiB,EACR,EAAE,CACX,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC;IACtC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA"}
|
package/dist/utils/yaml.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { load, dump } from "js-yaml";
|
|
2
2
|
import stringify from "json-stable-stringify";
|
|
3
3
|
import { TakomoError } from "./errors.js";
|
|
4
4
|
import { readFileContents } from "./files.js";
|
|
5
5
|
import { buildErrorMessage } from "./templating.js";
|
|
6
6
|
export const parseYamlString = (contents) => {
|
|
7
|
-
const parsed =
|
|
7
|
+
const parsed = load(contents);
|
|
8
8
|
return parsed ? parsed : {};
|
|
9
9
|
};
|
|
10
10
|
export const parseYaml = (filePath, contents) => {
|
|
11
|
+
if (contents.trim() === "") {
|
|
12
|
+
return {};
|
|
13
|
+
}
|
|
11
14
|
try {
|
|
12
15
|
return parseYamlString(contents);
|
|
13
16
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -28,7 +31,7 @@ export const parseYaml = (filePath, contents) => {
|
|
|
28
31
|
}
|
|
29
32
|
};
|
|
30
33
|
export const parseYamlFile = async (pathToYamlFile) => readFileContents(pathToYamlFile).then((c) => parseYaml(pathToYamlFile, c));
|
|
31
|
-
export const formatYaml = (object) =>
|
|
34
|
+
export const formatYaml = (object) => dump(JSON.parse(stringify(object)), {
|
|
32
35
|
skipInvalid: true,
|
|
33
36
|
lineWidth: 300,
|
|
34
37
|
noRefs: true,
|
package/dist/utils/yaml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAY,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAMnD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAA6B,EACT,EAAE;IACtB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC7B,OAAO,MAAM,CAAC,CAAC,CAAE,MAA6B,CAAC,CAAC,CAAC,EAAE,CAAA;AACrD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,QAAkB,EAClB,QAA6B,EACT,EAAE;IACtB,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,CAAC;QACH,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;QAChC,8DAA8D;IAChE,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAC/B,MAAM,YAAY,GAAG,iBAAiB,CACpC,yCAAyC,QAAQ,EAAE,EACnD,QAAQ,EACR;gBACE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;gBAC5B,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;gBAC/B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;gBAC1B,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;gBAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB,CACF,CAAA;YAED,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;QACrC,CAAC;QAED,MAAM,YAAY,GAAG,iBAAiB,CACpC,yCAAyC,QAAQ,EAAE,EACnD,QAAQ,EACR,CAAC,CACF,CAAA;QAED,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;IACrC,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,cAAwB,EACK,EAAE,CAC/B,gBAAgB,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;AAE5E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAe,EAAuB,EAAE,CACjE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAE,CAAC,EAAE;IACnC,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,GAAG;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;CACf,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "takomo",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.1.0-alpha.2",
|
|
4
4
|
"description": "Organize, configure and deploy CloudFormation stacks.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"dist"
|
|
32
32
|
],
|
|
33
33
|
"engines": {
|
|
34
|
-
"node": ">=
|
|
34
|
+
"node": ">=26.5.1"
|
|
35
35
|
},
|
|
36
36
|
"os": [
|
|
37
37
|
"darwin",
|
|
@@ -82,12 +82,12 @@
|
|
|
82
82
|
}
|
|
83
83
|
},
|
|
84
84
|
"devDependencies": {
|
|
85
|
-
"ts-jest": "29.4.
|
|
86
|
-
"@jest/globals": "30.
|
|
87
|
-
"@aws-sdk/client-ec2": "3.
|
|
85
|
+
"ts-jest": "29.4.12",
|
|
86
|
+
"@jest/globals": "30.4.1",
|
|
87
|
+
"@aws-sdk/client-ec2": "3.1105.0",
|
|
88
88
|
"@commitlint/cli": "21.2.1",
|
|
89
89
|
"@commitlint/config-conventional": "21.2.0",
|
|
90
|
-
"@jest/console": "30.
|
|
90
|
+
"@jest/console": "30.4.1",
|
|
91
91
|
"@takomo/test-custom-helper-lowercase": "0.0.1",
|
|
92
92
|
"@takomo/test-custom-helper-uppercase": "0.0.1",
|
|
93
93
|
"@takomo/test-custom-resolver-code": "0.0.1",
|
|
@@ -96,71 +96,71 @@
|
|
|
96
96
|
"@types/jest": "30.0.0",
|
|
97
97
|
"@types/jmespath": "0.15.2",
|
|
98
98
|
"@types/js-yaml": "4.0.9",
|
|
99
|
-
"@types/node": "
|
|
99
|
+
"@types/node": "26.1.2",
|
|
100
100
|
"@types/ramda": "0.31.1",
|
|
101
|
-
"@types/semver": "7.
|
|
101
|
+
"@types/semver": "7.8.0",
|
|
102
102
|
"@types/yargs": "17.0.35",
|
|
103
103
|
"@types/ejs": "3.1.5",
|
|
104
|
-
"@types/lodash": "4.17.
|
|
105
|
-
"@typescript-eslint/eslint-plugin": "8.
|
|
106
|
-
"@typescript-eslint/parser": "8.
|
|
104
|
+
"@types/lodash": "4.17.25",
|
|
105
|
+
"@typescript-eslint/eslint-plugin": "8.66.0",
|
|
106
|
+
"@typescript-eslint/parser": "8.66.0",
|
|
107
107
|
"depcheck": "1.4.7",
|
|
108
|
-
"eslint": "10.
|
|
108
|
+
"eslint": "10.8.0",
|
|
109
109
|
"eslint-config-prettier": "10.1.8",
|
|
110
110
|
"eslint-plugin-prettier": "5.5.6",
|
|
111
111
|
"@eslint/js": "10.0.1",
|
|
112
112
|
"@eslint/eslintrc": "3.3.6",
|
|
113
113
|
"husky": "9.1.7",
|
|
114
|
-
"jest": "30.
|
|
115
|
-
"jest-environment-
|
|
114
|
+
"jest": "30.4.2",
|
|
115
|
+
"jest-environment-node": "30.4.1",
|
|
116
116
|
"jest-mock-extended": "4.0.1",
|
|
117
|
-
"prettier": "3.9.
|
|
117
|
+
"prettier": "3.9.6",
|
|
118
118
|
"prettier-plugin-organize-imports": "4.3.0",
|
|
119
|
-
"lint-staged": "17.0
|
|
119
|
+
"lint-staged": "17.3.0",
|
|
120
120
|
"ts-node": "10.9.2",
|
|
121
121
|
"typedoc": "0.28.20",
|
|
122
122
|
"typescript": "6.0.3",
|
|
123
|
-
"semantic-release": "25.0.
|
|
124
|
-
"npm-check-updates": "
|
|
123
|
+
"semantic-release": "25.0.9",
|
|
124
|
+
"npm-check-updates": "23.0.1"
|
|
125
125
|
},
|
|
126
126
|
"dependencies": {
|
|
127
|
-
"@aws-sdk/client-cloudformation": "3.
|
|
128
|
-
"@aws-sdk/client-cloudtrail": "3.
|
|
129
|
-
"@aws-sdk/client-organizations": "3.
|
|
130
|
-
"@aws-sdk/client-s3": "3.
|
|
131
|
-
"@aws-sdk/client-secrets-manager": "3.
|
|
132
|
-
"@aws-sdk/client-ssm": "3.
|
|
133
|
-
"@aws-sdk/client-sts": "3.
|
|
134
|
-
"@aws-sdk/credential-providers": "3.
|
|
135
|
-
"@smithy/util-retry": "4.5.
|
|
136
|
-
"@smithy/node-http-handler": "4.9.
|
|
137
|
-
"@aws-sdk/types": "3.974.
|
|
138
|
-
"chalk": "
|
|
139
|
-
"cockatiel": "
|
|
127
|
+
"@aws-sdk/client-cloudformation": "3.1105.0",
|
|
128
|
+
"@aws-sdk/client-cloudtrail": "3.1105.0",
|
|
129
|
+
"@aws-sdk/client-organizations": "3.1105.0",
|
|
130
|
+
"@aws-sdk/client-s3": "3.1105.0",
|
|
131
|
+
"@aws-sdk/client-secrets-manager": "3.1105.0",
|
|
132
|
+
"@aws-sdk/client-ssm": "3.1105.0",
|
|
133
|
+
"@aws-sdk/client-sts": "3.1105.0",
|
|
134
|
+
"@aws-sdk/credential-providers": "3.1105.0",
|
|
135
|
+
"@smithy/util-retry": "4.5.16",
|
|
136
|
+
"@smithy/node-http-handler": "4.9.13",
|
|
137
|
+
"@aws-sdk/types": "3.974.2",
|
|
138
|
+
"chalk": "6.0.0",
|
|
139
|
+
"cockatiel": "4.0.0",
|
|
140
140
|
"date-and-time": "4.5.1",
|
|
141
141
|
"diff": "9.0.0",
|
|
142
142
|
"dotenv": "17.4.2",
|
|
143
|
-
"dotenv-expand": "
|
|
143
|
+
"dotenv-expand": "1000.0.0",
|
|
144
144
|
"easy-table": "1.2.0",
|
|
145
145
|
"folder-hash": "4.1.3",
|
|
146
146
|
"handlebars": "4.7.9",
|
|
147
147
|
"@inquirer/prompts": "8.5.2",
|
|
148
148
|
"jmespath": "0.16.0",
|
|
149
149
|
"joi": "18.2.3",
|
|
150
|
-
"js-yaml": "
|
|
150
|
+
"js-yaml": "5.2.3",
|
|
151
151
|
"json-stable-stringify": "1.3.0",
|
|
152
152
|
"neverthrow": "8.2.0",
|
|
153
|
-
"p-queue": "9.3.
|
|
153
|
+
"p-queue": "9.3.3",
|
|
154
154
|
"pretty-ms": "9.3.0",
|
|
155
155
|
"ramda": "0.32.0",
|
|
156
|
-
"readdirp": "5.
|
|
156
|
+
"readdirp": "5.1.1",
|
|
157
157
|
"semver": "7.8.5",
|
|
158
158
|
"source-map-support": "0.5.21",
|
|
159
159
|
"ts-dedent": "2.3.0",
|
|
160
160
|
"uuid": "14.0.1",
|
|
161
|
-
"yargs": "18.
|
|
161
|
+
"yargs": "18.1.0",
|
|
162
162
|
"esbuild": "0.28.1",
|
|
163
|
-
"ejs": "
|
|
163
|
+
"ejs": "6.0.1",
|
|
164
164
|
"lodash": "4.18.1"
|
|
165
165
|
}
|
|
166
166
|
}
|