takomo 7.0.0 → 7.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/dist/aws/common/client.d.ts +2 -2
- package/dist/cli/common.js +8 -4
- package/dist/cli/common.js.map +1 -1
- package/dist/cli/options/parse-log-level.d.ts +1 -1
- package/dist/cli/options/parse-log-level.js.map +1 -1
- package/dist/cli/options/parse-output-format.d.ts +1 -1
- package/dist/cli/options/parse-output-format.js.map +1 -1
- package/dist/command/iam/generate-iam-policies-command.js +2 -1
- package/dist/command/iam/generate-iam-policies-command.js.map +1 -1
- package/dist/parser/common-parser.d.ts +3 -3
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js +2 -1
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js +2 -2
- package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js.map +1 -1
- package/dist/utils/collections.d.ts +6 -6
- package/package.json +18 -16
package/LICENSE
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c)
|
|
3
|
+
Copyright (c) 2024 Henri Meltaus <henri@takomo.io>
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
|
@@ -59,7 +59,7 @@ export interface ClientListener {
|
|
|
59
59
|
readonly onApiCall: (props: ApiCallProps) => void;
|
|
60
60
|
}
|
|
61
61
|
export declare const withClientScheduler: <C, T>(client: C, taskId: string, scheduler: Scheduler, fn: (client: C) => Promise<T>, onError?: ((e: Error) => T) | undefined) => Promise<T>;
|
|
62
|
-
export declare const pagedOperationBulkhead: <T, P, R extends PagedResponse>(bulkhead: IPolicy, operation: (params: P) => Promise<R>, params: P, extractor: (response: R) =>
|
|
63
|
-
export declare const pagedOperationV2: <T, P, R extends PagedResponse>({ operation, params, extractor, nextToken, onPage, filter, }: PagedOperationV2Props<T, P, R>) => Promise<
|
|
62
|
+
export declare const pagedOperationBulkhead: <T, P, R extends PagedResponse>(bulkhead: IPolicy, operation: (params: P) => Promise<R>, params: P, extractor: (response: R) => ReadonlyArray<T> | undefined, nextToken?: string) => Promise<ReadonlyArray<T>>;
|
|
63
|
+
export declare const pagedOperationV2: <T, P, R extends PagedResponse>({ operation, params, extractor, nextToken, onPage, filter, }: PagedOperationV2Props<T, P, R>) => Promise<ReadonlyArray<T>>;
|
|
64
64
|
export declare const withClientBulkhead: <C, T>(client: C, bulkhead: IPolicy, fn: (client: C) => Promise<T>, onError?: ((e: Error) => T) | undefined) => Promise<T>;
|
|
65
65
|
export {};
|
package/dist/cli/common.js
CHANGED
|
@@ -20,6 +20,7 @@ import { parseLogLevel } from "./options/parse-log-level.js";
|
|
|
20
20
|
import { parseOutputFormat } from "./options/parse-output-format.js";
|
|
21
21
|
import { parseVarArgs } from "./options/parse-var-args.js";
|
|
22
22
|
import { parseVarFileOptions } from "./options/parse-var-file-options.js";
|
|
23
|
+
import _ from "lodash";
|
|
23
24
|
const resolveProjectDir = (projectDirArg) => {
|
|
24
25
|
if (projectDirArg) {
|
|
25
26
|
const projectDir = projectDirArg.toString();
|
|
@@ -27,7 +28,9 @@ const resolveProjectDir = (projectDirArg) => {
|
|
|
27
28
|
}
|
|
28
29
|
return process.cwd();
|
|
29
30
|
};
|
|
30
|
-
export const initCommandContext = async (
|
|
31
|
+
export const initCommandContext = async (
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
33
|
+
argv, credentials) => {
|
|
31
34
|
if (argv.profile) {
|
|
32
35
|
process.env.AWS_PROFILE = argv.profile;
|
|
33
36
|
}
|
|
@@ -72,6 +75,7 @@ export const initCommandContext = async (argv, credentials) => {
|
|
|
72
75
|
logger,
|
|
73
76
|
});
|
|
74
77
|
};
|
|
78
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
79
|
export const onError = (e) => {
|
|
76
80
|
console.log();
|
|
77
81
|
console.log(red("ERROR"));
|
|
@@ -144,12 +148,12 @@ export const onComplete = async ({ ctx, output, credentialManagers, startTime, e
|
|
|
144
148
|
console.log();
|
|
145
149
|
const clientsTable = new Table();
|
|
146
150
|
const allApiCalls = ctx.awsClientProvider.getApiCalls();
|
|
147
|
-
const apiCallsByClient =
|
|
151
|
+
const apiCallsByClient = _.groupBy(allApiCalls, "clientId");
|
|
148
152
|
const clientIds = Object.keys(apiCallsByClient).sort();
|
|
149
153
|
clientIds.forEach((clientId) => {
|
|
150
154
|
clientsTable.cell("Client id", clientId).newRow();
|
|
151
155
|
const clientApiCalls = apiCallsByClient[clientId];
|
|
152
|
-
const clientApiCallsByAction =
|
|
156
|
+
const clientApiCallsByAction = _.groupBy(clientApiCalls, (a) => `${a.api}:${a.action}`);
|
|
153
157
|
const actionNames = Object.keys(clientApiCallsByAction).sort();
|
|
154
158
|
actionNames.forEach((actionName) => {
|
|
155
159
|
const calls = clientApiCallsByAction[actionName];
|
|
@@ -167,7 +171,7 @@ export const onComplete = async ({ ctx, output, credentialManagers, startTime, e
|
|
|
167
171
|
});
|
|
168
172
|
});
|
|
169
173
|
clientsTable.newRow().cell("Client id", "Total").newRow();
|
|
170
|
-
const totalApiCallsByAction =
|
|
174
|
+
const totalApiCallsByAction = _.groupBy(allApiCalls, (a) => `${a.api}:${a.action}`);
|
|
171
175
|
Object.keys(totalApiCallsByAction)
|
|
172
176
|
.sort()
|
|
173
177
|
.forEach((action) => {
|
package/dist/cli/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/cli/common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAA;AAC9B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAEvE,OAAO,EAEL,4BAA4B,GAE7B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EACL,8BAA8B,GAE/B,MAAM,8EAA8E,CAAA;AAOrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AACxC,OAAO,EAAE,cAAc,EAAY,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAa,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AAOzE,MAAM,iBAAiB,GAAG,CAAC,aAAkB,EAAY,EAAE;IACzD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAA;QAC3C,OAAO,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,EAAE,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAS,EACT,WAAmC,EACA,EAAE;IACrC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAA;IACxC,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG;QAChB,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAA;IAED,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACzD,MAAM,kBAAkB,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACxD,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,CAAA;IAC7D,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC/C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnD,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC5D,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAEnC,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAC9D,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7D,MAAM,sCAAsC,GAAG,YAAY,CACzD,IAAI,CAAC,4BAA4B,CAAC,EAClC,KAAK,CACN,CAAA;IAED,MAAM,gCAAgC,GAAG,YAAY,CACnD,IAAI,CAAC,uBAAuB,CAAC,EAC7B,KAAK,CACN,CAAA;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IAE9C,OAAO,8BAA8B,CAAC;QACpC,KAAK;QACL,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,kBAAkB;QAClB,iBAAiB;QACjB,sCAAsC;QACtC,gCAAgC;QAChC,WAAW;QACX,SAAS;QACT,UAAU;QACV,iBAAiB;QACjB,gBAAgB;QAChB,IAAI;QACJ,YAAY;QACZ,YAAY;QACZ,MAAM;KACP,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAM,EAAQ,EAAE;IACtC,OAAO,CAAC,GAAG,EAAE,CAAA;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;IACzB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;IAEzB,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAE3B,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAA;YACxC,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAA;YACnC,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAgB,EAAE,EAAE;gBAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC,CAAA;YACxC,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;IAC3B,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAEjD,OAAO,CAAC,GAAG,EAAE,CAAA;IACb,OAAO,CAAC,GAAG,EAAE,CAAA;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAA;IACvD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC7D,OAAO,CAAC,GAAG,EAAE,CAAA;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAA;IAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC,CAAA;IAC3E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC,CAAA;IACtE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC,CAAA;IACvD,OAAO,CAAC,GAAG,EAAE,CAAA;IACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,CAAC,KAAa,EAAU,EAAE,CACrC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;AAU/C,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,GAAG,EACH,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,OAAO,GACS,EAAiB,EAAE;IACnC,IAAI,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAC1B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QAEpE,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAA;QAEzB,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAC5B,OAAO,CAAC,GAAG,EAAE,CAAA;QAEb,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3B,KAAK,CAAC,MAAM,EAAE,CAAA;QAEd,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACnC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;QACjC,KAAK,CAAC,MAAM,EAAE,CAAA;QAEd,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAClC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAChC,KAAK,CAAC,MAAM,EAAE,CAAA;QAEd,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QACjC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAChC,KAAK,CAAC,MAAM,EAAE,CAAA;QAEd,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAE1C,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAElD,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;QAC7B,OAAO,CAAC,GAAG,EAAE,CAAA;QAEb,MAAM,YAAY,GAAG,IAAI,KAAK,EAAE,CAAA;QAEhC,MAAM,WAAW,GAAG,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAA;QAEvD,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAA;QACnE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAA;QACtD,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;YACjD,MAAM,cAAc,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YACjD,MAAM,sBAAsB,GAAmC,CAAC,CAAC,OAAO,CACtE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAC7B,cAAc,CACf,CAAA;YACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,CAAA;YAC9D,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBACjC,MAAM,KAAK,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAA;gBAEhD,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC1C,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAE9B,YAAY;qBACT,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,EAAE,CAAC;qBACpC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;qBAC3B,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;qBAClD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;qBACzD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;qBACzD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;qBAC/D,IAAI,CACH,SAAS,EACT,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC,CACrD;qBACA,MAAM,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAA;QAEzD,MAAM,qBAAqB,GAAmC,CAAC,CAAC,OAAO,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAC7B,WAAW,CACZ,CAAA;QACD,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC;aAC/B,IAAI,EAAE;aACN,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAA;YAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;YAC1C,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAE9B,YAAY;iBACT,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;iBAChC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;iBAC3B,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;iBAClD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;iBACzD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;iBACzD,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;iBAC/D,IAAI,CACH,SAAS,EACT,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC,CACrD;iBACA,MAAM,EAAE,CAAA;QACb,CAAC,CAAC,CAAA;QAEJ,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAEjD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,CACvD,CAAA;QAED,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;YAC9B,OAAO,CAAC,GAAG,EAAE,CAAA;YACb,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAA;YAC3B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,sCAAsC,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,CACvD,CAAA;QAED,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAE1D,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;QACzD,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,oBAAoB,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC7D,OAAO,CAAC,GAAG,CAAC,kBAAkB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QACzD,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,kBAAkB,QAAQ,KAAK,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;QACF,GAAG,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpD,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAA;QACD,OAAO,CAAC,GAAG,CACT,uFAAuF,CACxF,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;QAC5D,OAAO,CAAC,GAAG,CACT,iFAAiF,CAClF,CAAA;QACD,OAAO,CAAC,GAAG,CACT,kFAAkF,CACnF,CAAA;QACD,OAAO,CAAC,GAAG,CACT,gFAAgF,CACjF,CAAA;QACD,OAAO,CAAC,GAAG,CACT,gFAAgF,CACjF,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;QACvD,OAAO,CAAC,GAAG,EAAE,CAAA;IACf,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,MAAM,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;QACjD,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,CAAC,GAAG,CACT,gBAAgB,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,iBAAiB,mBAAmB,CACxF,MAAM,CAAC,MAAM,CACd,EAAE,CACJ,CAAA;QACD,OAAO,CAAC,GAAG,EAAE,CAAA;IACf,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAmBD,MAAM,aAAa,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACvC;YACE,OAAO,EAAE,sBAAsB,SAAS,EAAE;YAC1C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;SACf;KACF,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,KAAK,EAC/B,GAA6B,EAC7B,KAAmB,EACN,EAAE,CAAC,KAAW,CAAA;AAE7B,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAMzB,KAAiC,EAClB,EAAE;IACjB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,MAAM,EAAE,OAAO,CAAC,GAAG;YACnB,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG;YAChB,KAAK,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC;YACzB,YAAY,EAAE,GAAG,CAAC,YAAY;SAC/B,CAAA;QAED,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,mBAAmB,EAAE,GAAG,KAAK,CAAA;QAE3D,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAEhD,MAAM,CAAC,WAAW,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAEhC,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAC1D,aAAa,EACb,MAAM,EACN,GAAG,CAAC,iBAAiB,EACrB,GAAG,CAAC,WAAW,CAChB,CAAA;QAED,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,gBAAgB,CACnD,GAAG,EACH,MAAM,EACN,iBAAiB,CAClB,CAAA;QAED,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAE5B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;YAClC,GAAG;YACH,gBAAgB;YAChB,EAAE;YACF,KAAK;YACL,iBAAiB;SAClB,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,iBAAiB,EAAE,CAAC,EAAE,EAAE,EAAE,CACxE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CACjC,CAAA;QAED,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAA;QAC1B,MAAM,UAAU,CAAC;YACf,GAAG;YACH,MAAM;YACN,kBAAkB;YAClB,SAAS;YACT,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,CAAC,CAAC,CAAA;IACZ,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,iBAA+B,EACvB,EAAE,CAAC;EACX,WAAW,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;;CAEpC,CAAA"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/cli/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { LogLevel } from "../../utils/logging.js";
|
|
2
|
-
export declare const parseLogLevel: (log:
|
|
2
|
+
export declare const parseLogLevel: (log: unknown, quiet: boolean) => LogLevel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-log-level.js","sourceRoot":"","sources":["../../../src/cli/options/parse-log-level.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"parse-log-level.js","sourceRoot":"","sources":["../../../src/cli/options/parse-log-level.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAY,EAAE,KAAc,EAAY,EAAE;IACtE,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,MAAM,CAAA;IACf,CAAC;IAED,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,OAAO;YACV,OAAO,OAAO,CAAA;QAChB,KAAK,OAAO;YACV,OAAO,OAAO,CAAA;QAChB,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf,KAAK,OAAO;YACV,OAAO,OAAO,CAAA;QAChB,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf;YACE,OAAO,MAAM,CAAA;IACjB,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { OutputFormat } from "../../takomo-core/command.js";
|
|
2
|
-
export declare const parseOutputFormat: (format?:
|
|
2
|
+
export declare const parseOutputFormat: (format?: unknown) => OutputFormat;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-output-format.js","sourceRoot":"","sources":["../../../src/cli/options/parse-output-format.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"parse-output-format.js","sourceRoot":"","sources":["../../../src/cli/options/parse-output-format.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAgB,EAAE;IAClE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,MAAM,CAAA;IACf,CAAC;IAED,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf,KAAK,MAAM;YACT,OAAO,MAAM,CAAA;QACf;YACE,OAAO,MAAM,CAAA;IACjB,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import Joi from "joi";
|
|
2
2
|
import * as R from "ramda";
|
|
3
|
+
import _ from "lodash";
|
|
3
4
|
import { createAwsSchemas } from "../../schema/aws-schema.js";
|
|
4
5
|
import { validateInput } from "../../utils/validation.js";
|
|
5
6
|
const getEventsFromRegion = async (awsClientProvider, credentialManager, logger, region, startTime, endTime) => {
|
|
@@ -44,7 +45,7 @@ const generateIamPolicies = async (awsClientProvider, io, input, credentialManag
|
|
|
44
45
|
const { timer, startTime, endTime, identities, roleName, regions } = input;
|
|
45
46
|
const accountIds = R.uniq(identities.map((identity) => identity.split(":")[4]));
|
|
46
47
|
const events = await getEventsFromAccounts(awsClientProvider, credentialManager, io, accountIds, regions, roleName, startTime, endTime, []);
|
|
47
|
-
const eventsByIdentity =
|
|
48
|
+
const eventsByIdentity = _.groupBy(events, (e) => e.cloudTrailEvent.userIdentity?.arn);
|
|
48
49
|
const policies = Object.entries(eventsByIdentity)
|
|
49
50
|
.map(([identity, eventList]) => ({
|
|
50
51
|
identity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-iam-policies-command.js","sourceRoot":"","sources":["../../../src/command/iam/generate-iam-policies-command.ts"],"names":[],"mappings":"AAAA,OAAO,GAAkB,MAAM,KAAK,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"generate-iam-policies-command.js","sourceRoot":"","sources":["../../../src/command/iam/generate-iam-policies-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,15 @@ import { CommandRole } from "../takomo-core/command.js";
|
|
|
3
3
|
/**
|
|
4
4
|
* Accepts a string or an array of strings and returns an array.
|
|
5
5
|
*/
|
|
6
|
-
export declare const parseStringArray: <T extends string>(value: unknown) =>
|
|
6
|
+
export declare const parseStringArray: <T extends string>(value: unknown) => ReadonlyArray<T>;
|
|
7
7
|
/**
|
|
8
8
|
* Accepts a string or an array of strings and returns an array.
|
|
9
9
|
*/
|
|
10
|
-
export declare const parseOptionalStringArray: <T extends string>(value: unknown) =>
|
|
10
|
+
export declare const parseOptionalStringArray: <T extends string>(value: unknown) => ReadonlyArray<T> | undefined;
|
|
11
11
|
/**
|
|
12
12
|
* Accepts a string or an array of strings and returns a typed array.
|
|
13
13
|
*/
|
|
14
|
-
export declare const parseTypedArrayFromString: <T>(value: unknown) =>
|
|
14
|
+
export declare const parseTypedArrayFromString: <T>(value: unknown) => ReadonlyArray<T>;
|
|
15
15
|
export declare const parseOptionalString: (value: unknown) => string | undefined;
|
|
16
16
|
export declare const parseString: (value: unknown, defaultValue: string) => string;
|
|
17
17
|
export declare const parseRegex: (path: string, pattern?: string) => RegExp | undefined;
|
|
@@ -3,6 +3,7 @@ import * as R from "ramda";
|
|
|
3
3
|
import { createHookRegistry } from "../../hooks/hook-registry.js";
|
|
4
4
|
import { ResolverRegistry } from "../../resolvers/resolver-registry.js";
|
|
5
5
|
import { createDeploymentTargetConfigItemSchema, createDeploymentTargetRepositoryRegistry, createFileSystemDeploymentTargetRepositoryProvider, createOrganizationDeploymentTargetRepositoryProvider, } from "../../takomo-deployment-targets-repository/index.js";
|
|
6
|
+
import _ from "lodash";
|
|
6
7
|
import { buildDeploymentConfig } from "../../parser/targets/build-deployment-config.js";
|
|
7
8
|
import { createDeploymentTargetsSchemaRegistry, } from "../../targets/targets-model.js";
|
|
8
9
|
import { TakomoError } from "../../utils/errors.js";
|
|
@@ -53,7 +54,7 @@ const loadExternallyPersistedDeploymentTargets = async (ctx, logger, templateEng
|
|
|
53
54
|
}
|
|
54
55
|
});
|
|
55
56
|
const mergedDeploymentTargets = mergeDeploymentTargetConfigs(deploymentTargets.map(R.prop("item")));
|
|
56
|
-
return new Map(Array.from(Object.entries(
|
|
57
|
+
return new Map(Array.from(Object.entries(_.groupBy(mergedDeploymentTargets, "deploymentGroupPath"))));
|
|
57
58
|
};
|
|
58
59
|
export const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
|
|
59
60
|
const stacksConfigRepository = await createFileSystemStacksConfigRepository(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,KAAK,CAAC,MAAM,OAAO,CAAA;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EACL,sCAAsC,EACtC,wCAAwC,EACxC,kDAAkD,EAClD,oDAAoD,GAErD,MAAM,qDAAqD,CAAA;
|
|
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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"}
|
package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { mergeArrays } from "../../utils/collections.js";
|
|
3
3
|
import { merge } from "../../utils/objects.js";
|
|
4
4
|
const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
|
|
@@ -26,7 +26,7 @@ const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
|
|
|
26
26
|
return mergeDeploymentTargetConfigsInternal([merged, ...rest]);
|
|
27
27
|
};
|
|
28
28
|
export const mergeDeploymentTargetConfigs = (items) => {
|
|
29
|
-
const itemsByName =
|
|
29
|
+
const itemsByName = _.groupBy(items, "name");
|
|
30
30
|
return Array.from(Object.values(itemsByName)).map(mergeDeploymentTargetConfigsInternal);
|
|
31
31
|
};
|
|
32
32
|
//# sourceMappingURL=merge-deployment-target-configs.js.map
|
package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,MAAM,oCAAoC,GAAG,CAAC,CAC5C,KAAK,EACL,MAAM,EACN,GAAG,IAAI,CACmC,EAA8B,EAAE;IAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,MAAM,GAA+B;QACzC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS;QAC9C,UAAU,EAAE,WAAW,CAAC;YACtB,KAAK,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;SAChC,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,MAAM,EAAE,WAAW,CAAC;YAClB,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;SAC5B,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB;QACzE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;QAC7D,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW;KACrD,CAAA;IAED,OAAO,oCAAoC,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,KAAgD,EACL,EAAE;IAC7C,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAC5C,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAC/C,oCAAoC,CACrC,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -2,17 +2,17 @@ interface CollectFromHierarchyProps<T> {
|
|
|
2
2
|
readonly sortSiblings?: (a: T, b: T) => number;
|
|
3
3
|
readonly filter?: (node: T) => boolean;
|
|
4
4
|
}
|
|
5
|
-
export declare const collectFromHierarchy: <T>(root: T, extractChildren: (node: T) =>
|
|
5
|
+
export declare const collectFromHierarchy: <T>(root: T, extractChildren: (node: T) => ReadonlyArray<T>, props?: CollectFromHierarchyProps<T>) => ReadonlyArray<T>;
|
|
6
6
|
export declare const mapToObject: (map: Map<string, unknown>) => Record<string, unknown>;
|
|
7
|
-
export declare const arrayToObject: <T extends object>(array:
|
|
8
|
-
export declare const arrayToMap: <T>(items:
|
|
9
|
-
export declare const findNonUniques: <Primitive>(items:
|
|
7
|
+
export declare const arrayToObject: <T extends object>(array: ReadonlyArray<T>, keyExtractor: (item: T) => string, valueExtractor?: (item: T) => unknown) => Record<string, unknown>;
|
|
8
|
+
export declare const arrayToMap: <T>(items: ReadonlyArray<T>, keyExtractor: (item: T) => string) => Map<string, T>;
|
|
9
|
+
export declare const findNonUniques: <Primitive>(items: ReadonlyArray<Primitive>) => ReadonlyArray<Primitive>;
|
|
10
10
|
interface MergeArraysProps<T> {
|
|
11
11
|
readonly first: ReadonlyArray<T>;
|
|
12
12
|
readonly second: ReadonlyArray<T>;
|
|
13
13
|
readonly equals?: (a: T, b: T) => boolean;
|
|
14
14
|
readonly allowDuplicates?: boolean;
|
|
15
15
|
}
|
|
16
|
-
export declare const mergeArrays: <T>({ first, second, equals, allowDuplicates, }: MergeArraysProps<T>) =>
|
|
17
|
-
export declare const mergeMaps: <T>(...maps:
|
|
16
|
+
export declare const mergeArrays: <T>({ first, second, equals, allowDuplicates, }: MergeArraysProps<T>) => ReadonlyArray<T>;
|
|
17
|
+
export declare const mergeMaps: <T>(...maps: ReadonlyArray<Map<string, T>>) => Map<string, T>;
|
|
18
18
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "takomo",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.1",
|
|
4
4
|
"description": "Organize, configure and deploy CloudFormation stacks.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -81,8 +81,8 @@
|
|
|
81
81
|
"ts-jest": "29.1.2",
|
|
82
82
|
"@jest/globals": "29.7.0",
|
|
83
83
|
"@aws-sdk/client-ec2": "3.511.0",
|
|
84
|
-
"@commitlint/cli": "
|
|
85
|
-
"@commitlint/config-conventional": "
|
|
84
|
+
"@commitlint/cli": "19.1.0",
|
|
85
|
+
"@commitlint/config-conventional": "19.1.0",
|
|
86
86
|
"@jest/console": "29.7.0",
|
|
87
87
|
"@takomo/test-custom-helper-lowercase": "0.0.1",
|
|
88
88
|
"@takomo/test-custom-helper-uppercase": "0.0.1",
|
|
@@ -98,20 +98,21 @@
|
|
|
98
98
|
"@types/json-stable-stringify": "1.0.36",
|
|
99
99
|
"@types/lodash.merge": "4.6.9",
|
|
100
100
|
"@types/lodash.takerightwhile": "4.6.9",
|
|
101
|
-
"@types/node": "20.11.
|
|
102
|
-
"@types/ramda": "0.
|
|
101
|
+
"@types/node": "20.11.26",
|
|
102
|
+
"@types/ramda": "0.29.11",
|
|
103
103
|
"@types/semver": "7.5.7",
|
|
104
104
|
"@types/uuid": "9.0.8",
|
|
105
105
|
"@types/yargs": "17.0.32",
|
|
106
106
|
"@types/ejs": "3.1.5",
|
|
107
|
+
"@types/lodash": "4.14.202",
|
|
107
108
|
"@typescript-eslint/eslint-plugin": "6.16.0",
|
|
108
109
|
"@typescript-eslint/parser": "6.16.0",
|
|
109
110
|
"@types/inquirer-autocomplete-prompt": "3.0.3",
|
|
110
111
|
"depcheck": "1.4.7",
|
|
111
|
-
"eslint": "8.
|
|
112
|
+
"eslint": "8.57.0",
|
|
112
113
|
"eslint-config-prettier": "9.1.0",
|
|
113
114
|
"eslint-plugin-prettier": "5.1.3",
|
|
114
|
-
"husky": "9.0.
|
|
115
|
+
"husky": "9.0.11",
|
|
115
116
|
"jest": "29.7.0",
|
|
116
117
|
"jest-environment-testenv-recycler": "0.0.21",
|
|
117
118
|
"jest-mock-extended": "3.0.5",
|
|
@@ -119,8 +120,8 @@
|
|
|
119
120
|
"prettier-plugin-organize-imports": "3.2.4",
|
|
120
121
|
"lint-staged": "15.2.2",
|
|
121
122
|
"ts-node": "10.9.2",
|
|
122
|
-
"typedoc": "0.25.
|
|
123
|
-
"typescript": "5.
|
|
123
|
+
"typedoc": "0.25.12",
|
|
124
|
+
"typescript": "5.4.2",
|
|
124
125
|
"semantic-release": "23.0.2",
|
|
125
126
|
"npm-check-updates": "16.14.15"
|
|
126
127
|
},
|
|
@@ -140,15 +141,15 @@
|
|
|
140
141
|
"cockatiel": "3.1.2",
|
|
141
142
|
"date-and-time": "3.1.1",
|
|
142
143
|
"diff": "5.2.0",
|
|
143
|
-
"dotenv": "16.4.
|
|
144
|
-
"dotenv-expand": "11.0.
|
|
144
|
+
"dotenv": "16.4.5",
|
|
145
|
+
"dotenv-expand": "11.0.6",
|
|
145
146
|
"easy-table": "1.2.0",
|
|
146
147
|
"folder-hash": "4.0.4",
|
|
147
148
|
"handlebars": "4.7.8",
|
|
148
|
-
"inquirer": "9.2.
|
|
149
|
+
"inquirer": "9.2.15",
|
|
149
150
|
"inquirer-autocomplete-prompt": "3.0.1",
|
|
150
151
|
"jmespath": "0.16.0",
|
|
151
|
-
"joi": "17.12.
|
|
152
|
+
"joi": "17.12.2",
|
|
152
153
|
"js-yaml": "4.1.0",
|
|
153
154
|
"json-stable-stringify": "1.1.1",
|
|
154
155
|
"lodash.merge": "4.6.2",
|
|
@@ -156,14 +157,15 @@
|
|
|
156
157
|
"neverthrow": "6.1.0",
|
|
157
158
|
"p-queue": "8.0.1",
|
|
158
159
|
"pretty-ms": "9.0.0",
|
|
159
|
-
"ramda": "0.
|
|
160
|
+
"ramda": "0.29.1",
|
|
160
161
|
"readdirp": "3.6.0",
|
|
161
162
|
"semver": "7.6.0",
|
|
162
163
|
"source-map-support": "0.5.21",
|
|
163
164
|
"ts-dedent": "2.2.0",
|
|
164
165
|
"uuid": "9.0.1",
|
|
165
166
|
"yargs": "17.7.2",
|
|
166
|
-
"esbuild": "0.20.
|
|
167
|
-
"ejs": "3.1.9"
|
|
167
|
+
"esbuild": "0.20.1",
|
|
168
|
+
"ejs": "3.1.9",
|
|
169
|
+
"lodash": "4.17.21"
|
|
168
170
|
}
|
|
169
171
|
}
|