takomo 5.0.0-alpha.3 → 5.0.0-alpha.5
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/takomo-cli-io/cli-io.d.ts +1 -9
- package/dist/takomo-cli-io/cli-io.js +0 -13
- package/dist/takomo-cli-io/cli-io.js.map +1 -1
- package/dist/takomo-cli-io/deployment-targets/deployment-operation-io.js +2 -2
- package/dist/takomo-cli-io/deployment-targets/deployment-operation-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/common.d.ts +8 -1
- package/dist/takomo-cli-io/stacks/common.js +23 -8
- package/dist/takomo-cli-io/stacks/common.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.d.ts +3 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.js +7 -2
- package/dist/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/detect-drift-io.js +16 -12
- package/dist/takomo-cli-io/stacks/detect-drift-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/list-stacks-io.js +16 -6
- package/dist/takomo-cli-io/stacks/list-stacks-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/undeploy-stacks-io.d.ts +3 -1
- package/dist/takomo-cli-io/stacks/undeploy-stacks-io.js +7 -2
- package/dist/takomo-cli-io/stacks/undeploy-stacks-io.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/execute.js +3 -3
- package/dist/takomo-deployment-targets-commands/operation/execute.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/model.d.ts +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/command.js +1 -0
- package/dist/takomo-stacks-commands/stacks/deploy/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/validate.js +10 -0
- package/dist/takomo-stacks-commands/stacks/deploy/validate.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/plan.js +5 -4
- package/dist/takomo-stacks-commands/stacks/undeploy/plan.js.map +1 -1
- package/dist/takomo-util/strings.d.ts +0 -54
- package/dist/takomo-util/strings.js +1 -91
- package/dist/takomo-util/strings.js.map +1 -1
- package/package.json +1 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LogWriter } from "../takomo-util";
|
|
2
2
|
import { UserActions } from "./user-actions";
|
|
3
3
|
export interface Choice<T> {
|
|
4
4
|
readonly name: string;
|
|
@@ -11,20 +11,12 @@ interface MessageProps {
|
|
|
11
11
|
readonly indent?: number;
|
|
12
12
|
readonly transform?: (msg: string) => string;
|
|
13
13
|
}
|
|
14
|
-
interface TableProps {
|
|
15
|
-
readonly table: FormattedTable;
|
|
16
|
-
readonly marginTop?: boolean;
|
|
17
|
-
readonly marginBottom?: boolean;
|
|
18
|
-
readonly showHeaders?: boolean;
|
|
19
|
-
readonly indent?: number;
|
|
20
|
-
}
|
|
21
14
|
export interface BaseIO extends UserActions {
|
|
22
15
|
print: (text?: any, ...optionalParams: any[]) => void;
|
|
23
16
|
subheader: (props: MessageProps) => void;
|
|
24
17
|
header: (props: MessageProps) => void;
|
|
25
18
|
message: (props: MessageProps) => void;
|
|
26
19
|
longMessage: (lines: ReadonlyArray<string>, marginTop: boolean, marginBottom: boolean, indent: number) => void;
|
|
27
|
-
table: (props: TableProps) => void;
|
|
28
20
|
}
|
|
29
21
|
export interface BaseIOProps {
|
|
30
22
|
readonly writer?: LogWriter;
|
|
@@ -42,19 +42,6 @@ const createBaseIO = ({ writer = console.log, actions, }) => {
|
|
|
42
42
|
print();
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
|
-
table: ({ table, marginBottom, marginTop, showHeaders, indent, }) => {
|
|
46
|
-
if (marginTop) {
|
|
47
|
-
print();
|
|
48
|
-
}
|
|
49
|
-
table.print({
|
|
50
|
-
indent,
|
|
51
|
-
showHeaders,
|
|
52
|
-
writer: print,
|
|
53
|
-
});
|
|
54
|
-
if (marginBottom) {
|
|
55
|
-
print();
|
|
56
|
-
}
|
|
57
|
-
},
|
|
58
45
|
};
|
|
59
46
|
};
|
|
60
47
|
exports.createBaseIO = createBaseIO;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-io.js","sourceRoot":"","sources":["../../src/takomo-cli-io/cli-io.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cli-io.js","sourceRoot":"","sources":["../../src/takomo-cli-io/cli-io.ts"],"names":[],"mappings":";;;AAAA,gDAA6D;AAC7D,iDAAuE;AAiChE,MAAM,YAAY,GAAG,CAAC,EAC3B,MAAM,GAAG,OAAO,CAAC,GAAG,EACpB,OAAO,GACK,EAAU,EAAE;IACxB,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAE,EAAE,GAAG,cAAyB,EAAQ,EAAE;QACvE,MAAM,CAAC,IAAI,EAAE,GAAG,cAAc,CAAC,CAAA;IACjC,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,EACf,IAAI,EACJ,SAAS,GAAG,KAAK,EACjB,YAAY,GAAG,KAAK,EACpB,MAAM,GAAG,CAAC,EACV,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GACX,EAAQ,EAAE;QACvB,IAAI,SAAS,EAAE;YACb,KAAK,EAAE,CAAA;SACR;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI;aACD,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,CAAC;aAClC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE5C,IAAI,YAAY,EAAE;YAChB,KAAK,EAAE,CAAA;SACR;IACH,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,OAAO,IAAI,IAAA,wCAAyB,EAAC,KAAK,CAAC,CAAA;IAE/D,OAAO;QACL,GAAG,WAAW;QACd,KAAK;QACL,OAAO;QACP,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAgB,EAAE,EAAE;YAClE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAA,kBAAI,EAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;YAChD,OAAO,CAAC,EAAE,IAAI,EAAE,IAAA,kBAAI,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;QACxE,CAAC;QACD,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAgB,EAAE,EAAE;YACrE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAA,kBAAI,EAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;YAChD,OAAO,CAAC,EAAE,IAAI,EAAE,IAAA,kBAAI,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;QACxE,CAAC;QACD,WAAW,EAAE,CACX,KAA4B,EAC5B,SAAS,GAAG,KAAK,EACjB,YAAY,GAAG,KAAK,EACpB,MAAM,GAAG,CAAC,EACV,EAAE;YACF,IAAI,SAAS,EAAE;gBACb,KAAK,EAAE,CAAA;aACR;YAED,KAAK,CAAC,IAAA,yBAAW,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;YAC5C,IAAI,YAAY,EAAE;gBAChB,KAAK,EAAE,CAAA;aACR;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AA5DY,QAAA,YAAY,gBA4DxB"}
|
|
@@ -39,8 +39,8 @@ const getConfigSetsName = (configSetType) => {
|
|
|
39
39
|
const createDeploymentTargetsOperationIO = (props) => {
|
|
40
40
|
const { logger, messages } = props;
|
|
41
41
|
const io = (0, cli_io_1.createBaseIO)(props);
|
|
42
|
-
const createStackDeployIO = (logger) => (0, deploy_stacks_io_1.createDeployStacksIO)({ logger });
|
|
43
|
-
const createStackUndeployIO = (logger) => (0, undeploy_stacks_io_1.createUndeployStacksIO)({ logger });
|
|
42
|
+
const createStackDeployIO = (logger, target) => (0, deploy_stacks_io_1.createDeployStacksIO)({ logger, target: target.name });
|
|
43
|
+
const createStackUndeployIO = (logger, target) => (0, undeploy_stacks_io_1.createUndeployStacksIO)({ logger, target: target.name });
|
|
44
44
|
const printOutput = (output) => {
|
|
45
45
|
io.header({ text: messages.outputHeader, marginTop: true });
|
|
46
46
|
if (output.results.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment-operation-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/deployment-targets/deployment-operation-io.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAC9B,kDAAqB;
|
|
1
|
+
{"version":3,"file":"deployment-operation-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/deployment-targets/deployment-operation-io.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAC9B,kDAAqB;AAUrB,mDAA+D;AAC/D,sCAAwC;AACxC,mEAA4E;AAC5E,8CAAmD;AAEnD,+EAA+E;AAC/E,qEAAqE;AAkBrE,MAAM,WAAW,GAAG,CAAC,EACnB,mBAAmB,EACnB,8BAA8B,EAC9B,6BAA6B,GACpB,EAAuC,EAAE,CAAC;IACnD;QACE,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,QAAQ;KAChB;IACD;QACE,IAAI,EAAE,8BAA8B;QACpC,KAAK,EAAE,qBAAqB;KAC7B;IACD;QACE,IAAI,EAAE,6BAA6B;QACnC,KAAK,EAAE,oBAAoB;KAC5B;CACF,CAAA;AAMD,MAAM,iBAAiB,GAAG,CAAC,aAA4B,EAAU,EAAE;IACjE,QAAQ,aAAa,EAAE;QACrB,KAAK,UAAU;YACb,OAAO,aAAa,CAAA;QACtB,KAAK,WAAW;YACd,OAAO,uBAAuB,CAAA;QAChC;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,aAAa,EAAE,CAAC,CAAA;KACnE;AACH,CAAC,CAAA;AAEM,MAAM,kCAAkC,GAAG,CAChD,KAAiC,EACH,EAAE;IAChC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;IAClC,MAAM,EAAE,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC,CAAA;IAE9B,MAAM,mBAAmB,GAAG,CAC1B,MAAiB,EACjB,MAA+B,EACf,EAAE,CAAC,IAAA,uCAAoB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE1E,MAAM,qBAAqB,GAAG,CAC5B,MAAiB,EACjB,MAA+B,EACb,EAAE,CAAC,IAAA,2CAAsB,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE9E,MAAM,WAAW,GAAG,CAClB,MAAwC,EACN,EAAE;QACpC,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAE3D,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/D,OAAO,MAAM,CAAA;SACd;QAED,MAAM,YAAY,GAAG,IAAI,oBAAK,EAAE,CAAA;QAEhC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC9B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC/B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;wBACnC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;4BACnC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gCACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oCAC5C,YAAY;yCACT,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;yCAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;yCAC/B,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC;yCAC3C,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC;yCACxC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;yCAC1C,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;yCAC1C,IAAI,CAAC,QAAQ,EAAE,IAAA,gCAAmB,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;yCACvD,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC;yCACzD,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC;yCACpC,MAAM,EAAE,CAAA;gCACb,CAAC,CAAC,CAAA;6BACH;iCAAM;gCACL,YAAY;qCACT,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;qCAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;qCAC/B,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC;qCAC3C,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC;qCACxC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;qCACvB,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;qCACvB,IAAI,CAAC,QAAQ,EAAE,IAAA,gCAAmB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;qCAClD,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC;qCAC3D,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;qCACtC,MAAM,EAAE,CAAA;6BACZ;wBACH,CAAC,CAAC,CAAA;oBACJ,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAE9D,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;IAED,MAAM,gBAAgB,GAAG,KAAK,EAC5B,IAA0B,EACO,EAAE;QACnC,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,EAAE,CAAC,WAAW,CACZ,IAAA,8BAAgB,EAAC,EAAE,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EACjD,KAAK,EACL,KAAK,EACL,CAAC,CACF,CAAA;QAED,EAAE,CAAC,OAAO,CAAC;YACT,IAAI,EAAE,QAAQ,CAAC,gBAAgB;YAC/B,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5B,EAAE,CAAC,OAAO,CAAC;gBACT,IAAI,EAAE,UAAU,KAAK,CAAC,SAAS,EAAE;gBACjC,MAAM,EAAE,CAAC;gBACT,SAAS,EAAE,IAAI;aAChB,CAAC,CAAA;YACF,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC1B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;gBAC7D,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE;oBAC1C,EAAE,CAAC,OAAO,CAAC;wBACT,IAAI,EAAE,yBAAyB,IAAI,CAAC,IAAI,EAAE;wBAC1C,SAAS,EAAE,IAAI;wBACf,MAAM,EAAE,CAAC;qBACV,CAAC,CAAA;oBAEF,IAAI,IAAI,CAAC,SAAS,EAAE;wBAClB,EAAE,CAAC,OAAO,CAAC;4BACT,IAAI,EAAE,uBAAuB,IAAI,CAAC,SAAS,EAAE;4BAC7C,MAAM,EAAE,CAAC;yBACV,CAAC,CAAA;qBACH;oBACD,IAAI,IAAI,CAAC,WAAW,EAAE;wBACpB,EAAE,CAAC,OAAO,CAAC;4BACT,IAAI,EAAE,uBAAuB,IAAI,CAAC,WAAW,EAAE;4BAC/C,MAAM,EAAE,CAAC;yBACV,CAAC,CAAA;qBACH;oBAED,EAAE,CAAC,OAAO,CAAC;wBACT,IAAI,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG;wBACjD,MAAM,EAAE,CAAC;qBACV,CAAC,CAAA;oBAEF,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;wBAC/B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;oBACzD,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;QAErC,OAAO,EAAE,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACjE,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAG,eAAC,CAAC,KAAK,CAAC,8CAA4B,CAAC,CAChE,OAAO,EACP,SAAS,EACT,MAAM,CACP,CAAA;IAED,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB;QACnB,qBAAqB;QACrB,gBAAgB;QAChB,WAAW;QACX,oBAAoB;KACrB,CAAA;AACH,CAAC,CAAA;AAlJY,QAAA,kCAAkC,sCAkJ9C"}
|
|
@@ -4,10 +4,17 @@ import { LogLevel, TkmLogger } from "../../takomo-util";
|
|
|
4
4
|
import { BaseIO, BaseIOProps } from "../cli-io";
|
|
5
5
|
export declare const chooseCommandPathInternal: (io: BaseIO, rootStackGroup: StackGroup) => Promise<CommandPath>;
|
|
6
6
|
export declare const printFailedStackResults: (io: BaseIO, failed: ReadonlyArray<StackResult>, logLevel: LogLevel, indent: number) => void;
|
|
7
|
-
|
|
7
|
+
interface PrintStacksOperationOutputProps {
|
|
8
|
+
readonly io: BaseIO;
|
|
9
|
+
readonly output: StacksOperationOutput;
|
|
10
|
+
readonly logLevel: LogLevel;
|
|
11
|
+
readonly target?: string;
|
|
12
|
+
}
|
|
13
|
+
export declare const printStacksOperationOutput: ({ io, output, logLevel, target, }: PrintStacksOperationOutputProps) => StacksOperationOutput;
|
|
8
14
|
export interface IOProps extends BaseIOProps {
|
|
9
15
|
readonly logger: TkmLogger;
|
|
10
16
|
readonly quiet?: boolean;
|
|
11
17
|
}
|
|
12
18
|
export declare const formatDate: (d: any) => string;
|
|
13
19
|
export declare const createStacksOperationListenerInternal: (logger: TkmLogger, operation: string, stackCount: number) => StacksOperationListener;
|
|
20
|
+
export {};
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createStacksOperationListenerInternal = exports.formatDate = exports.printStacksOperationOutput = exports.printFailedStackResults = exports.chooseCommandPathInternal = void 0;
|
|
7
|
+
const easy_table_1 = __importDefault(require("easy-table"));
|
|
4
8
|
const takomo_stacks_model_1 = require("../../takomo-stacks-model");
|
|
5
9
|
const takomo_util_1 = require("../../takomo-util");
|
|
6
10
|
const common_1 = require("../common");
|
|
@@ -42,16 +46,17 @@ const printFailedStackResults = (io, failed, logLevel, indent) => {
|
|
|
42
46
|
});
|
|
43
47
|
};
|
|
44
48
|
exports.printFailedStackResults = printFailedStackResults;
|
|
45
|
-
const toOutputStackResult = (result) => ({
|
|
49
|
+
const toOutputStackResult = (result, target) => ({
|
|
46
50
|
path: result.stack.path,
|
|
47
51
|
name: result.stack.name,
|
|
48
52
|
status: result.status,
|
|
49
53
|
time: result.timer.getSecondsElapsed(),
|
|
50
54
|
message: result.message,
|
|
55
|
+
target,
|
|
51
56
|
});
|
|
52
|
-
const printStacksOperationOutput = (io, output, logLevel) => {
|
|
57
|
+
const printStacksOperationOutput = ({ io, output, logLevel, target, }) => {
|
|
53
58
|
const { outputFormat, results } = output;
|
|
54
|
-
const stacks = results.map(toOutputStackResult);
|
|
59
|
+
const stacks = results.map((r) => toOutputStackResult(r, target));
|
|
55
60
|
if (outputFormat === "json") {
|
|
56
61
|
io.message({
|
|
57
62
|
text: (0, takomo_util_1.toPrettyJson)({
|
|
@@ -82,12 +87,22 @@ const printStacksOperationOutput = (io, output, logLevel) => {
|
|
|
82
87
|
return output;
|
|
83
88
|
}
|
|
84
89
|
const failed = output.results.filter((r) => !r.success && r.status === "FAILED");
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
|
|
90
|
+
const table = new easy_table_1.default();
|
|
91
|
+
output.results.forEach((result) => {
|
|
92
|
+
if (target) {
|
|
93
|
+
table.cell("Target", target);
|
|
94
|
+
}
|
|
95
|
+
table
|
|
96
|
+
.cell("Path", result.stack.path)
|
|
97
|
+
.cell("Name", result.stack.name)
|
|
98
|
+
.cell("Status", (0, formatters_1.formatCommandStatus)(result.status))
|
|
99
|
+
.cell("Time", result.timer.getFormattedTimeElapsed())
|
|
100
|
+
.cell("Message", result.message)
|
|
101
|
+
.newRow();
|
|
102
|
+
});
|
|
103
|
+
io.message({
|
|
88
104
|
marginTop: true,
|
|
89
|
-
|
|
90
|
-
table: resultsTable,
|
|
105
|
+
text: table.toString(),
|
|
91
106
|
});
|
|
92
107
|
if (failed.length > 0) {
|
|
93
108
|
io.subheader({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,8 @@ export declare const CONFIRM_STACK_DEPLOY_ANSWER_CONTINUE_AND_SKIP_REMAINING_REV
|
|
|
15
15
|
export declare const CONFIRM_DEPLOY_ANSWER_CANCEL: ConfirmDeployAnswerChoice;
|
|
16
16
|
export declare const CONFIRM_DEPLOY_ANSWER_CONTINUE_AND_REVIEW: ConfirmDeployAnswerChoice;
|
|
17
17
|
export declare const CONFIRM_DEPLOY_ANSWER_CONTINUE_NO_REVIEW: ConfirmDeployAnswerChoice;
|
|
18
|
-
export
|
|
18
|
+
export interface DeployStacksIOProps extends IOProps {
|
|
19
|
+
readonly target?: string;
|
|
20
|
+
}
|
|
19
21
|
export declare const createDeployStacksIO: (props: DeployStacksIOProps) => DeployStacksIO;
|
|
20
22
|
export {};
|
|
@@ -72,7 +72,7 @@ const formatStackOperationType = (type) => {
|
|
|
72
72
|
};
|
|
73
73
|
const ensureContentsEndsWithLineFeed = (content) => content.endsWith("\n") ? content : content + "\n";
|
|
74
74
|
const createDeployStacksIO = (props) => {
|
|
75
|
-
const { logger } = props;
|
|
75
|
+
const { logger, target } = props;
|
|
76
76
|
const io = (0, cli_io_1.createBaseIO)(props);
|
|
77
77
|
// TODO: Come up some other solution
|
|
78
78
|
let autoConfirmEnabled = false;
|
|
@@ -146,7 +146,12 @@ const createDeployStacksIO = (props) => {
|
|
|
146
146
|
exports.CONFIRM_DEPLOY_ANSWER_CONTINUE_NO_REVIEW,
|
|
147
147
|
], true);
|
|
148
148
|
};
|
|
149
|
-
const printOutput = (output) => (0, common_1.printStacksOperationOutput)(
|
|
149
|
+
const printOutput = (output) => (0, common_1.printStacksOperationOutput)({
|
|
150
|
+
io,
|
|
151
|
+
output,
|
|
152
|
+
logLevel: logger.logLevel,
|
|
153
|
+
target,
|
|
154
|
+
});
|
|
150
155
|
const confirmStackDeploy = async (stack, templateBody, templateSummary, operationType, existingStack, changeSet) => {
|
|
151
156
|
if (autoConfirmEnabled) {
|
|
152
157
|
return "CONTINUE";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-stacks-io.js","sourceRoot":"","sources":["../../../../src/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAqBrB,sDAA+E;AAC/E,yCAA2C;AAC3C,iDAAsE;AACtE,sCAKkB;AAClB,uCAAwC;AACxC,6CAA8C;AAC9C,2CAA4C;AAC5C,iDAAiD;AACjD,iCAAkC;AAClC,qEAAqE;AAYxD,QAAA,kCAAkC,GAC7C;IACE,IAAI,EAAE,sDAAsD;IAC5D,KAAK,EAAE,QAAQ;CAChB,CAAA;AAEU,QAAA,2CAA2C,GACtD;IACE,IAAI,EAAE,sCAAsC;IAC5C,KAAK,EAAE,iBAAiB;CACzB,CAAA;AAEU,QAAA,oCAAoC,GAC/C;IACE,IAAI,EAAE,uEAAuE;IAC7E,KAAK,EAAE,UAAU;CAClB,CAAA;AAEU,QAAA,+DAA+D,GAC1E;IACE,IAAI,EAAE,0FAA0F;IAChG,KAAK,EAAE,qCAAqC;CAC7C,CAAA;AAEU,QAAA,4BAA4B,GAA8B;IACrE,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,QAAQ;CAChB,CAAA;AAEY,QAAA,yCAAyC,GACpD;IACE,IAAI,EAAE,mDAAmD;IACzD,KAAK,EAAE,qBAAqB;CAC7B,CAAA;AAEU,QAAA,wCAAwC,GACnD;IACE,IAAI,EAAE,uDAAuD;IAC7D,KAAK,EAAE,oBAAoB;CAC5B,CAAA;AAEH,MAAM,oBAAoB,GAAG,CAC3B,SAAoB,EACpB,IAAwB,EACxB,YAAoB,EACZ,EAAE;IACV,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,MAAM,SAAS,GAAG,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC5D,OAAO,IAAA,mBAAK,EAAC,GAAG,SAAS,yBAAyB,CAAC,CAAA;QACrD,KAAK,UAAU;YACb,MAAM,WAAW,GAAG,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC9D,OAAO,IAAA,oBAAM,EAAC,GAAG,WAAW,0BAA0B,CAAC,CAAA;QACzD,KAAK,QAAQ;YACX,MAAM,SAAS,GAAG,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC5D,OAAO,IAAA,oBAAM,EAAC,GAAG,SAAS,yBAAyB,CAAC,CAAA;QACtD;YACE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,GAAG,CAAC,CAAA;KACjE;AACH,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,IAAwB,EAAU,EAAE;IACpE,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,OAAO,IAAA,mBAAK,EAAC,QAAQ,CAAC,CAAA;QACxB,KAAK,UAAU;YACb,OAAO,IAAA,oBAAM,EAAC,UAAU,CAAC,CAAA;QAC3B,KAAK,QAAQ;YACX,OAAO,IAAA,oBAAM,EAAC,QAAQ,CAAC,CAAA;QACzB;YACE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,GAAG,CAAC,CAAA;KACjE;AACH,CAAC,CAAA;AAED,MAAM,8BAA8B,GAAG,CAAC,OAAe,EAAU,EAAE,CACjE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"deploy-stacks-io.js","sourceRoot":"","sources":["../../../../src/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createDetectDriftIO = void 0;
|
|
4
|
-
const
|
|
7
|
+
const easy_table_1 = __importDefault(require("easy-table"));
|
|
5
8
|
const cli_io_1 = require("../cli-io");
|
|
6
9
|
const formatters_1 = require("../formatters");
|
|
7
10
|
const createDetectDriftIO = (props) => {
|
|
8
11
|
const { logger } = props;
|
|
9
12
|
const io = (0, cli_io_1.createBaseIO)(props);
|
|
10
13
|
const printOutput = (output) => {
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
14
|
+
const table = new easy_table_1.default();
|
|
15
|
+
output.stacks.forEach(({ stack, current, driftDetectionStatus }) => {
|
|
16
|
+
table
|
|
17
|
+
.cell("Path", stack.path)
|
|
18
|
+
.cell("Name", stack.name)
|
|
19
|
+
.cell("Status", (0, formatters_1.formatStackStatus)(current?.status))
|
|
20
|
+
.cell("Drift status", (0, formatters_1.formatDriftStatus)(driftDetectionStatus?.stackDriftStatus))
|
|
21
|
+
.cell("Drifted resources", driftDetectionStatus?.driftedStackResourceCount ?? 0)
|
|
22
|
+
.newRow();
|
|
23
|
+
});
|
|
24
|
+
io.message({
|
|
25
|
+
text: table.toString(),
|
|
21
26
|
marginTop: true,
|
|
22
|
-
table: stacksTable,
|
|
23
27
|
});
|
|
24
28
|
return output;
|
|
25
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect-drift-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/detect-drift-io.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"detect-drift-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/detect-drift-io.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,sCAAwC;AACxC,8CAAoE;AAG7D,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAiB,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IACxB,MAAM,EAAE,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC,CAAA;IAE9B,MAAM,WAAW,GAAG,CAAC,MAAyB,EAAqB,EAAE;QACnE,MAAM,KAAK,GAAG,IAAI,oBAAK,EAAE,CAAA;QAEzB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE;YACjE,KAAK;iBACF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC;iBACxB,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC;iBACxB,IAAI,CAAC,QAAQ,EAAE,IAAA,8BAAiB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBAClD,IAAI,CACH,cAAc,EACd,IAAA,8BAAiB,EAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAC1D;iBACA,IAAI,CACH,mBAAmB,EACnB,oBAAoB,EAAE,yBAAyB,IAAI,CAAC,CACrD;iBACA,MAAM,EAAE,CAAA;QACb,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,OAAO,CAAC;YACT,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;YACtB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;IAED,OAAO;QACL,GAAG,EAAE;QACL,GAAG,MAAM;QACT,WAAW;KACZ,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,mBAAmB,uBAoC/B"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createListStacksIO = void 0;
|
|
7
|
+
const easy_table_1 = __importDefault(require("easy-table"));
|
|
4
8
|
const takomo_util_1 = require("../../takomo-util");
|
|
5
9
|
const cli_io_1 = require("../cli-io");
|
|
6
10
|
const formatters_1 = require("../formatters");
|
|
@@ -36,13 +40,19 @@ const createListStacksIO = (props) => {
|
|
|
36
40
|
});
|
|
37
41
|
break;
|
|
38
42
|
default:
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
const table = new easy_table_1.default();
|
|
44
|
+
results.forEach((stack) => {
|
|
45
|
+
table
|
|
46
|
+
.cell("Path", stack.path)
|
|
47
|
+
.cell("Name", stack.name)
|
|
48
|
+
.cell("Status", (0, formatters_1.formatStackStatus)(stack.status))
|
|
49
|
+
.cell("Created", (0, common_1.formatDate)(stack.createdTime))
|
|
50
|
+
.cell("Updated", (0, common_1.formatDate)(stack.updatedTime))
|
|
51
|
+
.newRow();
|
|
52
|
+
});
|
|
53
|
+
io.message({
|
|
54
|
+
text: table.toString(),
|
|
43
55
|
marginTop: true,
|
|
44
|
-
marginBottom: true,
|
|
45
|
-
table: stacksTable,
|
|
46
56
|
});
|
|
47
57
|
}
|
|
48
58
|
return output;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-stacks-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/list-stacks-io.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list-stacks-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/list-stacks-io.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,mDAA4D;AAC5D,sCAAwC;AACxC,8CAAiD;AACjD,qCAA8C;AAEvC,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAgB,EAAE;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IACxB,MAAM,EAAE,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC,CAAA;IAE9B,MAAM,WAAW,GAAG,CAAC,MAAwB,EAAoB,EAAE;QACjE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;QACxC,QAAQ,YAAY,EAAE;YACpB,KAAK,MAAM;gBACT,EAAE,CAAC,OAAO,CAAC;oBACT,IAAI,EAAE,IAAA,0BAAY,EAAC;wBACjB,OAAO;wBACP,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;qBACvC,CAAC;iBACH,CAAC,CAAA;gBACF,MAAK;YACP,KAAK,MAAM;gBACT,EAAE,CAAC,OAAO,CAAC;oBACT,IAAI,EAAE,IAAA,wBAAU,EAAC;wBACf,OAAO;wBACP,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;qBACvC,CAAC;iBACH,CAAC,CAAA;gBACF,MAAK;YACP;gBACE,MAAM,KAAK,GAAG,IAAI,oBAAK,EAAE,CAAA;gBAEzB,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACxB,KAAK;yBACF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC;yBACxB,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC;yBACxB,IAAI,CAAC,QAAQ,EAAE,IAAA,8BAAiB,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;yBAC/C,IAAI,CAAC,SAAS,EAAE,IAAA,mBAAU,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC;yBAC9C,IAAI,CAAC,SAAS,EAAE,IAAA,mBAAU,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC;yBAC9C,MAAM,EAAE,CAAA;gBACb,CAAC,CAAC,CAAA;gBAEF,EAAE,CAAC,OAAO,CAAC;oBACT,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;oBACtB,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAA;SACL;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;IAED,OAAO;QACL,GAAG,EAAE;QACL,GAAG,MAAM;QACT,WAAW;KACZ,CAAA;AACH,CAAC,CAAA;AA1DY,QAAA,kBAAkB,sBA0D9B"}
|
|
@@ -6,6 +6,8 @@ interface ConfirmUndeployAnswerOption {
|
|
|
6
6
|
}
|
|
7
7
|
export declare const CONFIRM_UNDEPLOY_ANSWER_CANCEL: ConfirmUndeployAnswerOption;
|
|
8
8
|
export declare const CONFIRM_UNDEPLOY_ANSWER_CONTINUE: ConfirmUndeployAnswerOption;
|
|
9
|
-
export
|
|
9
|
+
export interface UndeployStacksIOProps extends IOProps {
|
|
10
|
+
readonly target?: string;
|
|
11
|
+
}
|
|
10
12
|
export declare const createUndeployStacksIO: (props: UndeployStacksIOProps) => UndeployStacksIO;
|
|
11
13
|
export {};
|
|
@@ -46,7 +46,7 @@ const getConfirmUndeployText = (prune) => prune
|
|
|
46
46
|
"Following stacks will be undeployed:",
|
|
47
47
|
];
|
|
48
48
|
const createUndeployStacksIO = (props) => {
|
|
49
|
-
const { logger } = props;
|
|
49
|
+
const { logger, target } = props;
|
|
50
50
|
const io = (0, cli_io_1.createBaseIO)(props);
|
|
51
51
|
const confirmUndeploy = async ({ operations, prune, }) => {
|
|
52
52
|
io.subheader({ text: getConfirmUndeployHeader(prune), marginTop: true });
|
|
@@ -101,7 +101,12 @@ const createUndeployStacksIO = (props) => {
|
|
|
101
101
|
return await io.choose("Continue to undeploy the stacks?", [exports.CONFIRM_UNDEPLOY_ANSWER_CANCEL, exports.CONFIRM_UNDEPLOY_ANSWER_CONTINUE], true);
|
|
102
102
|
};
|
|
103
103
|
const printStackEvent = (stackPath, e) => logger.info(stackPath + " - " + (0, formatters_1.formatStackEvent)(e));
|
|
104
|
-
const printOutput = (output) => (0, common_1.printStacksOperationOutput)(
|
|
104
|
+
const printOutput = (output) => (0, common_1.printStacksOperationOutput)({
|
|
105
|
+
io,
|
|
106
|
+
output,
|
|
107
|
+
logLevel: logger.logLevel,
|
|
108
|
+
target,
|
|
109
|
+
});
|
|
105
110
|
const chooseCommandPath = (rootStackGroup) => (0, common_1.chooseCommandPathInternal)(io, rootStackGroup);
|
|
106
111
|
const createStacksOperationListener = (stackCount) => (0, common_1.createStacksOperationListenerInternal)(logger, "undeploy", stackCount);
|
|
107
112
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undeploy-stacks-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/undeploy-stacks-io.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAUrB,mDAA6C;AAC7C,sCAAwC;AACxC,8CAAmE;AACnE,qCAKiB;AAOJ,QAAA,8BAA8B,GAAgC;IACzE,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,QAAQ;CAChB,CAAA;AAEY,QAAA,gCAAgC,GAAgC;IAC3E,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,UAAU;CAClB,CAAA;AAED,MAAM,oBAAoB,GAAG,CAC3B,SAAoB,EACpB,IAAgC,EAChC,YAAoB,EACZ,EAAE;IACV,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,MAAM,SAAS,GAAG,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC5D,OAAO,IAAA,iBAAG,EAAC,GAAG,SAAS,yBAAyB,CAAC,CAAA;QACnD,KAAK,MAAM;YACT,MAAM,OAAO,GAAG,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA;YAC1D,OAAO,IAAA,kBAAI,EAAC,GAAG,OAAO,uCAAuC,CAAC,CAAA;QAChE;YACE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,GAAG,CAAC,CAAA;KACjE;AACH,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAU,EAAE,CAC1D,KAAK,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,kCAAkC,CAAA;AAE1E,MAAM,sBAAsB,GAAG,CAAC,KAAc,EAAyB,EAAE,CACvE,KAAK;IACH,CAAC,CAAC;QACE,0DAA0D;QAC1D,gEAAgE;QAChE,4CAA4C;QAC5C,EAAE;QACF,sCAAsC;KACvC;IACH,CAAC,CAAC;QACE,iEAAiE;QACjE,gEAAgE;QAChE,yBAAyB;QACzB,EAAE;QACF,sCAAsC;KACvC,CAAA;
|
|
1
|
+
{"version":3,"file":"undeploy-stacks-io.js","sourceRoot":"","sources":["../../../src/takomo-cli-io/stacks/undeploy-stacks-io.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const takomo_execution_plans_1 = require("../../takomo-execution-plans");
|
|
|
5
5
|
const takomo_stacks_commands_1 = require("../../takomo-stacks-commands");
|
|
6
6
|
const takomo_util_1 = require("../../takomo-util");
|
|
7
7
|
const create_deployment_target_variables_1 = require("./create-deployment-target-variables");
|
|
8
|
-
const executeOperationInternal = async (operation, input,
|
|
8
|
+
const executeOperationInternal = async (operation, input, target, credentialManager, io, ctx, configRepository, logger, expectNoChanges, prune) => {
|
|
9
9
|
switch (operation) {
|
|
10
10
|
case "deploy":
|
|
11
11
|
return (0, takomo_stacks_commands_1.deployStacksCommand)({
|
|
@@ -16,7 +16,7 @@ const executeOperationInternal = async (operation, input, account, credentialMan
|
|
|
16
16
|
ctx,
|
|
17
17
|
credentialManager,
|
|
18
18
|
configRepository,
|
|
19
|
-
io: io.createStackDeployIO(logger),
|
|
19
|
+
io: io.createStackDeployIO(logger, target),
|
|
20
20
|
});
|
|
21
21
|
case "undeploy":
|
|
22
22
|
return (0, takomo_stacks_commands_1.undeployStacksCommand)({
|
|
@@ -27,7 +27,7 @@ const executeOperationInternal = async (operation, input, account, credentialMan
|
|
|
27
27
|
ctx,
|
|
28
28
|
credentialManager,
|
|
29
29
|
configRepository,
|
|
30
|
-
io: io.createStackUndeployIO(logger),
|
|
30
|
+
io: io.createStackUndeployIO(logger, target),
|
|
31
31
|
});
|
|
32
32
|
default:
|
|
33
33
|
throw new Error(`Unsupported operation: ${operation}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/execute.ts"],"names":[],"mappings":";;;AAMA,yEAGqC;AACrC,yEAKqC;AAGrC,mDAA0D;AAE1D,6FAAsF;AAiBtF,MAAM,wBAAwB,GAAG,KAAK,EACpC,SAA8B,EAC9B,KAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-commands/operation/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,8 @@ export interface DeploymentTargetsListener {
|
|
|
31
31
|
readonly onTargetComplete: () => Promise<void>;
|
|
32
32
|
}
|
|
33
33
|
export interface DeploymentTargetsOperationIO extends IO<DeploymentTargetsOperationOutput> {
|
|
34
|
-
readonly createStackDeployIO: (logger: TkmLogger) => DeployStacksIO;
|
|
35
|
-
readonly createStackUndeployIO: (logger: TkmLogger) => UndeployStacksIO;
|
|
34
|
+
readonly createStackDeployIO: (logger: TkmLogger, target: PlannedDeploymentTarget) => DeployStacksIO;
|
|
35
|
+
readonly createStackUndeployIO: (logger: TkmLogger, target: PlannedDeploymentTarget) => UndeployStacksIO;
|
|
36
36
|
readonly confirmOperation: (plan: TargetsExecutionPlan) => Promise<ConfirmOperationAnswer>;
|
|
37
37
|
readonly createTargetListener: (props: CreateConfigSetTargetListenerProps) => ConfigSetTargetListener;
|
|
38
38
|
}
|
|
@@ -40,6 +40,7 @@ const deployStacksCommand = ({ credentialManager, ctx, input, configRepository,
|
|
|
40
40
|
commandPath: input.interactive ? undefined : input.commandPath,
|
|
41
41
|
logger: io,
|
|
42
42
|
credentialManager,
|
|
43
|
+
validateCommandRoles: false,
|
|
43
44
|
}))
|
|
44
45
|
.then((ctx) => deployStacks(ctx, configRepository, io, input))
|
|
45
46
|
.then(io.printOutput);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,0EAGuC;AAEvC,wEAAmE;AACnE,sDAAoD;AAEpD,qEAA+D;AAE/D,iCAA8C;AAC9C,yCAAqD;AAErD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAiC,EACjC,GAA0B,EAC1B,EAAkB,EACmB,EAAE;IACvC,IAAI,KAAK,CAAC,WAAW,EAAE;QACrB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAClE,OAAO;YACL,GAAG,KAAK;YACR,WAAW;SACZ,CAAA;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAA0B,EAC1B,gBAAwC,EACxC,EAAkB,EAClB,KAAiC,EACD,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAqB,EACtC,GAAG,CAAC,MAAM,EACV,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,kBAAkB,EAChC,EAAE,CACH,CAAA;IAED,MAAM,IAAA,mCAAwB,EAAC,IAAI,CAAC,CAAA;IAEpC,OAAO,IAAA,6CAAoB,EAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,0CAAmB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IACrE,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;KACpC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAK5B,CAAC,EACH,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,GACH,EAAkC,EAAE,CACnC,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACd,IAAA,0CAAkB,EAAC;IACjB,GAAG;IACH,gBAAgB;IAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW;IAC9D,MAAM,EAAE,EAAE;IACV,iBAAiB;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/command.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,0EAGuC;AAEvC,wEAAmE;AACnE,sDAAoD;AAEpD,qEAA+D;AAE/D,iCAA8C;AAC9C,yCAAqD;AAErD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAiC,EACjC,GAA0B,EAC1B,EAAkB,EACmB,EAAE;IACvC,IAAI,KAAK,CAAC,WAAW,EAAE;QACrB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAClE,OAAO;YACL,GAAG,KAAK;YACR,WAAW;SACZ,CAAA;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,KAAK,EACxB,GAA0B,EAC1B,gBAAwC,EACxC,EAAkB,EAClB,KAAiC,EACD,EAAE;IAClC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAqB,EACtC,GAAG,CAAC,MAAM,EACV,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,kBAAkB,EAChC,EAAE,CACH,CAAA;IAED,MAAM,IAAA,mCAAwB,EAAC,IAAI,CAAC,CAAA;IAEpC,OAAO,IAAA,6CAAoB,EAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAa,EAAE;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,0CAAmB,EAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IACrE,OAAO,aAAG,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;KACpC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClB,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAK5B,CAAC,EACH,iBAAiB,EACjB,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,EAAE,GACH,EAAkC,EAAE,CACnC,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC;KACnC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACd,IAAA,0CAAkB,EAAC;IACjB,GAAG;IACH,gBAAgB;IAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW;IAC9D,MAAM,EAAE,EAAE;IACV,iBAAiB;IACjB,oBAAoB,EAAE,KAAK;CAC5B,CAAC,CACH;KACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;KAC7D,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;AAxBZ,QAAA,mBAAmB,uBAwBP"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.validateStacksDeployPlan = exports.validateStacksStatus = exports.isStackReadyForDeploy = void 0;
|
|
7
|
+
const ramda_1 = __importDefault(require("ramda"));
|
|
4
8
|
const takomo_stacks_context_1 = require("../../../takomo-stacks-context");
|
|
5
9
|
const takomo_util_1 = require("../../../takomo-util");
|
|
6
10
|
const isStackReadyForDeploy = (stackStatus) => [
|
|
@@ -32,8 +36,14 @@ const validateStacksStatus = (operations) => {
|
|
|
32
36
|
}
|
|
33
37
|
};
|
|
34
38
|
exports.validateStacksStatus = validateStacksStatus;
|
|
39
|
+
const validateCredentialManagers = async (plan) => {
|
|
40
|
+
const credentialManagers = plan.operations.map((operation) => operation.stack.credentialManager);
|
|
41
|
+
const uniqueCredentialManagers = ramda_1.default.uniqBy((cm) => cm.iamRoleArn ?? "", credentialManagers);
|
|
42
|
+
await Promise.all(uniqueCredentialManagers.map((cm) => cm.getCallerIdentity()));
|
|
43
|
+
};
|
|
35
44
|
const validateStacksDeployPlan = async (plan) => {
|
|
36
45
|
const { operations } = plan;
|
|
46
|
+
await validateCredentialManagers(plan);
|
|
37
47
|
await (0, takomo_stacks_context_1.validateStackCredentialManagersWithAllowedAccountIds)(operations.map((o) => o.stack));
|
|
38
48
|
(0, exports.validateStacksStatus)(operations);
|
|
39
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/deploy/validate.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,0EAAqG;AACrG,sDAAkD;AAG3C,MAAM,qBAAqB,GAAG,CAAC,WAAwB,EAAW,EAAE,CACzE;IACE,iBAAiB;IACjB,iBAAiB;IACjB,0BAA0B;IAC1B,wBAAwB;IACxB,oBAAoB;IACpB,eAAe;IACf,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,0BAA0B;CAC3B,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;AAZZ,QAAA,qBAAqB,yBAYT;AAElB,MAAM,oBAAoB,GAAG,CAClC,UAA+C,EACzC,EAAE;IACR,MAAM,qBAAqB,GAAG,EAAE,CAAA;IAChC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAA;QAClC,IAAI,YAAY,IAAI,CAAC,IAAA,6BAAqB,EAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YAC/D,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SACtC;KACF;IAED,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;QACpC,MAAM,IAAI,yBAAW,CACnB,yEAAyE;YACvE,qBAAqB;iBAClB,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,CACrE;iBACA,IAAI,CAAC,IAAI,CAAC,CAChB,CAAA;KACF;AACH,CAAC,CAAA;AAtBY,QAAA,oBAAoB,wBAsBhC;AAED,MAAM,0BAA0B,GAAG,KAAK,EACtC,IAAsB,EACP,EAAE;IACjB,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAC5C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,iBAAiB,CACjD,CAAA;IAED,MAAM,wBAAwB,GAAG,eAAC,CAAC,MAAM,CACvC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,IAAI,EAAE,EAC3B,kBAAkB,CACnB,CAAA;IAED,MAAM,OAAO,CAAC,GAAG,CACf,wBAAwB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAC7D,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAsB,EACP,EAAE;IACjB,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAE3B,MAAM,0BAA0B,CAAC,IAAI,CAAC,CAAA;IAEtC,MAAM,IAAA,4EAAoD,EACxD,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAC/B,CAAA;IAED,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAA;AAClC,CAAC,CAAA;AAZY,QAAA,wBAAwB,4BAYpC"}
|
|
@@ -52,12 +52,13 @@ const buildStacksUndeployPlan = async (stacks, commandPath, ignoreDependencies,
|
|
|
52
52
|
.map((stackPath) => stacksByPath.get(stackPath))
|
|
53
53
|
.filter(pruneFilter);
|
|
54
54
|
const sortedStacks = (0, takomo_stacks_context_1.sortStacksForUndeploy)(stacksToUndeploy);
|
|
55
|
-
const
|
|
55
|
+
const selectedStacks = ignoreDependencies
|
|
56
|
+
? sortedStacks.filter((stack) => (0, takomo_stacks_model_1.isWithinCommandPath)(stack.path, commandPath))
|
|
57
|
+
: sortedStacks;
|
|
58
|
+
const operations = await Promise.all(selectedStacks.map((stack) => convertToUndeployOperation(stacksByPath, stack, prune)));
|
|
56
59
|
return {
|
|
57
60
|
prune,
|
|
58
|
-
operations
|
|
59
|
-
? operations.filter((o) => (0, takomo_stacks_model_1.isWithinCommandPath)(o.stack.path, commandPath))
|
|
60
|
-
: operations,
|
|
61
|
+
operations,
|
|
61
62
|
};
|
|
62
63
|
};
|
|
63
64
|
exports.buildStacksUndeployPlan = buildStacksUndeployPlan;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/undeploy/plan.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,0EAAsE;AACtE,sEAQqC;AACrC,sDAAiD;AAI1C,MAAM,4BAA4B,GAAG,CAC1C,YAAkC,EACN,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAFtD,QAAA,4BAA4B,gCAE0B;AAcnE,MAAM,0BAA0B,GAAG,KAAK,EACtC,YAA2C,EAC3C,KAAoB,EACpB,KAAc,EACmB,EAAE;IACnC,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,6BAA6B,EAAE,CAAA;IAChE,MAAM,IAAI,GAAG,IAAA,oCAA4B,EAAC,YAAY,CAAC,CAAA;IACvD,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,gCAAU,CAAC,CAAC,CAAC,mCAAa,CAAA;IAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QACjD,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,6BAA6B,aAAa,EAAE,CAAC,CAAA;SAC9D;QAED,OAAO,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,KAAK;QACL,IAAI;QACJ,UAAU;QACV,YAAY;KACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAC7B,YAA2C,EAC3C,KAAoB,EACM,EAAE,CAC5B,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE;IAC/C,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAClD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,YAAY,CAAC,CAAA;KACpE;IAED,OAAO,eAAC,CAAC,IAAI,CAAC;QACZ,SAAS;QACT,GAAG,SAAS;QACZ,GAAG,sBAAsB,CAAC,YAAY,EAAE,cAAc,CAAC;KACxD,CAAC,CAAA;AACJ,CAAC,EAAE,IAAI,KAAK,EAAa,CAAC,CAAA;AAErB,MAAM,uBAAuB,GAAG,KAAK,EAC1C,MAAoC,EACpC,WAAwB,EACxB,kBAA2B,EAC3B,KAAc,EACe,EAAE;IAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,gCAAU,CAAC,CAAC,CAAC,mCAAa,CAAA;IACtD,MAAM,YAAY,GAAG,IAAA,wBAAU,EAAC,MAAM,EAAE,kCAAY,CAAC,CAAA;IACrD,MAAM,gBAAgB,GAAG,MAAM;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAmB,EAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SACvD,MAAM,CACL,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CACnB,eAAC,CAAC,IAAI,CAAC;QACL,KAAK,CAAC,IAAI;QACV,GAAG,SAAS;QACZ,GAAG,sBAAsB,CAAC,YAAY,EAAE,KAAK,CAAC;KAC/C,CAAC,EACJ,IAAI,KAAK,EAAa,CACvB;SACA,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;SAChD,MAAM,CAAC,WAAW,CAAC,CAAA;IAEtB,MAAM,YAAY,GAAG,IAAA,6CAAqB,EAAC,gBAAgB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/takomo-stacks-commands/stacks/undeploy/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,60 +6,6 @@ export declare const indentLines: (string: string, indent?: number) => string;
|
|
|
6
6
|
* @hidden
|
|
7
7
|
*/
|
|
8
8
|
export declare const checksum: (string: string) => string;
|
|
9
|
-
/**
|
|
10
|
-
* @hidden
|
|
11
|
-
*/
|
|
12
|
-
export declare const getStringSizeInBytes: (string: string) => number;
|
|
13
|
-
/**
|
|
14
|
-
* @hidden
|
|
15
|
-
*/
|
|
16
|
-
export declare type Formatter<T> = (item: T) => string;
|
|
17
|
-
/**
|
|
18
|
-
* @hidden
|
|
19
|
-
*/
|
|
20
|
-
export declare type FormatterPadding = "none" | "left" | "right";
|
|
21
|
-
/**
|
|
22
|
-
* @hidden
|
|
23
|
-
*/
|
|
24
|
-
export interface FormatterProps<T> {
|
|
25
|
-
readonly items: T[];
|
|
26
|
-
readonly getter: (item: T) => unknown;
|
|
27
|
-
readonly padding?: FormatterPadding;
|
|
28
|
-
readonly marginLeft?: number;
|
|
29
|
-
readonly marginRight?: number;
|
|
30
|
-
readonly defaultValue?: string;
|
|
31
|
-
readonly maxLength?: number;
|
|
32
|
-
}
|
|
33
|
-
/**
|
|
34
|
-
* @hidden
|
|
35
|
-
*/
|
|
36
|
-
export declare const formatter: <T>({ items, getter, padding, marginLeft, marginRight, defaultValue, maxLength, }: FormatterProps<T>) => Formatter<T>;
|
|
37
|
-
/**
|
|
38
|
-
* @hidden
|
|
39
|
-
*/
|
|
40
|
-
export interface PrintFormattedTableProps {
|
|
41
|
-
readonly showHeaders?: boolean;
|
|
42
|
-
readonly indent?: number;
|
|
43
|
-
readonly writer: (string?: string) => void;
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* @hidden
|
|
47
|
-
*/
|
|
48
|
-
export interface FormattedTable {
|
|
49
|
-
readonly row: (...columns: unknown[]) => FormattedTable;
|
|
50
|
-
readonly print: (props: PrintFormattedTableProps) => void;
|
|
51
|
-
}
|
|
52
|
-
/**
|
|
53
|
-
* @hidden
|
|
54
|
-
*/
|
|
55
|
-
export interface FormattedTableProps {
|
|
56
|
-
readonly headers: string[];
|
|
57
|
-
readonly rows?: unknown[][];
|
|
58
|
-
}
|
|
59
|
-
/**
|
|
60
|
-
* @hidden
|
|
61
|
-
*/
|
|
62
|
-
export declare const table: (props: FormattedTableProps) => FormattedTable;
|
|
63
9
|
/**
|
|
64
10
|
* @hidden
|
|
65
11
|
*/
|
|
@@ -3,11 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.diffStrings = exports.uuid = exports.splitTextInLines = exports.
|
|
6
|
+
exports.diffStrings = exports.uuid = exports.splitTextInLines = exports.checksum = exports.indentLines = void 0;
|
|
7
7
|
const crypto_1 = __importDefault(require("crypto"));
|
|
8
8
|
const diff_1 = require("diff");
|
|
9
|
-
const ramda_1 = __importDefault(require("ramda"));
|
|
10
|
-
const strip_ansi_1 = __importDefault(require("strip-ansi"));
|
|
11
9
|
const uuid_1 = require("uuid");
|
|
12
10
|
const colors_1 = require("./colors");
|
|
13
11
|
/**
|
|
@@ -26,94 +24,6 @@ exports.indentLines = indentLines;
|
|
|
26
24
|
*/
|
|
27
25
|
const checksum = (string) => crypto_1.default.createHash("sha256").update(string, "utf8").digest("hex");
|
|
28
26
|
exports.checksum = checksum;
|
|
29
|
-
/**
|
|
30
|
-
* @hidden
|
|
31
|
-
*/
|
|
32
|
-
const getStringSizeInBytes = (string) => Buffer.byteLength(string, "utf8");
|
|
33
|
-
exports.getStringSizeInBytes = getStringSizeInBytes;
|
|
34
|
-
const getPadder = (padding, maxLength) => {
|
|
35
|
-
switch (padding) {
|
|
36
|
-
case "left":
|
|
37
|
-
return (value) => value.padStart(maxLength);
|
|
38
|
-
case "right":
|
|
39
|
-
return (value) => value.padEnd(maxLength);
|
|
40
|
-
case "none":
|
|
41
|
-
return ramda_1.default.identity;
|
|
42
|
-
default:
|
|
43
|
-
throw new Error(`Unsupported padding option: ${padding}`);
|
|
44
|
-
}
|
|
45
|
-
};
|
|
46
|
-
/**
|
|
47
|
-
* @hidden
|
|
48
|
-
*/
|
|
49
|
-
const formatter = ({ items, getter, padding = "none", marginLeft = 0, marginRight = 0, defaultValue = "undefined", maxLength, }) => {
|
|
50
|
-
const marginLeftString = " ".repeat(marginLeft);
|
|
51
|
-
const marginRightString = " ".repeat(marginRight);
|
|
52
|
-
const getterFn = (item) => {
|
|
53
|
-
const value = getter(item);
|
|
54
|
-
const stringValue = value !== undefined && value !== null ? `${value}` : defaultValue;
|
|
55
|
-
return `${marginLeftString}${stringValue}${marginRightString}`;
|
|
56
|
-
};
|
|
57
|
-
const evaluatedMaxLength = maxLength ??
|
|
58
|
-
ramda_1.default.apply(Math.max, items
|
|
59
|
-
.map(getterFn)
|
|
60
|
-
.map(strip_ansi_1.default)
|
|
61
|
-
.map((s) => s.length));
|
|
62
|
-
const padder = getPadder(padding, evaluatedMaxLength);
|
|
63
|
-
return ramda_1.default.pipe(getterFn, padder);
|
|
64
|
-
};
|
|
65
|
-
exports.formatter = formatter;
|
|
66
|
-
/**
|
|
67
|
-
* @hidden
|
|
68
|
-
*/
|
|
69
|
-
const table = (props) => ({
|
|
70
|
-
row: (...columns) => {
|
|
71
|
-
if (columns.length !== props.headers.length) {
|
|
72
|
-
throw new Error(`Expected ${props.headers.length} columns but got ${columns.length}`);
|
|
73
|
-
}
|
|
74
|
-
return (0, exports.table)({
|
|
75
|
-
...props,
|
|
76
|
-
rows: [...(props.rows ?? []), columns],
|
|
77
|
-
});
|
|
78
|
-
},
|
|
79
|
-
print: ({ showHeaders = true, indent = 0, writer, }) => {
|
|
80
|
-
const write = (string = "") => {
|
|
81
|
-
writer(" ".repeat(indent) + string);
|
|
82
|
-
};
|
|
83
|
-
const { headers, rows = [] } = props;
|
|
84
|
-
const columnObjects = headers.map((header, index) => {
|
|
85
|
-
const columns = rows
|
|
86
|
-
.map((row) => row[index])
|
|
87
|
-
.map((v) => (ramda_1.default.isNil(v) ? "" : `${v}`));
|
|
88
|
-
const values = showHeaders ? [header, ...columns] : columns;
|
|
89
|
-
const width = ramda_1.default.apply(Math.max, values.map(strip_ansi_1.default).map((v) => v.length));
|
|
90
|
-
return {
|
|
91
|
-
header,
|
|
92
|
-
width,
|
|
93
|
-
columns,
|
|
94
|
-
};
|
|
95
|
-
});
|
|
96
|
-
const marginString = " ";
|
|
97
|
-
if (showHeaders) {
|
|
98
|
-
write(columnObjects
|
|
99
|
-
.map(({ header, width }) => header.padEnd(width))
|
|
100
|
-
.join(marginString));
|
|
101
|
-
write(columnObjects.map(({ width }) => "-".repeat(width)).join(" "));
|
|
102
|
-
}
|
|
103
|
-
for (let row = 0; row < rows.length; row++) {
|
|
104
|
-
write(columnObjects
|
|
105
|
-
.map(({ width, columns }) => {
|
|
106
|
-
const value = columns[row].padEnd(width);
|
|
107
|
-
const valueLength = value.length;
|
|
108
|
-
const strippedValueLength = (0, strip_ansi_1.default)(value).length;
|
|
109
|
-
const extra = valueLength - strippedValueLength;
|
|
110
|
-
return value.padEnd(width + extra);
|
|
111
|
-
})
|
|
112
|
-
.join(marginString));
|
|
113
|
-
}
|
|
114
|
-
},
|
|
115
|
-
});
|
|
116
|
-
exports.table = table;
|
|
117
27
|
/**
|
|
118
28
|
* @hidden
|
|
119
29
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/takomo-util/strings.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,+BAAgC;AAChC
|
|
1
|
+
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/takomo-util/strings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "takomo",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.5",
|
|
4
4
|
"description": "Organize, configure and deploy CloudFormation stacks.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -89,10 +89,8 @@
|
|
|
89
89
|
"@types/jmespath": "0.15.0",
|
|
90
90
|
"@types/js-yaml": "4.0.5",
|
|
91
91
|
"@types/json-stable-stringify": "1.0.34",
|
|
92
|
-
"@types/lodash.intersection": "4.4.7",
|
|
93
92
|
"@types/lodash.merge": "4.6.7",
|
|
94
93
|
"@types/lodash.takerightwhile": "4.6.7",
|
|
95
|
-
"@types/lodash.without": "4.4.7",
|
|
96
94
|
"@types/node": "14.17.1",
|
|
97
95
|
"@types/ramda": "0.27.34",
|
|
98
96
|
"@types/semver": "7.3.9",
|
|
@@ -157,7 +155,6 @@
|
|
|
157
155
|
"readdirp": "3.6.0",
|
|
158
156
|
"semver": "7.3.7",
|
|
159
157
|
"source-map-support": "0.5.21",
|
|
160
|
-
"strip-ansi": "6.0.0",
|
|
161
158
|
"ts-dedent": "2.2.0",
|
|
162
159
|
"uuid": "8.3.2",
|
|
163
160
|
"yargs": "17.0.1"
|