takomo 10.0.5 → 10.0.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.
- package/dist/aws/cloudformation/client.js +4 -5
- package/dist/aws/cloudformation/client.js.map +1 -1
- package/dist/aws/common/retry.d.ts +2 -2
- package/dist/aws/common/retry.js +29 -18
- package/dist/aws/common/retry.js.map +1 -1
- package/dist/command/targets/run/run.js +2 -2
- package/dist/command/targets/run/run.js.map +1 -1
- package/dist/custom-stacks/cmd-custom-stack-handler.js +2 -2
- package/dist/custom-stacks/cmd-custom-stack-handler.js.map +1 -1
- package/dist/hooks/cmd-hook.js +2 -2
- package/dist/hooks/cmd-hook.js.map +1 -1
- package/dist/parser/targets/parse-deployment-groups.js +3 -3
- package/dist/parser/targets/parse-deployment-groups.js.map +1 -1
- package/dist/parser/targets/parse-deployment-targets.js +2 -2
- package/dist/parser/targets/parse-deployment-targets.js.map +1 -1
- package/dist/resolvers/cmd-resolver.js +2 -2
- package/dist/resolvers/cmd-resolver.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js +1 -2
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js.map +1 -1
- package/dist/takomo-stacks-context/config/build-custom-stack.js +2 -2
- package/dist/takomo-stacks-context/config/build-custom-stack.js.map +1 -1
- package/dist/takomo-stacks-context/config/build-standard-stack.js +2 -2
- package/dist/takomo-stacks-context/config/build-standard-stack.js.map +1 -1
- package/dist/takomo-stacks-context/config/process-config-tree.js +2 -2
- package/dist/takomo-stacks-context/config/process-config-tree.js.map +1 -1
- package/dist/takomo-stacks-context/dependencies.js +4 -4
- package/dist/takomo-stacks-context/dependencies.js.map +1 -1
- package/dist/utils/collections.js +6 -5
- package/dist/utils/collections.js.map +1 -1
- package/package.json +32 -32
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { CloudFormation, } from "@aws-sdk/client-cloudformation";
|
|
2
2
|
import _ from "lodash";
|
|
3
|
-
import * as R from "ramda";
|
|
4
3
|
import { ACTIVE_STACK_STATUSES, isTerminalResourceStatus, } from "./model.js";
|
|
5
4
|
import { arrayToMap } from "../../utils/collections.js";
|
|
6
5
|
import { uuid } from "../../utils/strings.js";
|
|
@@ -226,12 +225,12 @@ export const createCloudFormationClient = (props) => {
|
|
|
226
225
|
stackStatus: terminalEvent.resourceStatus,
|
|
227
226
|
};
|
|
228
227
|
}
|
|
229
|
-
const latestEvent =
|
|
228
|
+
const latestEvent = _.last(events);
|
|
230
229
|
const newLatestEventId = latestEvent ? latestEvent.id : latestEventId;
|
|
231
230
|
if (timeoutConfig.timeout !== 0) {
|
|
232
231
|
const elapsedTime = Date.now() - timeoutConfig.startTime;
|
|
233
232
|
if (elapsedTime > timeoutConfig.timeout * 1000) {
|
|
234
|
-
const latestStackEvent =
|
|
233
|
+
const latestStackEvent = _.last(updatedEvents.filter(({ resourceType, physicalResourceId }) => resourceType === "AWS::CloudFormation::Stack" &&
|
|
235
234
|
physicalResourceId === stackId));
|
|
236
235
|
if (!latestStackEvent) {
|
|
237
236
|
throw new Error(`Expected latest event to exist for stack ${stackId}`);
|
|
@@ -275,7 +274,7 @@ export const createCloudFormationClient = (props) => {
|
|
|
275
274
|
stackStatus: terminalEvent.resourceStatus,
|
|
276
275
|
};
|
|
277
276
|
}
|
|
278
|
-
const latestEvent =
|
|
277
|
+
const latestEvent = _.last(events);
|
|
279
278
|
const newLatestEventId = latestEvent ? latestEvent.id : latestEventId;
|
|
280
279
|
return waitStackDeleteToComplete({
|
|
281
280
|
...props,
|
|
@@ -301,7 +300,7 @@ export const createCloudFormationClient = (props) => {
|
|
|
301
300
|
stackStatus: stack.status,
|
|
302
301
|
};
|
|
303
302
|
}
|
|
304
|
-
const latestEvent =
|
|
303
|
+
const latestEvent = _.last(events);
|
|
305
304
|
const newLatestEventId = latestEvent ? latestEvent.id : latestEventId;
|
|
306
305
|
return waitStackRollbackToComplete({
|
|
307
306
|
...props,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/cloudformation/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/cloudformation/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RetryStrategyV2 } from "@aws-sdk/types";
|
|
2
2
|
import { TkmLogger } from "../../utils/logging.js";
|
|
3
|
-
export declare const customRetryStrategy: (logger: TkmLogger) =>
|
|
3
|
+
export declare const customRetryStrategy: (logger: TkmLogger) => RetryStrategyV2;
|
package/dist/aws/common/retry.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfiguredRetryStrategy } from "@smithy/util-retry";
|
|
2
2
|
import { randomInt } from "../../utils/random.js";
|
|
3
3
|
const ADDITIONAL_RETRYABLE_ERROR_CODES = [
|
|
4
4
|
"UnknownEndpoint",
|
|
@@ -15,27 +15,38 @@ const decideByLowLevelError = (logger, error) => {
|
|
|
15
15
|
}
|
|
16
16
|
return false;
|
|
17
17
|
};
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
logger.trace(`Retry decision from default retry decider: ${defaultRetryDecision}`);
|
|
24
|
-
const additionalRetryableErrorCodesDecision = ADDITIONAL_RETRYABLE_ERROR_CODES.includes(error.name);
|
|
25
|
-
logger.trace(`Retry decision from additional error codes: ${additionalRetryableErrorCodesDecision}`);
|
|
26
|
-
const lowLevelDecision = decideByLowLevelError(logger, error);
|
|
27
|
-
logger.trace(`Retry decision from low level error: ${lowLevelDecision}`);
|
|
28
|
-
return (defaultRetryDecision ||
|
|
29
|
-
additionalRetryableErrorCodesDecision ||
|
|
30
|
-
lowLevelDecision);
|
|
31
|
-
},
|
|
32
|
-
delayDecider: (delayBase, attempts) => {
|
|
18
|
+
const isDefaultRetryableErrorType = (errorType) => errorType === "THROTTLING" || errorType === "TRANSIENT";
|
|
19
|
+
class CustomRetryStrategy extends ConfiguredRetryStrategy {
|
|
20
|
+
logger;
|
|
21
|
+
constructor(logger) {
|
|
22
|
+
super(30, (attempts) => {
|
|
33
23
|
const expBackoff = Math.pow(2, attempts);
|
|
34
24
|
const maxJitter = Math.ceil(expBackoff * 200);
|
|
35
25
|
const backoff = Math.round(expBackoff + randomInt(0, maxJitter));
|
|
36
26
|
const maxBackoff = randomInt(15000, 20000);
|
|
37
27
|
return Math.min(maxBackoff, backoff);
|
|
38
|
-
}
|
|
39
|
-
|
|
28
|
+
});
|
|
29
|
+
this.logger = logger;
|
|
30
|
+
}
|
|
31
|
+
async refreshRetryTokenForRetry(tokenToRenew, errorInfo) {
|
|
32
|
+
const error = errorInfo.error;
|
|
33
|
+
this.logger.trace(`Decide retry strategy for error: ${error}`);
|
|
34
|
+
const defaultRetryDecision = isDefaultRetryableErrorType(errorInfo.errorType);
|
|
35
|
+
this.logger.trace(`Retry decision from default retry decider: ${defaultRetryDecision}`);
|
|
36
|
+
const additionalRetryableErrorCodesDecision = ADDITIONAL_RETRYABLE_ERROR_CODES.includes(error?.name ?? "");
|
|
37
|
+
this.logger.trace(`Retry decision from additional error codes: ${additionalRetryableErrorCodesDecision}`);
|
|
38
|
+
const lowLevelDecision = decideByLowLevelError(this.logger, error);
|
|
39
|
+
this.logger.trace(`Retry decision from low level error: ${lowLevelDecision}`);
|
|
40
|
+
const retryErrorInfo = additionalRetryableErrorCodesDecision || lowLevelDecision
|
|
41
|
+
? {
|
|
42
|
+
...errorInfo,
|
|
43
|
+
errorType: "TRANSIENT",
|
|
44
|
+
}
|
|
45
|
+
: errorInfo;
|
|
46
|
+
return super.refreshRetryTokenForRetry(tokenToRenew, retryErrorInfo);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
export const customRetryStrategy = (logger) => {
|
|
50
|
+
return new CustomRetryStrategy(logger);
|
|
40
51
|
};
|
|
41
52
|
//# sourceMappingURL=retry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/aws/common/retry.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/aws/common/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAO5D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,MAAM,gCAAgC,GAAG;IACvC,iBAAiB;IACjB,iBAAiB;IACjB,cAAc;CACf,CAAA;AAED,8DAA8D;AAC9D,MAAM,qBAAqB,GAAG,CAAC,MAAiB,EAAE,KAAU,EAAW,EAAE;IACvE,wFAAwF;IACxF,IACE,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;QAC1C,GAAG,KAAK,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,EAChC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAA;QACrD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAClC,SAAsC,EAC7B,EAAE,CAAC,SAAS,KAAK,YAAY,IAAI,SAAS,KAAK,WAAW,CAAA;AAErE,MAAM,mBAAoB,SAAQ,uBAAuB;IAC1B;IAA7B,YAA6B,MAAiB;QAC5C,KAAK,CAAC,EAAE,EAAE,CAAC,QAAgB,EAAE,EAAE;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACxC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,CAAA;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;YAChE,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC,CAAC,CAAA;QAPyB,WAAM,GAAN,MAAM,CAAW;IAQ9C,CAAC;IAEQ,KAAK,CAAC,yBAAyB,CACtC,YAAgC,EAChC,SAAyB;QAEzB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAA;QAE9D,MAAM,oBAAoB,GAAG,2BAA2B,CACtD,SAAS,CAAC,SAAS,CACpB,CAAA;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8CAA8C,oBAAoB,EAAE,CACrE,CAAA;QAED,MAAM,qCAAqC,GACzC,gCAAgC,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;QAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+CAA+C,qCAAqC,EAAE,CACvF,CAAA;QAED,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,gBAAgB,EAAE,CAC3D,CAAA;QAED,MAAM,cAAc,GAClB,qCAAqC,IAAI,gBAAgB;YACvD,CAAC,CAAC;gBACE,GAAG,SAAS;gBACZ,SAAS,EAAE,WAAoB;aAChC;YACH,CAAC,CAAC,SAAS,CAAA;QAEf,OAAO,KAAK,CAAC,yBAAyB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACtE,CAAC;CACF;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAiB,EAAmB,EAAE;IACxE,OAAO,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAA;AACxC,CAAC,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { exec } from "child_process";
|
|
2
2
|
import { bulkhead } from "cockatiel";
|
|
3
3
|
import { extname } from "path";
|
|
4
|
-
import
|
|
4
|
+
import _ from "lodash";
|
|
5
5
|
import { promisify } from "util";
|
|
6
6
|
import { prepareAwsEnvVariables } from "../../../aws/util.js";
|
|
7
7
|
import { resolveCommandOutputBase, } from "../../../takomo-core/command.js";
|
|
@@ -28,7 +28,7 @@ const getDeploymentRole = (currentIdentity, group, target, disableMapRole, roleN
|
|
|
28
28
|
const captureValue = ({ captureAfterLine, captureLastLine, captureBeforeLine, }, output) => {
|
|
29
29
|
const lines = output.trim().split("\n");
|
|
30
30
|
if (captureLastLine) {
|
|
31
|
-
return (
|
|
31
|
+
return (_.last(lines) ?? "") + "\n";
|
|
32
32
|
}
|
|
33
33
|
if (!captureAfterLine && !captureBeforeLine) {
|
|
34
34
|
return output;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/command/targets/run/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/command/targets/run/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { prepareAwsEnvVariables } from "../aws/util.js";
|
|
3
3
|
import { executeShellCommand } from "../utils/exec.js";
|
|
4
4
|
import { expandFilePath } from "../utils/files.js";
|
|
@@ -31,7 +31,7 @@ const captureValue = (capture, output) => {
|
|
|
31
31
|
case "all":
|
|
32
32
|
return output;
|
|
33
33
|
case "last-line":
|
|
34
|
-
return
|
|
34
|
+
return _.last(output.split("\n")) ?? "";
|
|
35
35
|
default:
|
|
36
36
|
throw new Error(`Unknown value for capture: ${capture}`);
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd-custom-stack-handler.js","sourceRoot":"","sources":["../../src/custom-stacks/cmd-custom-stack-handler.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"cmd-custom-stack-handler.js","sourceRoot":"","sources":["../../src/custom-stacks/cmd-custom-stack-handler.ts"],"names":[],"mappings":"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"}
|
package/dist/hooks/cmd-hook.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { prepareAwsEnvVariables } from "../aws/util.js";
|
|
3
3
|
import { executeShellCommand } from "../utils/exec.js";
|
|
4
4
|
import { expandFilePath } from "../utils/files.js";
|
|
@@ -8,7 +8,7 @@ const captureValue = (capture, output) => {
|
|
|
8
8
|
case "all":
|
|
9
9
|
return output;
|
|
10
10
|
case "last-line":
|
|
11
|
-
return
|
|
11
|
+
return _.last(output.split("\n")) ?? "";
|
|
12
12
|
default:
|
|
13
13
|
throw new Error(`Unknown value for capture: ${capture}`);
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd-hook.js","sourceRoot":"","sources":["../../src/hooks/cmd-hook.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"cmd-hook.js","sourceRoot":"","sources":["../../src/hooks/cmd-hook.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { merge } from "../../utils/objects.js";
|
|
3
3
|
import { parseCommandRole, parseStringArray, parseVars, } from "../common-parser.js";
|
|
4
4
|
import { mergeConfigSetInstructions, parseConfigSetInstructions, } from "../config-set-parser.js";
|
|
@@ -14,7 +14,7 @@ const parseDeploymentGroup = (externalDeploymentTargets, groupPath, config, inhe
|
|
|
14
14
|
const configuredConfigSets = parseConfigSetInstructions(group.configSets);
|
|
15
15
|
const configSets = mergeConfigSetInstructions(configuredConfigSets, inheritedConfigSets);
|
|
16
16
|
const configuredLabels = parseStringArray(group?.labels);
|
|
17
|
-
const labels =
|
|
17
|
+
const labels = _.uniq([...inheritedLabels, ...configuredLabels]);
|
|
18
18
|
const targetsSchema = parseTargetSchemas(group?.targetsSchema);
|
|
19
19
|
const vars = merge(inheritedVars, parseVars(group?.vars));
|
|
20
20
|
const deploymentRole = parseCommandRole(group?.deploymentRole) ?? inheritedDeploymentRole;
|
|
@@ -45,7 +45,7 @@ export const parseDeploymentGroups = (externalDeploymentTargets, value, inherite
|
|
|
45
45
|
return [];
|
|
46
46
|
}
|
|
47
47
|
const filledValue = fillMissingDeploymentGroups(value);
|
|
48
|
-
const rootGroupPaths =
|
|
48
|
+
const rootGroupPaths = _.uniq(Object.keys(filledValue).map((key) => key.split("/")[0]));
|
|
49
49
|
return rootGroupPaths.map((rootPath) => parseDeploymentGroup(externalDeploymentTargets, rootPath, filledValue, inheritedVars, [], [], inheritedDeploymentRole, inheritedDeploymentRoleName));
|
|
50
50
|
};
|
|
51
51
|
//# sourceMappingURL=parse-deployment-groups.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-deployment-groups.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-groups.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"parse-deployment-groups.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-groups.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { merge } from "../../utils/objects.js";
|
|
3
3
|
import { parseCommandRole, parseStringArray, parseVars, } from "../common-parser.js";
|
|
4
4
|
import { mergeConfigSetInstructions, parseConfigSetInstructions, } from "../config-set-parser.js";
|
|
@@ -7,7 +7,7 @@ export const parseDeploymentTarget = (value, inheritedVars, inheritedConfigSets,
|
|
|
7
7
|
const configuredConfigSets = parseConfigSetInstructions(value.configSets);
|
|
8
8
|
const configSets = mergeConfigSetInstructions(configuredConfigSets, inheritedConfigSets);
|
|
9
9
|
const configuredLabels = parseStringArray(value.labels);
|
|
10
|
-
const labels =
|
|
10
|
+
const labels = _.uniq([...inheritedLabels, ...configuredLabels]);
|
|
11
11
|
const vars = merge(inheritedVars, parseVars(value.vars));
|
|
12
12
|
const deploymentRole = parseCommandRole(value.deploymentRole) ?? inheritedDeploymentRole;
|
|
13
13
|
const deploymentRoleName = value.deploymentRoleName ?? inheritedDeploymentRoleName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-deployment-targets.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-targets.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"parse-deployment-targets.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-targets.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAOtB,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,GACV,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEpE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EAC5B,EAAE;IAC1B,MAAM,oBAAoB,GAAG,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,0BAA0B,CAC3C,oBAAoB,EACpB,mBAAmB,CACpB,CAAA;IAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAA;IAChE,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAExD,MAAM,cAAc,GAClB,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAA;IACnE,MAAM,kBAAkB,GACtB,KAAK,CAAC,kBAAkB,IAAI,2BAA2B,CAAA;IAEzD,OAAO;QACL,UAAU;QACV,MAAM;QACN,IAAI;QACJ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,cAAc;QACd,kBAAkB;QAClB,MAAM,EAAE,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC;KAC5C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EACb,EAAE;IACzC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,EAAE,CAAA;IACX,CAAC;IAED,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CACnB,qBAAqB,CACnB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,2BAA2B,CAC5B,CACF;SACA,IAAI,CAAC,CAAC,CAAyB,EAAE,CAAyB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { prepareAwsEnvVariables } from "../aws/util.js";
|
|
3
3
|
import { executeShellCommand } from "../utils/exec.js";
|
|
4
4
|
import { expandFilePath } from "../utils/files.js";
|
|
@@ -7,7 +7,7 @@ const captureValue = (capture, output) => {
|
|
|
7
7
|
case "all":
|
|
8
8
|
return output;
|
|
9
9
|
case "last-line":
|
|
10
|
-
return
|
|
10
|
+
return _.last(output.split("\n")) ?? "";
|
|
11
11
|
default:
|
|
12
12
|
throw new Error(`Unknown value for capture: ${capture}`);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd-resolver.js","sourceRoot":"","sources":["../../src/resolvers/cmd-resolver.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"cmd-resolver.js","sourceRoot":"","sources":["../../src/resolvers/cmd-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { basename, join } from "path";
|
|
2
|
-
import * as R from "ramda";
|
|
3
2
|
import { createHookRegistry } from "../../hooks/hook-registry.js";
|
|
4
3
|
import { ResolverRegistry } from "../../resolvers/resolver-registry.js";
|
|
5
4
|
import _ from "lodash";
|
|
@@ -57,7 +56,7 @@ const loadExternallyPersistedDeploymentTargets = async (ctx, logger, templateEng
|
|
|
57
56
|
throw new TakomoError(`Validation errors in deployment target configuration '${wrapper.source}':\n\n${details}`);
|
|
58
57
|
}
|
|
59
58
|
});
|
|
60
|
-
const mergedDeploymentTargets = mergeDeploymentTargetConfigs(deploymentTargets.map(
|
|
59
|
+
const mergedDeploymentTargets = mergeDeploymentTargetConfigs(deploymentTargets.map((t) => t.item));
|
|
61
60
|
return new Map(Array.from(Object.entries(_.groupBy(mergedDeploymentTargets, "deploymentGroupPath"))));
|
|
62
61
|
};
|
|
63
62
|
export const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { createAwsSchemas } from "../../schema/aws-schema.js";
|
|
3
3
|
import { isWithinCommandPath } from "../../takomo-stacks-model/util.js";
|
|
4
4
|
import { TakomoError } from "../../utils/errors.js";
|
|
@@ -47,7 +47,7 @@ export const buildCustomStack = async (stackPath, ctx, logger, defaultCredential
|
|
|
47
47
|
throw new TakomoError(`Stack ${stackPath} has no regions`);
|
|
48
48
|
}
|
|
49
49
|
validate(stackName, name, `Name of stack ${stackPath} is not valid`);
|
|
50
|
-
|
|
50
|
+
_.uniq(Array.from(parameters.values())
|
|
51
51
|
.reduce((collected, parameter) => {
|
|
52
52
|
return [...collected, parameter.getIamRoleArns()];
|
|
53
53
|
}, new Array())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-custom-stack.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-custom-stack.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"build-custom-stack.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-custom-stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { createAwsSchemas } from "../../schema/aws-schema.js";
|
|
3
3
|
import { createStandardStack, } from "../../stacks/standard-stack.js";
|
|
4
4
|
import { StackPropertyDefaults } from "../../takomo-stacks-model/constants.js";
|
|
@@ -75,7 +75,7 @@ export const buildStandardStack = async (stackPath, ctx, logger, defaultCredenti
|
|
|
75
75
|
throw new TakomoError(`Stack ${stackPath} has no regions`);
|
|
76
76
|
}
|
|
77
77
|
validate(stackName, name, `Name of stack ${stackPath} is not valid`);
|
|
78
|
-
|
|
78
|
+
_.uniq(Array.from(parameters.values())
|
|
79
79
|
.reduce((collected, parameter) => {
|
|
80
80
|
return [...collected, parameter.getIamRoleArns()];
|
|
81
81
|
}, new Array())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-standard-stack.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-standard-stack.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"build-standard-stack.js","sourceRoot":"","sources":["../../../src/takomo-stacks-context/config/build-standard-stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
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";
|
|
@@ -84,7 +84,7 @@ export const processConfigTree = async (ctx, logger, credentialManager, credenti
|
|
|
84
84
|
logger.trace(`Process config tree using command path: ${cp}`);
|
|
85
85
|
await processStackGroupConfigNode(ctx, logger, credentialManager, credentialManagers, resolverRegistry, schemaRegistry, hookRegistry, cp, status, item, configRepository, customStackHandlerRegistry);
|
|
86
86
|
}
|
|
87
|
-
commandPaths =
|
|
87
|
+
commandPaths = _.uniq(status
|
|
88
88
|
.getNewlyProcessedStacks()
|
|
89
89
|
.filter((s) => !s.ignore)
|
|
90
90
|
.reduce((collected, stack) => {
|
|
@@ -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,
|
|
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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
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";
|
|
@@ -42,14 +42,14 @@ export const checkObsoleteDependencies = (stacks) => {
|
|
|
42
42
|
};
|
|
43
43
|
export const collectAllDependencies = (stackPath, stacks) => {
|
|
44
44
|
const stack = stacks.find((s) => s.path === stackPath);
|
|
45
|
-
return
|
|
45
|
+
return _.uniq(stack.dependencies.reduce((collected, dependencyPath) => {
|
|
46
46
|
const childDependencies = collectAllDependencies(dependencyPath, stacks);
|
|
47
47
|
return [...collected, ...childDependencies, dependencyPath];
|
|
48
48
|
}, new Array()));
|
|
49
49
|
};
|
|
50
50
|
export const collectAllDependents = (stackPath, stacks) => {
|
|
51
51
|
const stack = stacks.find((s) => s.path === stackPath);
|
|
52
|
-
return
|
|
52
|
+
return _.uniq(stack.dependents.reduce((collected, dependentPath) => {
|
|
53
53
|
const childDependents = collectAllDependents(dependentPath, stacks);
|
|
54
54
|
return [...collected, ...childDependents, dependentPath];
|
|
55
55
|
}, new Array()));
|
|
@@ -95,7 +95,7 @@ export const processStackDependencies = (stacks) => {
|
|
|
95
95
|
}, new Array());
|
|
96
96
|
return {
|
|
97
97
|
...stack,
|
|
98
|
-
dependencies:
|
|
98
|
+
dependencies: _.uniq([...stackDependencies, ...parameterDependencies].flat()),
|
|
99
99
|
};
|
|
100
100
|
});
|
|
101
101
|
return populateDependents(processed).map((props) => createInternalStack(props));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../src/takomo-stacks-context/dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
|
+
import util from "node:util";
|
|
2
3
|
export const collectFromHierarchy = (root, extractChildren, props) => {
|
|
3
4
|
const filter = props?.filter || (() => true);
|
|
4
5
|
if (!filter(root)) {
|
|
@@ -14,7 +15,7 @@ export const collectFromHierarchy = (root, extractChildren, props) => {
|
|
|
14
15
|
}, [root]);
|
|
15
16
|
};
|
|
16
17
|
export const mapToObject = (map) => Array.from(map.entries()).reduce((collected, [key, value]) => ({ ...collected, [key]: value }), {});
|
|
17
|
-
export const arrayToObject = (array, keyExtractor, valueExtractor =
|
|
18
|
+
export const arrayToObject = (array, keyExtractor, valueExtractor = (item) => item) => array.reduce((collected, item) => ({
|
|
18
19
|
...collected,
|
|
19
20
|
[keyExtractor(item)]: valueExtractor(item),
|
|
20
21
|
}), {});
|
|
@@ -23,8 +24,8 @@ export const arrayToRecord = (array, keyExtractor, valueExtractor) => array.redu
|
|
|
23
24
|
[keyExtractor(item)]: valueExtractor(item),
|
|
24
25
|
}), {});
|
|
25
26
|
export const arrayToMap = (items, keyExtractor) => new Map(items.map((item) => [keyExtractor(item), item]));
|
|
26
|
-
export const findNonUniques = (items) =>
|
|
27
|
-
export const mergeArrays = ({ first, second, equals =
|
|
27
|
+
export const findNonUniques = (items) => _.uniq(items.filter((item) => items.filter((i) => i === item).length > 1)).sort();
|
|
28
|
+
export const mergeArrays = ({ first, second, equals = util.isDeepStrictEqual, allowDuplicates = false, }) => {
|
|
28
29
|
const merged = [...first, ...second];
|
|
29
30
|
if (allowDuplicates) {
|
|
30
31
|
return merged;
|
|
@@ -34,7 +35,7 @@ export const mergeArrays = ({ first, second, equals = R.equals, allowDuplicates
|
|
|
34
35
|
if (collected.some(eq)) {
|
|
35
36
|
return collected;
|
|
36
37
|
}
|
|
37
|
-
const lastDuplicate =
|
|
38
|
+
const lastDuplicate = _.findLast(merged, eq);
|
|
38
39
|
if (!lastDuplicate) {
|
|
39
40
|
throw new Error("Expected an item to be found");
|
|
40
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/utils/collections.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/utils/collections.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "takomo",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.6",
|
|
4
4
|
"description": "Organize, configure and deploy CloudFormation stacks.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -82,11 +82,11 @@
|
|
|
82
82
|
}
|
|
83
83
|
},
|
|
84
84
|
"devDependencies": {
|
|
85
|
-
"ts-jest": "29.4.
|
|
85
|
+
"ts-jest": "29.4.11",
|
|
86
86
|
"@jest/globals": "30.3.0",
|
|
87
|
-
"@aws-sdk/client-ec2": "3.
|
|
88
|
-
"@commitlint/cli": "21.0.
|
|
89
|
-
"@commitlint/config-conventional": "21.0.
|
|
87
|
+
"@aws-sdk/client-ec2": "3.1068.0",
|
|
88
|
+
"@commitlint/cli": "21.0.2",
|
|
89
|
+
"@commitlint/config-conventional": "21.0.2",
|
|
90
90
|
"@jest/console": "30.3.0",
|
|
91
91
|
"@takomo/test-custom-helper-lowercase": "0.0.1",
|
|
92
92
|
"@takomo/test-custom-helper-uppercase": "0.0.1",
|
|
@@ -102,39 +102,39 @@
|
|
|
102
102
|
"@types/yargs": "17.0.35",
|
|
103
103
|
"@types/ejs": "3.1.5",
|
|
104
104
|
"@types/lodash": "4.17.24",
|
|
105
|
-
"@typescript-eslint/eslint-plugin": "8.
|
|
106
|
-
"@typescript-eslint/parser": "8.
|
|
105
|
+
"@typescript-eslint/eslint-plugin": "8.61.0",
|
|
106
|
+
"@typescript-eslint/parser": "8.61.0",
|
|
107
107
|
"depcheck": "1.4.7",
|
|
108
|
-
"eslint": "10.
|
|
108
|
+
"eslint": "10.5.0",
|
|
109
109
|
"eslint-config-prettier": "10.1.8",
|
|
110
|
-
"eslint-plugin-prettier": "5.5.
|
|
110
|
+
"eslint-plugin-prettier": "5.5.6",
|
|
111
111
|
"@eslint/js": "10.0.1",
|
|
112
112
|
"@eslint/eslintrc": "3.3.5",
|
|
113
113
|
"husky": "9.1.7",
|
|
114
114
|
"jest": "30.3.0",
|
|
115
115
|
"jest-environment-testenv-recycler": "0.0.21",
|
|
116
116
|
"jest-mock-extended": "4.0.1",
|
|
117
|
-
"prettier": "3.8.
|
|
117
|
+
"prettier": "3.8.4",
|
|
118
118
|
"prettier-plugin-organize-imports": "4.3.0",
|
|
119
|
-
"lint-staged": "17.0.
|
|
119
|
+
"lint-staged": "17.0.7",
|
|
120
120
|
"ts-node": "10.9.2",
|
|
121
121
|
"typedoc": "0.28.19",
|
|
122
|
-
"typescript": "
|
|
123
|
-
"semantic-release": "25.0.
|
|
124
|
-
"npm-check-updates": "22.
|
|
122
|
+
"typescript": "6.0.3",
|
|
123
|
+
"semantic-release": "25.0.5",
|
|
124
|
+
"npm-check-updates": "22.2.3"
|
|
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.
|
|
136
|
-
"@smithy/node-http-handler": "4.
|
|
137
|
-
"@aws-sdk/types": "3.973.
|
|
127
|
+
"@aws-sdk/client-cloudformation": "3.1068.0",
|
|
128
|
+
"@aws-sdk/client-cloudtrail": "3.1068.0",
|
|
129
|
+
"@aws-sdk/client-organizations": "3.1068.0",
|
|
130
|
+
"@aws-sdk/client-s3": "3.1068.0",
|
|
131
|
+
"@aws-sdk/client-secrets-manager": "3.1068.0",
|
|
132
|
+
"@aws-sdk/client-ssm": "3.1068.0",
|
|
133
|
+
"@aws-sdk/client-sts": "3.1068.0",
|
|
134
|
+
"@aws-sdk/credential-providers": "3.1068.0",
|
|
135
|
+
"@smithy/util-retry": "4.4.7",
|
|
136
|
+
"@smithy/node-http-handler": "4.7.8",
|
|
137
|
+
"@aws-sdk/types": "3.973.12",
|
|
138
138
|
"chalk": "5.6.2",
|
|
139
139
|
"cockatiel": "3.2.1",
|
|
140
140
|
"date-and-time": "4.5.0",
|
|
@@ -142,24 +142,24 @@
|
|
|
142
142
|
"dotenv": "17.4.2",
|
|
143
143
|
"dotenv-expand": "13.0.0",
|
|
144
144
|
"easy-table": "1.2.0",
|
|
145
|
-
"folder-hash": "4.1.
|
|
145
|
+
"folder-hash": "4.1.3",
|
|
146
146
|
"handlebars": "4.7.9",
|
|
147
|
-
"@inquirer/prompts": "8.
|
|
147
|
+
"@inquirer/prompts": "8.5.2",
|
|
148
148
|
"jmespath": "0.16.0",
|
|
149
149
|
"joi": "18.2.1",
|
|
150
|
-
"js-yaml": "4.
|
|
150
|
+
"js-yaml": "4.2.0",
|
|
151
151
|
"json-stable-stringify": "1.3.0",
|
|
152
152
|
"neverthrow": "8.2.0",
|
|
153
|
-
"p-queue": "9.
|
|
153
|
+
"p-queue": "9.3.0",
|
|
154
154
|
"pretty-ms": "9.3.0",
|
|
155
155
|
"ramda": "0.32.0",
|
|
156
156
|
"readdirp": "5.0.0",
|
|
157
|
-
"semver": "7.8.
|
|
157
|
+
"semver": "7.8.4",
|
|
158
158
|
"source-map-support": "0.5.21",
|
|
159
|
-
"ts-dedent": "2.
|
|
159
|
+
"ts-dedent": "2.3.0",
|
|
160
160
|
"uuid": "14.0.0",
|
|
161
161
|
"yargs": "18.0.0",
|
|
162
|
-
"esbuild": "0.28.
|
|
162
|
+
"esbuild": "0.28.1",
|
|
163
163
|
"ejs": "5.0.2",
|
|
164
164
|
"lodash": "4.18.1"
|
|
165
165
|
}
|